~admin/ERP_override.git

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

廖井涛

2024-03-15 5a5e59f8aaa2a030511ef245886bf6d1db9bf774

refs
用户	廖井涛 <2265517004@qq.com>
	星期五, 三月 15, 2024 14:40 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期五, 三月 15, 2024 14:40 +0800
提交	5a5e59f8aaa2a030511ef245886bf6d1db9bf774
目录	4e0ca6e66ed8ca3da6b3ce75a0e141a72719dd22 目录 \| zip \| gz
parent	530498221b2260438cc45b87c7a1ece7e1162b5b 查看 \| 对比 667e480ba1225177adb83325d240463970390548 查看 \| 对比

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

39个文件已修改

1个文件已添加

	north-glass-erp/.idea/dataSources.local.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/router/index.js	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	163 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue	270 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue	276 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	299 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/ReportingWorks.vue	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	376 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue	50 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/WorkOrder.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	183 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	261 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml	99 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	257 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/FolwCard.xml	261 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ProductionScheduling.xml	99 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ReportingWork.xml	257 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/OrderProcessDetail.xml	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史