ERP_override.git

ERP

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-06-26 9f6d6c1fd39a1b5eb19efeabae4ff595eeda9ed5

refs
用户	chenlu <1320612696@qq.com>
	星期三, 六月 26, 2024 10:34 +0800
提交者	chenlu <1320612696@qq.com>
	星期三, 六月 26, 2024 10:34 +0800
提交	9f6d6c1fd39a1b5eb19efeabae4ff595eeda9ed5
目录	79a8c92bba596e9d85e7a7b6b951ce9130163f6d 目录 \| zip \| gz
parent	a0c6c75335567273a294d83aa483926b19c39268 查看 \| 对比 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7 查看 \| 对比

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

1个文件已添加

14个文件已修改

	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	246 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue	132 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	60 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	54 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史