ERP_override.git

ERP

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

chenlu

2025-07-14 e019b1e313911c8f211f750eb562e710d4de5f13

refs
用户	chenlu <1320612696@qq.com>
	星期一, 七月 14, 2025 08:55 +0800
提交者	chenlu <1320612696@qq.com>
	星期一, 七月 14, 2025 08:55 +0800
提交	e019b1e313911c8f211f750eb562e710d4de5f13
目录	1350db33fcb6ececb4478345f94f64777451110b 目录 \| zip \| gz
parent	9f65291e746158000d43e4581cc4608b08dde3a1 查看 \| 对比 fcf692463681690f5bf74e730516e02e135f40b3 查看 \| 对比

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

14个文件已修改

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	354 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/utils/decimal.js	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue	60 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	43 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史