ERP_override.git

ERP

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

guoyuji

2024-03-07 fcf705e1f9a369cab61e60d72048c36a0e1ee793

refs
用户	guoyuji <guoyujie@ng.com>
	星期四, 三月 7, 2024 13:48 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期四, 三月 7, 2024 13:48 +0800
提交	fcf705e1f9a369cab61e60d72048c36a0e1ee793
目录	e31f072fcadc1a975fac79a62473e2554286a2c9 目录 \| zip \| gz
parent	80a4cf33946682d0e43634540a293e5b98575e1c 查看 \| 对比 f595d1fc19019f30bb1ee8729eb50aab8999f50f 查看 \| 对比

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

28个文件已修改

	north-glass-erp/.idea/dataSources.local.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	55 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue	44 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	52 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java	26 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/FolwCard.xml	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ProductionScheduling.xml	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/WordOrder.xml	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史