修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.15</version>
+    <version>1.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -685,8 +685,13 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
+        if(mapValue.containsKey("saleNo") && !"".equals(mapValue.get("saleNo"))) {
+            saleOrderId = amsDispatchSaleOrderMapper.getSaleIdByNo(mapValue.get("saleNo").toString());
+        }
         mapValue.put("saleOrderId",saleOrderId);
+
         PageHelper.startPage(pageNum,pageSize);
+
         List<Map<String, Object>> columndata = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columndata);
         return success(pageList);

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

@@ -59,4 +59,6 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
     BigDecimal selectCarrierBySaleOrderMaterialId(BigDecimal toSplitSaleOrderMaterialID);
 
+    BigDecimal getSaleIdByNo(String saleNo);
+
 }

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

@@ -227,4 +227,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     Map<String,Object> getCapacityDetailByAsom( Map<String,Object> map);
 
+    int getTransOrderIds();
+
 }

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

@@ -379,6 +379,9 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             String capacityNumber = (String) map.get("capacityNumber");
             // 得到运力id
             BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
+            if (capacityId == null) {
+                continue;
+            }
             // 收货方姓名
             String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
             // 收货方电话

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

@@ -3244,6 +3244,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public void getMakeDateTime() {
         Map<String, Object> Map = new HashMap<>();
         getEasPrimaryIds(Map);
+        disposeTransOrder();
+    }
+
+    private int disposeTransOrder() {
+        //查询过了截止日期的销售订单
+        int i = amsSaleOrderMapper.getTransOrderIds();
+        return i;
     }
 
     /**

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

@@ -735,4 +735,8 @@
         WHERE SALE_ORDER_MATERIAL_ID = #{toSplitSaleOrderMaterialID}
         FETCH FIRST 1 ROW ONLY
     </select>
+    <select id="getSaleIdByNo" resultType="java.math.BigDecimal">
+        SELECT ASO.SALE_ORDER_ID FROM AMS_SALE_ORDER ASO
+        WHERE ASO.SALE_NUMBER = #{saleNo}
+    </select>
 </mapper>

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

@@ -5038,5 +5038,17 @@
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         and ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
+  <update id="getTransOrderIds">
+    UPDATE OMSTRUCK_ORDER OO
+    SET OO.ORDER_STATUS = 7,
+        OO.INSERT_UPDATE_REMARK = '过期订单'
+    where oo.ORDER_ID in (
+    SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+    ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+    WHERE ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate - 1
+    and oo.ORDER_STATUS = 4
+    and oo.order_type = 2)
+  </update>
 
 </mapper>