tijiao

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

@@ -308,4 +308,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int refuseCtrlZ(Map<String, Object> map);
 
+    Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
+
 }

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

@@ -561,11 +561,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Integer orderId =(Integer) map.get("orderId");
         OmstruckOrder omstruckOrder=new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
+        Integer orderTypee = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
+        if(orderTypee == 11 ){
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            return result ;
+        }
         //根据运输订单号获取planId
         Map<String, Object> messageMap = omstruckOrderSeparateMapper.getOmstruckOrderResult(new BigDecimal(orderId));
         BigDecimal orderPlanId =(BigDecimal) messageMap.get("orderPlanId");
         //将订单状态设为未接收
         omstruckOrder.setOrderStatus(new BigDecimal(4));
+        omstruckOrder.setOrderLineSequence(null);
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         List<Map<String, Object>> allResultIdList = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
         for (Map<String,Object> allResultId:allResultIdList
@@ -803,10 +810,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
+            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
             //添加各个实绩
-            omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            if(orderType.intValue() != 11){
+                omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            }
             //判断订单是否是一车多单
-            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
             if (orderType.intValue()==15 || orderType.intValue()==16 ) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
@@ -1443,12 +1452,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
-        BigDecimal materialId = omstruckOrderMapper.getInwardMaterial(new BigDecimal(planId));
         for (Map<String,Object> orderMap : mapList) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             String capacityNumber = (String)orderMap.get("capacityNumber");
-            BigDecimal materialNumber = DataChange.dataToBigDecimal(orderMap.get("materialNumber")) ;
-            BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMap.get("materialWeight"));
+            List<Map<String,Object>>orderMaterialList = (List<Map<String,Object>>)orderMap.get("orderMaterialList");
             Map<String,Object> capacityMap = new HashMap<>();
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
@@ -1468,7 +1475,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
             omstruckOrder.setOrderNumber(orderNumber);
             omstruckOrder.setOrderIssueTime(new Date());
-            omstruckOrder.setOrderStatus(new BigDecimal(3));
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
             omstruckOrder.setCapacityId(capacityId);
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());
@@ -1478,20 +1485,28 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(new BigDecimal(orderType));
             omstruckOrder.setLineId(new BigDecimal(lineId));
+            omstruckOrder.setCarrierId(new BigDecimal(carrierId));
             result +=omstruckOrderMapper.insertSelective(omstruckOrder);
-            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
-            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
-            omstruckOrderMaterial.setOrderId(orderId);
-            omstruckOrderMaterial.setMaterialId(materialId);
-            omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
-            omstruckOrderMaterial.setInsertTime(new Date());
-            omstruckOrderMaterial.setUpdateTime(new Date());
-            omstruckOrderMaterial.setInsertUsername("admin");
-            omstruckOrderMaterial.setUpdateUsername("admin");
-            omstruckOrderMaterial.setInsertUpdateRemark("无");
-            omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
-            result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+
+            for (Map<String,Object>orderMaterial:orderMaterialList
+            ) {
+                OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+                BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+                BigDecimal materialId = DataChange.dataToBigDecimal(orderMaterial.get("materialId"));
+                BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMaterial.get("materialWeight"));
+                BigDecimal materialCount = DataChange.dataToBigDecimal(orderMaterial.get("materialCount"));
+                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setMaterialId(materialId);
+                omstruckOrderMaterial.setOrderMaterialNumber(materialCount);
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterial.setInsertUsername("admin");
+                omstruckOrderMaterial.setUpdateUsername("admin");
+                omstruckOrderMaterial.setInsertUpdateRemark("无");
+                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+                result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            }
         }
         return result;
     }
@@ -1926,7 +1941,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
                 break;
             case 11:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
                 break;
             case 12:
             case 13:

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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

@@ -2874,7 +2874,6 @@
 
     <!--  查询内转运输订单给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",
@@ -3271,5 +3270,36 @@
             on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
         where ADSO.DISPATCH_ID  = #{dispatchId}
     </select>
+    <select id="getInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT OO.ORDER_ID            "orderId",
+               OO.ORDER_NUMBER        "orderNumber",
+               OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+               RC.CAPACITY_NUMBER     "capacityNumber",
+               OO.ORDER_TYPE          "orderType",
+               OO.ORDER_STATUS        "orderStatus",
+               RS.SHIPPER_NAME        "shipperUnitName",
+               AIR.REQUIREMENT_ID     "requirementId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
 
 </mapper>