ERP_override.git

ERP

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

guoyujie

2025-12-01 fa70c6932f6357061ccc6bdd03cf94fb0a8092eb

refs
用户	guoyujie <guoyujie@ng.com>
	星期一, 十二月 1, 2025 16:21 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期一, 十二月 1, 2025 16:21 +0800
提交	fa70c6932f6357061ccc6bdd03cf94fb0a8092eb
目录	32ea65093fd1987f073cd73a6006ceeb0bc8575c 目录 \| zip \| gz
parent	801bb13cadd66f9eb60fc917066751bd6672741b 查看 \| 对比 d111849e6e78ed02a63661e31c81dadd65f53104 查看 \| 对比

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

13个文件已修改

	north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/YieldProcess.vue	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史