Redeem před 1 rokem
rodič
revize
e57057e516

+ 2 - 2
pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.example</groupId>
-    <artifactId>dil-api</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>dil-oms-api</artifactId>
+    <version>1.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

+ 4 - 0
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -616,6 +616,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         // 遍历主键
         for (Map<String, Object> map : mapList) {
             BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+            BigDecimal i = omstruckOrderSeparateMapper.getWeightTask(orderId);
+            if(i != null){
+                continue;
+            }
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderStatus(new BigDecimal(7));

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -346,7 +346,8 @@
         ASO.SEND_UNIT_ID "sendUnitId",
         ASO.RECEIVE_UNIT_ID "receiveUnitId",
         aso.carrier_id "carrierId",
-        RC.CAPACITY_NUMBER || RC2.CONSIGNEE_COMPANY_NAME || RS.SUPPLIER_NAME "liekCon"
+        RC.CAPACITY_NUMBER || RC2.CONSIGNEE_COMPANY_NAME || RS.SUPPLIER_NAME "liekCon",
+        RL.LINE_NAME    "lineName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
@@ -360,6 +361,8 @@
         on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
         left join rms_carrier rce
         on rce.carrier_id = aso.carrier_id
+        LEFT JOIN RMS_LINE  RL
+        ON RL.LINE_ID = OO.LINE_ID
         <where>
             <if test="status != null">
              and  OO.ORDER_STATUS = #{status}