Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -875,6 +875,12 @@ public class OMSController {
         return omsFeign.updateMaterialMes(map);
     }
 
+    @ApiOperation(value = "修改正在装的状态")
+    @PostMapping("/updateContinueStaus")
+    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.updateContinueStaus(map);
+    }
+
     @ApiOperation(value = "展示销售订单下的运输订单")
     @PostMapping("getDriverInfoForSale2")
     public Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -505,6 +505,9 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckmatetialorders/updateContinueStaus")
+    public Map<String, Object> updateContinueStaus(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/oms/omstruckorders/getDriverInfoForSale2")
     Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam Integer apiId,

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1353,7 +1353,7 @@
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = 7
+        SET OO.CAN_WORK = 1
         WHERE OO.ORDER_ID IN
         (SELECT OO.ORDER_ID
         FROM OMSTRUCK_ORDER OO