ERP_override.git

ERP

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

guoyujie

2025-04-08 a4259cfa901bb4cc79f6e091f941792c05310e85

refs
用户	guoyujie <guoyujie@ng.com>
	星期二, 四月 8, 2025 13:55 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期二, 四月 8, 2025 13:55 +0800
提交	a4259cfa901bb4cc79f6e091f941792c05310e85
目录	cf2180f672823261f0907725f0f1b6ce533c9169 目录 \| zip \| gz
parent	dbdcbf26afceaaaaec932fd948ad84a62d6e4014 查看 \| 对比 cd8f015ef7ccda50f884c8a793032c04ddd14e23 查看 \| 对比

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

24个文件已修改

	north-glass-erp/northglass-erp/package-lock.json	114 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/Optimization.vue	51 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizationRectPrint.vue	205 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeControl.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| 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	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue	201 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue	396 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectList.vue	166 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue	269 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	86 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	103 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史