ERP_override.git

ERP

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

廖井涛

2025-11-03 80db9cb305d2603bb3646b65fb7515d7d315f610

refs
用户	廖井涛 <2265517004@qq.com>
	星期一, 十一月 3, 2025 16:55 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期一, 十一月 3, 2025 16:55 +0800
提交	80db9cb305d2603bb3646b65fb7515d7d315f610
目录	d0467c3b8ec727dda9c9187ff7f5709b3f5303e4 目录 \| zip \| gz
parent	f692a364cdb559ddadc4f6dac86c25848a1d4f34 查看 \| 对比 d603414388508a7811317e1f39caec87a8725d39 查看 \| 对比

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

17个文件已修改

	north-glass-erp/northglass-erp/public/config.js	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/温州巨星.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizationRectPrint.vue	72 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue	166 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue	111 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue	30 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	200 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	112 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史