修改零星委托

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

@@ -67,6 +67,9 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //零星物资进厂计量委托
     Map<String, Object> sporadicDXMeasure(Map<String, Object> map);
 
+    //零星计量委托(老厂区)
+    Map<String,Object> sproadicMeasure(Map<String,Object> map);
+
     //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 

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

@@ -201,13 +201,13 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 13:
             case 16:
             case 15:
+            case 20:
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
                 //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
-
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");
         }

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

@@ -134,12 +134,23 @@ 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);
+            }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);
@@ -148,7 +159,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             Integer sendId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendId == 1){
                 //给达钢发送委托
-
+                j = sendMeasureCommissionMes(map);
             }else if(sendId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
@@ -160,7 +171,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
                 //给达钢发送委托1
-
+                j = sendMeasureCommissionMes(map);
             }else if (receiveId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
@@ -170,14 +181,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
                 //给达钢发送委托1
-
+                j = sendMeasureCommissionMes(map);
             }else if (sendUnitId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
         }
         addMeasureCommission(map); // 添加计毛委托
-        return i;
+        return i+j;
     }
 
 
@@ -219,7 +230,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         switch (orderType.intValue()){
             case 1:
-
                 break;
             case 2:
                 break;
@@ -229,7 +239,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 11:
             case 4:
-
                 break;
             case 5:
             case 6:
@@ -244,9 +253,32 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+                break;
+            case 12:
+            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("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                break;
+            case 13:
+            case 16:
+                //零星计量委托(老厂区)
+                measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","出厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
         }
         /*访问接口发送数据*/
-//        sendMesToMeasure(measureCommission);
+        sendMesToMeasure(measureCommission);
         return 1;
     }
 

src/main/resources/application-dev.yml

@@ -31,15 +31,15 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:localhost:8006}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
 
 server:
   port: 8008

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -934,6 +934,45 @@
                 LEFT JOIN rms_consignee rce ON rce.consignee_id = aso.receive_unit_id
         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",
+               OO.ORDER_NUMBER "transportNum",
+               RC.CAPACITY_NUMBER "carNum",
+               RS.SUPPLIER_NAME "sendUnit",
+               RC2.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+               RM.MATERIAL_ID "materialId",
+               CONCAT(RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL) "goodsType",
+               TWR.INSERT_UPDATE_REMARK    "demo",
+               RC2.CONSIGNEE_COMPANY_NAME  "unloadPlace",
+               RTC.TRUCK_CALCULATE_NUMBER  "steelyardNum"
+
+        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
+        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
+        ON OO.ORDER_ID=oom.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=oom.MATERIAL_ID
+        LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN  RMS_SUPPLIER RS
+        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}
+    </select>
+
+
+
+
     <select id="getReceiveIdByRequirementOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
         select apo.receive_unit_id
   from omstruck_order oo