ERP_override.git

ERP

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

chenlu

2024-12-12 515025ffd3ace6f7382f9a853d3aba50f191c8d0

refs
用户	chenlu <1320612696@qq.com>
	星期四, 十二月 12, 2024 08:30 +0800
提交者	chenlu <1320612696@qq.com>
	星期四, 十二月 12, 2024 08:30 +0800
提交	515025ffd3ace6f7382f9a853d3aba50f191c8d0
目录	f3b28dccb48b1396a6050fc0f7cbf702defe50a9 目录 \| zip \| gz
parent	f46f83ab2ce1bd2f34c81cb5750e6d5ce6ffb306 查看 \| 对比 3e9ae655d2fcf0a7bb6b89c796fe0619d9ff5c1b 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue	197 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue	58 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetTrimming.vue	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史