ERP_override.git

ERP

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

chenlu

2025-04-08 a58e903d819c65540c70a0df377ba61f9d39cf14

refs
用户	chenlu <1320612696@qq.com>
	星期二, 四月 8, 2025 14:28 +0800
提交者	chenlu <1320612696@qq.com>
	星期二, 四月 8, 2025 14:28 +0800
提交	a58e903d819c65540c70a0df377ba61f9d39cf14
目录	3ed33815735278085e76e9837d8a56e80b2d9d5f 目录 \| zip \| gz
parent	aa7bcbc678a671a51a87c7ba6bbfaa107399a96d 查看 \| 对比 a4259cfa901bb4cc79f6e091f941792c05310e85 查看 \| 对比

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

15个文件已修改

	north-glass-erp/northglass-erp/index.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue	268 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectList.vue	162 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/controller/sd/OrderController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史