ERP_override.git

ERP

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

廖井涛

2024-02-23 b0edff4c02128b722a9a6674b016536d4395872d

refs
用户	廖井涛 <2265517004@qq.com>
	星期五, 二月 23, 2024 13:39 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期五, 二月 23, 2024 13:39 +0800
提交	b0edff4c02128b722a9a6674b016536d4395872d
目录	0cb83b47fa61c9f6eae62e5b52a5246d03ef4ea0 目录 \| zip \| gz
parent	d80907cd2f96c99bb8875cba6b20f26306c88812 查看 \| 对比 9e91529bd9fcb4228193350185ef88ab4705caa2 查看 \| 对比

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

18个文件已修改

	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	566 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue	75 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue	64 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	41 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	30 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	156 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml	121 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/FolwCard.xml	155 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/WordOrder.xml	121 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史