ERP_override.git

ERP

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

guoyujie

2025-04-17 1275eac767a6fe0b4dd68bab27e2b1fb78d55b51

refs
用户	guoyujie <guoyujie@ng.com>
	星期四, 四月 17, 2025 16:09 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期四, 四月 17, 2025 16:09 +0800
提交	1275eac767a6fe0b4dd68bab27e2b1fb78d55b51
目录	f1ac0da06de6d4d246047b18af143c0f6d9edd17 目录 \| zip \| gz
parent	106c63401275d736a27970f948a79a2c2aef0389 查看 \| 对比 c74ab555c190b1ada24037e1fee2a714303b4aa7 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/CheckInventory.vue	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue	77 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue	24 ●●●●● 对比 \| 查看 \| 原始文档 \| 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	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史