tijioa

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

@@ -75,7 +75,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //通过订单ID获取零星订单父级收货单位
     Integer getLxRealReceiveIdByOrderId(BigDecimal orderId);
 
-    //通过订单ID获取零星订单父级收发货单位
+    //通过订单ID获取零星订单父级发货单位
     Integer getLxRealSendUnitIdByOrderId(BigDecimal orderId);
 
     //查询零星订单收货单位ID

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

@@ -84,8 +84,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
         Integer receiveId = 0 ;
+        Integer supplierId = 0 ;
         if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 10){
             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+
         }else{
             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         }
@@ -134,7 +136,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         int i = 0;
         if(orderType == 12) {
             //查询进厂收货单位
-            Integer receiveId = tmstruckMeasureCommissionMapper.getPtLxReceiveIdByOrderId(orderId);
+            Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
                 //给达钢发送委托
 
@@ -143,7 +145,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 i = sendDXMeasureCommissionMes(map);
             }
         }else if(orderType == 13){
-            Integer sendId = tmstruckMeasureCommissionMapper.getPtLxSendUnitIdByOrderId(orderId);
+            Integer sendId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendId == 1){
                 //给达钢发送委托
 
@@ -153,10 +155,21 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             }
 
         }else if(orderType == 15){
-            //如果是15类型的订单寻找订单父级发货单位  (现只有出厂)
+            //进厂,收货单位
+            //如果是15类型的订单寻找订单父级发货单位  (现只有进厂)
+            Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
+            if(receiveId == 1){
+                //给达钢发送委托1
+
+            }else if (receiveId == 2){
+                //给达兴发送委托
+                i = sendDXMeasureCommissionMes(map);
+            }
+        }else if(orderType == 16){
+            //出厂,发货单位
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
-                //给达钢发送委托
+                //给达钢发送委托1
 
             }else if (sendUnitId == 2){
                 //给达兴发送委托