修改

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

@@ -521,7 +521,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Map<String,Object> mapAddOrder  =omstruckOrderMapper.getSporadicOrdermapAddOrder(new BigDecimal(mapValue.get("orderId").toString()));
         BigDecimal sporadicOrderTimes = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderTimes"));
         BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderId"));
+        BigDecimal transStatus = DataChange.dataToBigDecimal(mapAddOrder.get("transStatus"));
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        //获取运输订单类型
+        Integer orderType = omstruckOrderMapper.getOrderTypeByOrderId(orderId);
         BigDecimal capacityId = DataChange.dataToBigDecimal(mapAddOrder.get("capacityId"));
         Map<String, Object> addMapSporadicOrder = new HashMap<>();
         addMapSporadicOrder.put("sporadicOrderId",sporadicOrderId);
@@ -531,9 +534,20 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         map.put("capacityId",capacityId);
         mapList.add(map);
         addMapSporadicOrder.put("mapList",mapList);
-        if (sporadicOrderTimes.intValue()>0){
-            //mapvalue需要orderId,零星订单id，maplist放一个运力id
-            amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+        switch (orderType) {
+            case 13:
+            case 12:
+                if (transStatus.intValue()==1){
+                    amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+                }
+                break;
+            //内转零星
+            case  15:
+            case  16:
+                if (sporadicOrderTimes.intValue() > 0) {
+                    //mapvalue需要orderId,零星订单id，maplist放一个运力id
+                    amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+                }
         }
     }
 
@@ -550,21 +564,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 +733,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return result;
     }
 
+    @Override
+    public int refuseCtrlZ(Map<String, Object> map) {
+        return omstruckOrderMapper.refuseCtrlZ(map);
+    }
+
     /**
      * 销售物流，下发订单
      *
@@ -777,7 +799,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
             //判断订单是否是一车多单
             BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
-            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==12 ||orderType.intValue()==13) {
+            if (orderType.intValue()==15 || orderType.intValue()==16 ) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));

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 查询采购司机接单数据  、通过运单号查询所有运单信息-->
@@ -2813,14 +2818,15 @@
 
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT OO.ORDER_ID                "orderId",
-        OO.ORDER_NUMBER            "orderNumber",
-        OO.ORDER_LINE_SEQUENCE     "orderLineSequence",
-        RC.CAPACITY_NUMBER         "capacityNumber",
-        RW.WAREHOUSE_NAME          "unloadName",
-        OO.ORDER_TYPE              "orderType",
-        OO.ORDER_STATUS            "orderStatus",
-        RS.SUPPLIER_NAME           "shipperName",
+
+        SELECT OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RW.WAREHOUSE_NAME "unloadName",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_STATUS "orderStatus",
+        RS.SUPPLIER_NAME "shipperName",
         RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
@@ -3042,7 +3048,8 @@
     <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
         select aso.sporadic_order_times "sporadicOrderTimes",
                aso.SPORADIC_ORDER_ID "sporadicOrderId",
-               oo.CAPACITY_ID "capacityId"
+               oo.CAPACITY_ID "capacityId",
+               ASO.TRANS_STATUS "transStatus"
             from OMSTRUCK_ORDER oo
             left join  AMSTRUCK_SPORADIC_ORDER  aso
             on oo.ORDER_PLAN_ID=aso.sporadic_order_id