修改零星计量委托

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

@@ -67,8 +67,20 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //零星物资进厂计量委托
     Map<String, Object> sporadicDXMeasure(Map<String, Object> map);
 
+    //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 
     Map<String, Object> purchaseXqCgNzDXMeasure(Map<String, Object> map);
 
+    //通过订单ID获取零星订单父级收货单位
+    Integer getLxRealReceiveIdByOrderId(BigDecimal orderId);
+
+    //通过订单ID获取零星订单父级收发货单位
+    Integer getLxRealSendUnitIdByOrderId(BigDecimal orderId);
+
+    //查询零星订单收货单位ID
+    Integer getPtLxReceiveIdByOrderId(BigDecimal orderId);
+
+    //查询零星订单发货单位ID
+    Integer getPtLxSendUnitIdByOrderId(BigDecimal orderId);
 }

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

@@ -115,8 +115,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:
-                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
             case 13:
+            case 15:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;
@@ -239,6 +239,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 12:
             case 13:
+            case 15:
                 //无法确定汽车衡
                 HashMap<String, Object> calculateMap1213 = new HashMap<>();
                 calculateMap1213.put("orderId", map.get("orderId"));
@@ -251,11 +252,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                     calculateMap1213.put("tarePlaceId", placeId1213);
                 }
                 i += tmstruckWeightResultService.updateWeightResult(calculateMap1213);
-                //发送计量委托
+                //发送计量委托(查询物资顺序第一个装卸货的物资)
+                //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
-                //默认收货单位为新厂区
-                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
+                checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
 
         }
         if(checkMeasureCommission == 0){

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

@@ -135,8 +135,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
-                return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
             case 13:
+            case 15:
                 return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;

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

@@ -91,9 +91,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
-            case  12:
-                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
+            case 12:
             case 13:
+            case 15:
                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
         }
         return null;

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

@@ -129,8 +129,41 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int addLXMeasureCommission(Map<String, Object> map){
+        Integer orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        int i = 0;
+        if(orderType == 12) {
+            //查询进厂收货单位
+            Integer receiveId = tmstruckMeasureCommissionMapper.getPtLxReceiveIdByOrderId(orderId);
+            if(receiveId == 1){
+                //给达钢发送委托
+
+            }else if(receiveId == 2){
+                //给达兴发送委托
+                i = sendDXMeasureCommissionMes(map);
+            }
+        }else if(orderType == 13){
+            Integer sendId = tmstruckMeasureCommissionMapper.getPtLxSendUnitIdByOrderId(orderId);
+            if(sendId == 1){
+                //给达钢发送委托
+
+            }else if(sendId == 2){
+                //给达兴发送委托
+                i = sendDXMeasureCommissionMes(map);
+            }
+
+        }else if(orderType == 15){
+            //如果是15类型的订单寻找订单父级发货单位  (现只有出厂)
+            Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
+            if(sendUnitId == 1){
+                //给达钢发送委托
+            }else if (sendUnitId == 2){
+                //给达兴发送委托
+                i = sendDXMeasureCommissionMes(map);
+            }
+        }
         addMeasureCommission(map); // 添加计毛委托
-        return sendDXMeasureCommissionMes(map);
+        return i;
     }
 
 

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

@@ -114,8 +114,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 11:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
-                return tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
             case 13:
+            case 15:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
         return null;

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

@@ -1021,4 +1021,44 @@
         from TMSTRUCK_WEIGHT_RESULT TWR
         where TWR.RESULT_NET_WEIGHT is null and TWR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
+
+<!--  通过订单ID获取零星订单父级收货单位  -->
+    <select id="getLxRealReceiveIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select  RCON.CONSIGNEE_FAR_ID
+        from OMSTRUCK_ORDER OO
+            left join AMSTRUCK_SPORADIC_ORDER ASO
+                on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+            left join RMS_CONSIGNEE RCON
+                on RCON.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--   通过订单ID获取零星订单父级收货单位 -->
+    <select id="getLxRealSendUnitIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select RS.SUPPLIER_FAR_ID
+        from OMSTRUCK_ORDER OO
+            left join AMSTRUCK_SPORADIC_ORDER ASO
+                    on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+            left join RMS_SUPPLIER RS
+                    on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--  查询零星订单收货单位ID  -->
+    <select id="getPtLxReceiveIdByOrderId" resultType="java.lang.Integer">
+        select ASO.RECEIVE_UNIT_ID
+        from OMSTRUCK_ORDER OO
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+            on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+<!--  查询零星订单发货单位ID  -->
+    <select id="getPtLxSendUnitIdByOrderId" resultType="java.lang.Integer">
+        select ASO.SEND_UNIT_ID
+        from OMSTRUCK_ORDER OO
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>