修改

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

@@ -384,7 +384,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
         }
         if (orderStatus.equals("4") && closeStatus.equals("1")){
-
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
             amsSaleOrder.setSaleOrderStatus(new BigDecimal(4));
             amsSaleOrder.setDeleted(new BigDecimal(0));

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

@@ -1034,8 +1034,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 }
                 //判断该分录是不是在物流系统,如果不在返回true
                 int j = tmstruckWeightResultMapper.checkOrder(map);
-                //根据运输订单号查询计量实绩ID
-                BigDecimal weightTaskResultId = tmstruckWeightResultMapper.getWeightTaskResultIdNoNet(map);
                 BigDecimal saleMaterialId = tmstruckWeightResultMapper.getSaleMaterialId(map);
                 //判断该分录在计量实绩表里有没有净重,如果有
                 try {
@@ -1047,6 +1045,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                //根据运输订单号查询计量实绩ID
+                BigDecimal weightTaskResultId = tmstruckWeightResultMapper.getWeightTaskResultIdNoNet(map);
                 if(weightTaskResultId != null && saleMaterialId != null) {
                     //更新计量实绩
                     System.out.println("更新计量实绩校验");

src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ openfeign:
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8009}
 server:

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

@@ -1279,10 +1279,16 @@
         ON TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
-        AND OO.ORDER_STATUS = 5
         AND OO.ORDER_TYPE in (1,4)
         AND TWR.RESULT_NET_WEIGHT IS NULL
+        AND ASM.EAS_PRIMARY_ID = #{flId}
         ORDER BY TWR.WEIGHT_TASK_RESULT_ID
         FETCH FIRST 1 ROW ONLY
     </select>