ERP_override.git

ERP

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

chenlu

2025-08-11 6bb30b735e52488fd3d57bfa2d5f6705f7326a98

refs
用户	chenlu <1320612696@qq.com>
	星期一, 八月 11, 2025 15:36 +0800
提交者	chenlu <1320612696@qq.com>
	星期一, 八月 11, 2025 15:36 +0800
提交	6bb30b735e52488fd3d57bfa2d5f6705f7326a98
目录	3081598acbf8652f79cf6865d516b5f4521c613c 目录 \| zip \| gz
parent	32486d62f7ad21cef2ad2042de3bae75aac7e3b8 查看 \| 对比 a3920c8d8c1b10551e9f093bdf011295da4aa5e1 查看 \| 对比

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

11个文件已修改

1个文件已添加

	north-glass-erp/northglass-erp/src/components/sd/order/SelectAlienEditor.vue	381 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/hook/index.js	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeControl.vue	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	81 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	74 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史