修改

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.BmstruckFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -59,6 +60,9 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     @Autowired
     AmsSaleOrderServiceImpl amsSaleOrderService;
 
+    @Autowired
+    BmstruckFeign bmstruckFeign;
+
     @Override
     public int addAmsSaleOrderMaterial(AmsSaleOrderMaterial amsSaleOrderMaterial) {
         long id;
@@ -1114,6 +1118,11 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 mapListNoNetWeight.add(netMap);
                 //将这个车序号对应的订单完成
                 omstruckOrderMapper.updateOrderStatus(previousOrderId);
+                try {
+                    bmstruckFeign.addDetailsOrder(previousOrderId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 saleLogUtil.logOrder(previousOrderId,"执行合并操作,改变运单状态,车牌号为:" + previousCapacityNo,map, SaleLogUtil.UPDATE);
             }
             for (Map<String,Object> map1 : mapListNoNetWeight) {

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

@@ -4959,7 +4959,8 @@
       </foreach>
       </if>
       <if test="easPrimaryList == null">
-         and twr.RESULT_GROSS_WEIGHT_TIME + 2 > sysdate
+         and twr.RESULT_GROSS_WEIGHT_TIME + 10 > sysdate
+         and twr.RESULT_GROSS_WEIGHT_TIME + 1 &lt; sysdate
          ORDER BY twr.RESULT_GROSS_WEIGHT_TIME desc
          FETCH NEXT 50000 ROWS ONLY
       </if>