ERP_override.git

ERP

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

廖井涛

2025-08-04 855f19dd93d031738388d29b4dc2fd089ef13f02

refs
用户	廖井涛 <2265517004@qq.com>
	星期一, 八月 4, 2025 16:06 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期一, 八月 4, 2025 16:06 +0800
提交	855f19dd93d031738388d29b4dc2fd089ef13f02
目录	9acb027648bc3142febd5aad6c69d588ec74301f 目录 \| zip \| gz
parent	4ed43bcaca53599880c7cfdfaf7e29d328a0a483 查看 \| 对比 420fdca0dce04556dd1271d9b49ee3b1269ca48a 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue	197 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetTrimming.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	81 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史