parent: fa0f79 | 补丁 | 提交对比
廖井涛
2024-02-20 149d60a12ef635c2b08e4ebedfc9afa7363a6562
refs
用户 廖井涛 <2265517004@qq.com>
星期二, 二月 20, 2024 16:16 +0800
提交者 廖井涛 <2265517004@qq.com>
星期二, 二月 20, 2024 16:16 +0800
提交149d60a12ef635c2b08e4ebedfc9afa7363a6562
目录 4ace5b996f395e0b900416f2e4bc9782f34e5feb 目录 | zip | gz
parent fa0f799ec8ade03779863ff5b3cce4c822a76f0d 查看 | 对比
cbcf5944ab612775f3b1341769cc72ff84087d76 查看 | 对比 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

# Conflicts:
#	north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
1个文件已添加
31个文件已修改
2405 ■■■■■ 已修改文件
.idea/jarRepositories.xml 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue 299 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue 242 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue 169 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue 30 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 224 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/Order.vue 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 155 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue 222 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/pom.xml 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java 26 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 65 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 70 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml 242 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml 57 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/FolwCard.xml 70 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml 242 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml 57 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史