ERP_override.git

ERP

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

guoyujie

2025-11-24 90de68b8a67ea15091fa3a4223402b4b34a36298

refs
用户	guoyujie <guoyujie@ng.com>
	星期一, 十一月 24, 2025 15:00 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期一, 十一月 24, 2025 15:00 +0800
提交	90de68b8a67ea15091fa3a4223402b4b34a36298
目录	1be10cedbaa9fea8311f6862183f7faea7f84c6e 目录 \| zip \| gz
parent	1b804da07a72f4c93016975dac9c7183ff066509 查看 \| 对比 4086570d2a4091c86e6fad35a0c36c8963cdf415 查看 \| 对比

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

13个文件已修改

1个文件已添加

	north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue	413 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/温州巨星.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/pom.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	60 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史