adhkd

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

@@ -60,7 +60,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
-    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17);
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16);
 
     //给达兴发委托
     private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
@@ -383,10 +383,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
                 break;
             case 20://采购内转委托总厂区
+            case 15:
+            case 16:
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
                 if(measureCommission == null){
                     return 0;
                 }
+                if(orderType == 16){
+                    measureCommission.put("factory","dg");
+                }
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel",false);
@@ -394,8 +399,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
         }
-        if(measureCommission != null)
+        if(measureCommission != null){
             map.put("materialId", measureCommission.get("materialId"));
+        }
         addMeasureCommission(map); // 添加计量委托
         /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
@@ -600,9 +606,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 14:
 
                 break;
-            case 15:
             case 20:
-            case 16: //发送计量委托(查询物资顺序第一个装卸货的物资)
+                //发送计量委托(查询物资顺序第一个装卸货的物资)
                 //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
@@ -616,6 +621,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 11:
             case 17:
             case 18:
+            case 15:
+            case 16:
                 i+=addMaoMeasureCommission(map);
         }
         return i;

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

@@ -1117,6 +1117,7 @@
                     TWR.INSERT_UPDATE_REMARK "demo",
                     RM.MATERIAL_ID "materialId",
                     RM.MATERIAL_NAME "materiaName",
+                    DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
                     concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
                     RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
                 FROM
@@ -1135,6 +1136,7 @@
                         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
                         LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
                         LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                        LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = APO.BATCH_ID
                 WHERE
                     OO.ORDER_ID = #{orderId}
                 ORDER BY