ERP_override.git

ERP

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

廖井涛

2025-07-22 7789318b8a9ef6535a0b776c5c0bfe2a8eb98e2b

refs
用户	廖井涛 <2265517004@qq.com>
	星期二, 七月 22, 2025 15:30 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期二, 七月 22, 2025 15:30 +0800
提交	7789318b8a9ef6535a0b776c5c0bfe2a8eb98e2b
目录	4a49a8e37b66a9c8ad4f04e48a2df4dc8c5b5853 目录 \| zip \| gz
parent	947846c0cb98b0625a1ace38ee0712df8c456480 查看 \| 对比 4e2ea30eb08800523f971a0f151c63b55823cd90 查看 \| 对比

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

15个文件已修改

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue	75 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	77 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史