ERP_override.git

ERP

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-12-26 9692c944974f5f7f34371910c1049c640db19e63

refs
用户	huang <1532065656@qq.com>
	星期四, 十二月 26, 2024 16:55 +0800
提交者	huang <1532065656@qq.com>
	星期四, 十二月 26, 2024 16:55 +0800
提交	9692c944974f5f7f34371910c1049c640db19e63
目录	2ff982bfcc40a7d1e8fb178f3da8e2394b2f891b 目录 \| zip \| gz
parent	f1d414f9a087ef8e9e41248d4ce3519cacc86f7b 查看 \| 对比 a925836fa0ec4d3e5362a289995c5cb3a3942ed7 查看 \| 对比

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

12个文件已修改

	north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue	26 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史