Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

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

@@ -120,6 +120,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 15:
             case 20:
             case 16:
+            case 20:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;

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

@@ -145,6 +145,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 15:
             case 20:
             case 16:
+            case 20:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;
@@ -256,6 +257,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
                 break;
+            case 20:
+                if(DataChange.dataToBigDecimal(map.get("orderSegmentSqe")).intValue() == 9){ //要结束订单前的出厂
+                    //生成新的零星订单
+                    omsFeign.pushMessageToDriver(map);
+                }
+                i += utilsService.closeOrderNormally(map);
+
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.mapper.RulesMapper;
 import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
@@ -33,6 +34,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Autowired
     private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
 
+    @Autowired
+    private RulesMapper rulesMapper;
    /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛
@@ -134,34 +137,31 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         Integer orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         int i = 0;
-        int j=0;
         if(orderType == 12) {
             //查询进厂收货单位
             Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
                 //给达钢发送委托
-                j = sendMeasureCommissionMes(map);
+                i = sendMeasureCommissionMes(map);
             }else if(receiveId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
-        }if(orderType == 20) {//内转零星进厂
-            //查询进厂收货单位
-            Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
-            if(receiveId == 1){
-                //给达钢发送委托
-                j = sendMeasureCommissionMes(map);
-            }else if(receiveId == 2){
-                //给达兴发送委托
-                i = sendDXMeasureCommissionMes(map);
+        }
+        if(orderType == 20) {//内转零星进厂
+           //查询还未计量实绩
+            Integer noNetWeightResult = rulesMapper.getNoNetWeightResult(orderId);
+            if(noNetWeightResult != 2){
+                i = sendMeasureCommissionMes(map);
+            }else {
+                i = sendDXMeasureCommissionMes(map);//如果有两条没有净重的实绩则需要给达兴发委托  否则给达钢发委托
             }
+
         }else if(orderType == 13){
             Integer sendId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendId == 1){
-                //给达钢发送委托
-                j = sendMeasureCommissionMes(map);
+                i = sendMeasureCommissionMes(map);
             }else if(sendId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
 
@@ -170,25 +170,21 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             //如果是15类型的订单寻找订单父级发货单位  (现只有进厂)
             Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
-                //给达钢发送委托1
-                j = sendMeasureCommissionMes(map);
+                i = sendMeasureCommissionMes(map);
             }else if (receiveId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
         }else if(orderType == 16){
             //出厂,发货单位
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
-                //给达钢发送委托1
-                j = sendMeasureCommissionMes(map);
+                i = sendMeasureCommissionMes(map);
             }else if (sendUnitId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
         }
         addMeasureCommission(map); // 添加计毛委托
-        return i+j;
+        return i;
     }
 
 
@@ -255,20 +251,21 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
                 break;
             case 12:
+            case 13:
             case 20://内转零星进厂（老厂区）
-            case 15:
                 //零星计量委托(老厂区)
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
                 break;
-            case 13:
+            case 15:
             case 16:
-                //零星计量委托(老厂区)
+                //零星计量委托(老厂区)  会有多拼
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","出厂");
@@ -346,21 +343,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 12:
             case 13:
-                measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
-                if(measureCommission == null)
-                    return 0;
-                measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
-                measureCommission.put("deliveryType", "计重");
-                measureCommission.put("billType", "2");
-                measureCommission.put("planQuantity", "0");
-                measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", "0");
-                measureCommission.put("ended", "0");
-                break;
-//            case 14:
-            //零星一车多趟
             case 15:
             case 16:
+            case 20:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 if(measureCommission == null)
                     return 0;
@@ -371,12 +356,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("crname", "admin");
                 measureCommission.put("orderSource", "0");
                 measureCommission.put("ended", "0");
+                break;
             
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);
-  //      System.out.println(measureCommission);
-  //    return 1;
     }
 
     /**

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

@@ -935,7 +935,7 @@
         where oo.order_id = #{orderId} and oom.material_id = #{materialId}
     </select>
     <select id="sproadicMeasure" parameterType="map" resultType="java.util.Map">
-        select distinct RM.MATERIAL_NAME "materiaName",
+        select RM.MATERIAL_NAME "materiaName",
                OO.ORDER_NUMBER "transportNum",
                RC.CAPACITY_NUMBER "carNum",
                RS.SUPPLIER_NAME "sendUnit",
@@ -949,8 +949,6 @@
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.ORDER_ID=OO.ORDER_ID
-        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
         on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
         left join RMS_TRUCK_CALCULATE RTC
@@ -967,7 +965,7 @@
         ON  RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
         LEFT JOIN RMS_CONSIGNEE RC2
          ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
-         WHERE OO.ORDER_ID=#{orderId}
+         WHERE OO.ORDER_ID=#{orderId} and  TWR.RESULT_NET_WEIGHT is null
     </select>