修改

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

@@ -82,6 +82,11 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
 
     //纯内转发送计量委托
     Map<String,Object> purchaseNzMeasure(Map<String,Object> map);
+
+
+    //纯内转向达兴能源发送计量委托
+    Map<String,Object> inwardMeasure(Map<String,Object> map);
+
     //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 

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

@@ -151,6 +151,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         int i = 0;
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         int orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        BigDecimal factory =DataChange.dataToBigDecimal(map.get("factory"));
         if(orderType == 10){
             //获取当前订单是属于哪个厂区订单
             Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
@@ -160,8 +161,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 i = sendDXMeasureCommissionMes(map); //发送委托给达兴能源
             }
         }else if(judgeDaGangNum.contains(orderType)){
-            //发送委托给达州钢铁
-            i = sendMeasureCommissionMes(map);
+            //判断是否为厂内内转
+            if (factory.intValue()==1&&orderType==11){
+                i = sendMeasureCommissionMes(map);
+            }else if (factory.intValue()==2&&orderType==11){
+                i = sendDXMeasureCommissionMes(map);
+            }else {
+                //发送委托给达州钢铁
+                i = sendMeasureCommissionMes(map);
+            }
         }else if(judgeDaXinNum.contains(orderType)) {
             //发送委托给达兴能源
             i = sendDXMeasureCommissionMes(map);
@@ -514,6 +522,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
                 measureCommission.put("ended", "0");
                 break;
+            case 11:
+                   measureCommission = tmstruckMeasureCommissionMapper.inwardMeasure(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");
+                   System.out.println(measureCommission);
+                   break;
             case 12: // 零星订单
             case 13:
             case 14:

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

@@ -1383,4 +1383,36 @@
         order by OO.ORDER_NUMBER DESC
     </select>
 
+
+<!--   向达兴能源发送内转计量委托-->
+    <select id="inwardMeasure" resultType="java.util.Map" parameterType="java.util.Map">
+        select OO.ORDER_NUMBER       "orderId",
+               RC.CAPACITY_NUMBER    "carNumber",
+               RM.MATERIAL_NAME      "goodsName",
+               CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+               OO.INSERT_UPDATE_REMARK   "demo",
+               RM.MATERIAL_ID          "item",
+               rm.material_code "goodsNo",
+--                卸货点
+               RW.WAREHOUSE_NAME       "receiver",
+               RW.WAREHOUSE_NAME       "receiverNo",
+--                装货点
+               RW2.WAREHOUSE_NAME      "provider",
+               RW2.WAREHOUSE_NAME      "providerNo"
+
+        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 AMSTRUCK_REQUIREMENT_MATERIAL ARM ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+                 left join RMS_WAREHOUSE RW2 on RW2.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM  on OO.ORDER_ID = OOM.ORDER_ID
+                 left join RMS_MATERIAL  RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+                 left join RMS_CAPACITY  RC on OO.CAPACITY_ID = RC.CAPACITY_ID
+        where OOM.ORDER_ID = #{orderId}
+          and OOM.MATERIAL_ID = #{materialId}
+          AND ARM.MATERIAL_ID = #{materialId}
+    </select>
+
 </mapper>