tijiao

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

@@ -525,6 +525,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(i);
     }
 
+    @PostMapping("/refuseCtrlZ")
+    public RESTfulResult refuseCtrlZ(@RequestBody(required = false) Map<String,Object>map){
+        int i = omstruckOrderService.refuseCtrlZ(map);
+        return success(i);
+    }
 
     @ApiOperation(value = "新增采购进口矿订单 ")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -266,7 +266,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
 
     //根据运输订单id查找所有实绩id
-    Map<String,Object> getAllResultId(BigDecimal orderId);
+    List<Map<String,Object>> getAllResultId(BigDecimal orderId);
 
     //查询订单是否确认
     Integer getDriverConfirmation(BigDecimal orderId);
@@ -301,4 +301,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
    Map<String, Object> selectOrderMap(BigDecimal orderId);
 
+    int refuseCtrlZ(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -201,4 +201,6 @@ public interface IOmstruckOrderService {
 
     int addPurInwardOrder1(BigDecimal orderId);
 
+    int refuseCtrlZ(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -550,21 +550,24 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //将订单状态设为未接收
         omstruckOrder.setOrderStatus(new BigDecimal(4));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        Map<String, Object> allResultId = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
-        BigDecimal weightResultId =(BigDecimal) allResultId.get("weightResultId");
-        result += omstruckOrderMapper.deleteWeightResult(weightResultId);
-        BigDecimal loadResultId =(BigDecimal) allResultId.get("loadResultId");
-        if (loadResultId!=null) {
-            result += omstruckOrderMapper.deleteLoadResult(loadResultId);
-        }
-        BigDecimal leaveResultId=(BigDecimal) allResultId.get("leaveResultId");
-        result += omstruckOrderMapper.deleteLeaveResult(leaveResultId);
-        BigDecimal unloadResultId =(BigDecimal) allResultId.get("unloadResultId");
-        if (unloadResultId!=null) {
-            result += omstruckOrderMapper.deleteUnloadResult(unloadResultId);
+        List<Map<String, Object>> allResultIdList = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
+        for (Map<String,Object> allResultId:allResultIdList
+             ) {
+            BigDecimal weightResultId =(BigDecimal) allResultId.get("weightResultId");
+            result += omstruckOrderMapper.deleteWeightResult(weightResultId);
+            BigDecimal loadResultId =(BigDecimal) allResultId.get("loadResultId");
+            if (loadResultId!=null) {
+                result += omstruckOrderMapper.deleteLoadResult(loadResultId);
+            }
+            BigDecimal leaveResultId=(BigDecimal) allResultId.get("leaveResultId");
+            result += omstruckOrderMapper.deleteLeaveResult(leaveResultId);
+            BigDecimal unloadResultId =(BigDecimal) allResultId.get("unloadResultId");
+            if (unloadResultId!=null) {
+                result += omstruckOrderMapper.deleteUnloadResult(unloadResultId);
+            }
+            BigDecimal enFactoryId =(BigDecimal) allResultId.get("enFactoryId");
+            result +=omstruckOrderMapper.deleteEnResult(enFactoryId);
         }
-        BigDecimal enFactoryId =(BigDecimal) allResultId.get("enFactoryId");
-        result +=omstruckOrderMapper.deleteEnResult(enFactoryId);
         //删除所有实绩
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
         switch (orderType){
@@ -716,6 +719,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return result;
     }
 
+    @Override
+    public int refuseCtrlZ(Map<String, Object> map) {
+        return omstruckOrderMapper.refuseCtrlZ(map);
+    }
+
     /**
      * 销售物流，下发订单
      *

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

@@ -931,6 +931,11 @@
             RC.CAPACITY_NUMBER = #{capacityNumber}
         </if>
     </update>
+    <update id="refuseCtrlZ">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 4
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
 
 
     <!-- 通过运力ID 查询采购司机接单数据  、通过运单号查询所有运单信息-->
@@ -3004,7 +3009,6 @@
                          TLFR.RESULT_ID "leaveResultId",
                          TUR.RESULT_ID "unloadResultId",
                          TER.RESULT_ID "enFactoryId"
-
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
                            ON OO.ORDER_ID=TTR.ORDER_ID