张延森 преди 2 години
родител
ревизия
2a1343fb0b

+ 11
- 0
src/main/java/com/yunzhi/nanyang/controller/TaOrderController.java Целия файл

@@ -59,6 +59,9 @@ public class TaOrderController extends BaseController {
59 59
     @Autowired
60 60
     public ITaDispatchService iTaDispatchService;
61 61
 
62
+    @Autowired
63
+    public ITaWorkJobService iTaWorkJobService;
64
+
62 65
     @Autowired
63 66
     public ITaWorkMessageService iTaWorkMessageService;
64 67
 
@@ -205,7 +208,15 @@ public class TaOrderController extends BaseController {
205 208
             return ResponseBean.error("订单已支付");
206 209
         }
207 210
 
211
+        if (taOrder.getWorkStatus() != Constants.WORK_READY) {
212
+            return ResponseBean.error("订单已分配");
213
+        }
214
+
208 215
         if(iTaOrderService.removeLogicById(id)){
216
+            // 取消分配
217
+            iTaDispatchService.removeByOrder(id);
218
+            iTaWorkJobService.removeByOrder(id);
219
+
209 220
             return ResponseBean.success("success");
210 221
         }else {
211 222
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

+ 2
- 0
src/main/java/com/yunzhi/nanyang/service/ITaDispatchService.java Целия файл

@@ -20,4 +20,6 @@ public interface ITaDispatchService extends IBaseService<TaDispatch> {
20 20
     IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status, Boolean isWarn);
21 21
 
22 22
     TaWorkJob createNew(TaDispatch taDispatch, TaOrder taOrder) throws Exception;
23
+
24
+    boolean removeByOrder(String orderId) throws Exception;
23 25
 }

+ 2
- 0
src/main/java/com/yunzhi/nanyang/service/ITaWorkJobService.java Целия файл

@@ -24,4 +24,6 @@ public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
24 24
     TaWorkJob getDetailBy(String id);
25 25
 
26 26
     IPage<TaWorkJob> getAdminPageBy(IPage<TaWorkJob> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, Integer status, String orderNo, String machineryTypeId, String machineryId, String workerName);
27
+
28
+    boolean removeByOrder(String orderId);
27 29
 }

+ 10
- 0
src/main/java/com/yunzhi/nanyang/service/impl/TaDispatchServiceImpl.java Целия файл

@@ -1,5 +1,6 @@
1 1
 package com.yunzhi.nanyang.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import com.yunzhi.nanyang.common.Constants;
5 6
 import com.yunzhi.nanyang.entity.TaDispatch;
@@ -86,4 +87,13 @@ public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaD
86 87
 
87 88
         return taWorkJob;
88 89
     }
90
+
91
+    @Override
92
+    public boolean removeByOrder(String orderId) throws Exception {
93
+        UpdateWrapper<TaDispatch> updateWrapper = new UpdateWrapper<>();
94
+        updateWrapper.eq("order_id", orderId);
95
+        updateWrapper.set("status", Constants.STATUS_DELETE);
96
+
97
+        return update(updateWrapper);
98
+    }
89 99
 }

+ 10
- 0
src/main/java/com/yunzhi/nanyang/service/impl/TaWorkJobServiceImpl.java Целия файл

@@ -1,5 +1,6 @@
1 1
 package com.yunzhi.nanyang.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import com.yunzhi.nanyang.common.Constants;
5 6
 import com.yunzhi.nanyang.entity.TaDispatch;
@@ -67,4 +68,13 @@ public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWor
67 68
                                            String workerName) {
68 69
         return baseMapper.getAdminPageBy(pg, orgId, startDate, endDate, status, orderNo, machineryTypeId, machineryId, workerName);
69 70
     }
71
+
72
+    @Override
73
+    public boolean removeByOrder(String orderId) {
74
+        UpdateWrapper<TaWorkJob> updateWrapper = new UpdateWrapper<>();
75
+        updateWrapper.eq("order_id", orderId);
76
+        updateWrapper.set("status", Constants.STATUS_DELETE);
77
+
78
+        return update(updateWrapper);
79
+    }
70 80
 }