Merge remote-tracking branch 'origin/master'

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

@@ -581,7 +581,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          String saler
                                                          ) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
-            mapValue.put("con", con);
+            mapValue.put("con", "%" + con + "%");
         }
         if(shipperId != null  && !"".equals(shipperId) && !"null".equals(shipperId)){
             mapValue.put("shipperId", shipperId);
@@ -1431,4 +1431,11 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.reverseCloseOrder(map);
         return success(result);
     }
+
+    @ApiOperation("查询销售订单状态")
+    @PostMapping("getSaleOrderStatus")
+    public RESTfulResult getSaleOrderStatus(@RequestParam String saleNumber){
+        int result = amsSaleOrderService.getSaleOrderStatus(saleNumber);
+        return success(result);
+    }
 }

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

@@ -161,6 +161,14 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+        columnList.forEach(e->{
+            String tel = e.get("Tel").toString();
+            if (tel.length()==11){
+                return;
+            }
+            String telNew=tel.substring(0,11)+"-"+tel.substring(11,tel.length());
+            e.put("Tel",telNew);
+        });
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }

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

@@ -65,5 +65,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
 
+    int updateDCodd();
 
+    int updateDCnew();
 }

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

@@ -176,4 +176,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     Map<String, Object> getOrderMes(Map<String, Object> mapValue);
 
+    int updateSaleOrderStatus(String saleNumber);
+
 }

src/main/java/com/steerinfo/dil/service/IAmsContractTruckPriceService.java

@@ -68,4 +68,8 @@ public interface IAmsContractTruckPriceService {
     List<Map<String, Object>> getwz(Map<String, Object> map);
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
+
+    int updateDCodd();
+
+    int updateDCnew();
 }

src/main/java/com/steerinfo/dil/service/IAmsSaleOrderService.java

@@ -173,4 +173,6 @@ public interface IAmsSaleOrderService {
 
     int reverseCloseOrder(Map<String, Object> map);
 
+    int getSaleOrderStatus(String saleNumber);
+
 }

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

@@ -82,58 +82,117 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
     @Override
     public int insertTruck(Map<String,Object> mapValue) {
         BigDecimal shipperId = DataChange.dataToBigDecimal(mapValue.get("shipperId"));
-        BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
-        BigDecimal addressId = DataChange.dataToBigDecimal(mapValue.get("addressId"));
-        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
-        BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
-        BigDecimal cargonameId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
-        BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
-        Date priceDate = new Date((Long)mapValue.get("priceDate"));
-        BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
-        BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
-        BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
-        BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
-        AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
-        String place = (String) mapValue.get("place");
-        if (place != null && place.length() != 0) {
-            BigDecimal placeId = rmsReceivePlaceMapper.getPlaceId(mapValue);
-            if (placeId != null) {
-                amsContractTransportPrice.setPlaceId(placeId);
+//        BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
+        String carrierId = mapValue.get("carrierId").toString().replace("[","").replace("]","").replace(" ","");
+        String[] split = carrierId.split(",");
+        if (split.length>1) {
+            for (int i = 0; i < split.length; i++) {
+                BigDecimal addressId = DataChange.dataToBigDecimal(mapValue.get("addressId"));
+                BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
+                BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+                BigDecimal cargonameId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
+                BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
+                Date priceDate = new Date((Long)mapValue.get("priceDate"));
+                BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
+                BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
+                BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
+                BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
+                AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
+                String place = (String) mapValue.get("place");
+                if (place != null && place.length() != 0) {
+                    BigDecimal placeId = rmsReceivePlaceMapper.getPlaceId(mapValue);
+                    if (placeId != null) {
+                        amsContractTransportPrice.setPlaceId(placeId);
+                    }
+                    else {
+                        RmsReceivePlace rmsReceivePlace = new RmsReceivePlace();
+                        rmsReceivePlace.setAddressId(addressId);
+                        rmsReceivePlace.setAddressDeliveryAddress(place);
+                        rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
+                        amsContractTransportPrice.setPlaceId(rmsReceivePlace.getPlaceId());
+                        rmsReceivePlaceMapper.insertSelective(rmsReceivePlace);
+                    }
+                }
+                amsContractTransportPrice.setType(type);
+                amsContractTransportPrice.setOilpriceBase(oilpriceBase);
+                amsContractTransportPrice.setShipperId(shipperId);
+                amsContractTransportPrice.setOilpriceChangeThreshold(oilpriceChangeThreshold);
+                amsContractTransportPrice.setOilTypeId(oilTypeId);
+                amsContractTransportPrice.setPriceValue(priceValue);
+                amsContractTransportPrice.setPriceDate(priceDate);
+                amsContractTransportPrice.setCapacityTypeId(capacityTypeId);
+                amsContractTransportPrice.setCargonameId(cargonameId);
+                amsContractTransportPrice.setCarrierId(DataChange.dataToBigDecimal(split[i]));
+                //生成主键id
+                amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+                if(lineId == null){
+                    //计算并插入吨公里
+                    BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometer(lineId, priceValue);
+                    amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
+                }
+                amsContractTransportPrice.setType(new BigDecimal(1));
+                amsContractTransportPrice.setInsertUsername("admin");
+                amsContractTransportPrice.setInsertTime(new Date());
+                amsContractTransportPrice.setUpdateUsername("admin");
+                amsContractTransportPrice.setUpdateTime(new Date());
+                amsContractTransportPrice.setInsertUpdateRemark("无");
+                amsContractTransportPrice.setDeleted(new BigDecimal(0));
+                amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
             }
-            else {
-                RmsReceivePlace rmsReceivePlace = new RmsReceivePlace();
-                rmsReceivePlace.setAddressId(addressId);
-                rmsReceivePlace.setAddressDeliveryAddress(place);
-                rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
-                amsContractTransportPrice.setPlaceId(rmsReceivePlace.getPlaceId());
-                rmsReceivePlaceMapper.insertSelective(rmsReceivePlace);
+            return 1;
+        }else{
+            BigDecimal addressId = DataChange.dataToBigDecimal(mapValue.get("addressId"));
+            BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
+            BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+            BigDecimal cargonameId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
+            BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
+            Date priceDate = new Date((Long)mapValue.get("priceDate"));
+            BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
+            BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
+            BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
+            BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
+            AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
+            String place = (String) mapValue.get("place");
+            if (place != null && place.length() != 0) {
+                BigDecimal placeId = rmsReceivePlaceMapper.getPlaceId(mapValue);
+                if (placeId != null) {
+                    amsContractTransportPrice.setPlaceId(placeId);
+                }
+                else {
+                    RmsReceivePlace rmsReceivePlace = new RmsReceivePlace();
+                    rmsReceivePlace.setAddressId(addressId);
+                    rmsReceivePlace.setAddressDeliveryAddress(place);
+                    rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
+                    amsContractTransportPrice.setPlaceId(rmsReceivePlace.getPlaceId());
+                    rmsReceivePlaceMapper.insertSelective(rmsReceivePlace);
+                }
             }
+            amsContractTransportPrice.setType(type);
+            amsContractTransportPrice.setOilpriceBase(oilpriceBase);
+            amsContractTransportPrice.setShipperId(shipperId);
+            amsContractTransportPrice.setOilpriceChangeThreshold(oilpriceChangeThreshold);
+            amsContractTransportPrice.setOilTypeId(oilTypeId);
+            amsContractTransportPrice.setPriceValue(priceValue);
+            amsContractTransportPrice.setPriceDate(priceDate);
+            amsContractTransportPrice.setCapacityTypeId(capacityTypeId);
+            amsContractTransportPrice.setCargonameId(cargonameId);
+            amsContractTransportPrice.setCarrierId(DataChange.dataToBigDecimal(split[0]));
+            //生成主键id
+            amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+            if(lineId == null){
+                //计算并插入吨公里
+                BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometer(lineId, priceValue);
+                amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
+            }
+            amsContractTransportPrice.setType(new BigDecimal(1));
+            amsContractTransportPrice.setInsertUsername("admin");
+            amsContractTransportPrice.setInsertTime(new Date());
+            amsContractTransportPrice.setUpdateUsername("admin");
+            amsContractTransportPrice.setUpdateTime(new Date());
+            amsContractTransportPrice.setInsertUpdateRemark("无");
+            amsContractTransportPrice.setDeleted(new BigDecimal(0));
+            return amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
         }
-        amsContractTransportPrice.setType(type);
-        amsContractTransportPrice.setOilpriceBase(oilpriceBase);
-        amsContractTransportPrice.setShipperId(shipperId);
-        amsContractTransportPrice.setOilpriceChangeThreshold(oilpriceChangeThreshold);
-        amsContractTransportPrice.setOilTypeId(oilTypeId);
-        amsContractTransportPrice.setPriceValue(priceValue);
-        amsContractTransportPrice.setPriceDate(priceDate);
-        amsContractTransportPrice.setCapacityTypeId(capacityTypeId);
-        amsContractTransportPrice.setCargonameId(cargonameId);
-        amsContractTransportPrice.setCarrierId(carrierId);
-        //生成主键id
-        amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
-        if(lineId == null){
-            //计算并插入吨公里
-            BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometer(lineId, priceValue);
-            amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
-        }
-        amsContractTransportPrice.setType(new BigDecimal(1));
-        amsContractTransportPrice.setInsertUsername("admin");
-        amsContractTransportPrice.setInsertTime(new Date());
-        amsContractTransportPrice.setUpdateUsername("admin");
-        amsContractTransportPrice.setUpdateTime(new Date());
-        amsContractTransportPrice.setInsertUpdateRemark("无");
-        amsContractTransportPrice.setDeleted(new BigDecimal(0));
-        return amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
     }
 
     /**

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

@@ -744,4 +744,14 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         return value;
     }
 
+    @Override
+    public int updateDCodd() {
+        return amsContractTruckPriceMapper.updateDCodd();
+    }
+
+    @Override
+    public int updateDCnew() {
+        return amsContractTruckPriceMapper.updateDCnew();
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
 import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -87,6 +90,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     WmspOutboundResultMaterialMapper wmspOutboundResultMaterialMapper;
 
+    @Resource
+    EasSaleOrderStatusUtil easSaleOrderStatusUtil;
+
 
     @Override
     public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
@@ -2063,5 +2069,30 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         return 1;
     }
 
+    @Override
+    public int getSaleOrderStatus(String saleNumber) {
+        int result = 0;
+        Map<String,Object> input = new HashMap<>();
+        // 销售订单号
+        input.put("number",saleNumber);
+        Map<String, Object> totalMap = easSaleOrderStatusUtil.getTotalMap();
+        totalMap.put("input",input);
+        // 调用金蝶关闭接口
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+        System.out.println(resultMap);
+        String outPutMap = (String) resultMap.get("output");
+        JSONObject jsonObject = JSON.parseObject(outPutMap);
+        if(jsonObject != null){
+            result = DataChange.dataToBigDecimal(jsonObject.get("NumberStatus")).intValue();
+        }
+        if(result == 7){
+            //如果为7则更新
+            amsSaleOrderMapper.updateSaleOrderStatus(saleNumber);
+        }
+        return result;
+    }
+
 
 }

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.service.IAmsContractTruckPriceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/***文档注释***********************************************
+ * 作者            ：hjh
+ * 创建日期     ：2022/9/23 14:37
+ * 描述            ：
+ * 注意事项     ：
+ * 遗留BUG   ：
+ * 修改日期     ：
+ * 修改人员     ：
+ * 修改内容     ：
+ ***********************************************************/
+
+@Component
+public class ScheduledTasks {
+
+    @Autowired
+    IAmsContractTruckPriceService amsContractTruckPriceService;
+    //创建定时任务线程池
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+        taskScheduler.setPoolSize(64);
+        return taskScheduler;
+    }
+
+    @Scheduled(cron = "0 0 0 26 9 ?")
+    public void updateDCPrice() {
+        //修改吊车价格为最新运价
+        amsContractTruckPriceService.updateDCodd();
+        amsContractTruckPriceService.updateDCnew();
+    }
+/*    @Scheduled(cron = "0 0 0 26 9 ? 2022-2022")
+    public void updateXSGCPrice() {
+        //修改销售钢材价格为最新运价
+
+    }*/
+}

src/main/java/com/steerinfo/dil/util/EasSaleOrderStatusUtil.java

@@ -0,0 +1,73 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EasSaleOrderStatusUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "FindStatusHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}
+

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

@@ -730,6 +730,7 @@
 --     where a_t_price.DELETED = 0
 --     and a_t_price.TYPE = 1 and a_t_price.DEPARTMENT = 2
     <where>
+        TYPE=1
         <if test="deleted != null">
           and a_t_price.DELETED = #{deleted}
         </if>
@@ -903,12 +904,13 @@
     select LINE_PATH_LENGTH "linePathLength" from RMS_LINE where LINE_ID = #{lineId}
   </select>
 
-  <select id="getPriceValueList" resultType="java.util.LinkedHashMap">
+  <select id="getPriceValueList" resultType="java.util.Map">
     select a_t_price.PRICE_ID "priceId",
            a_t_price.PRICE_VALUE "priceValue",
            a_t_price.OILPRICE_BASE "oilpriceBase",
            a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
-           a_t_price.CARGONAME_ID "cargonameId"
+           a_t_price.CARGONAME_ID "cargonameId",
+           a_t_price.haul_distance "haulDistance"
     from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
     where a_t_price.OIL_TYPE_ID = #{oilTypeId} and a_t_price.DELETED = 0
   </select>
@@ -1091,4 +1093,12 @@
     left join BMSTRUCK_FORMULA bf on t.cargoname_id=bf.formula_id
     where price_id=#{priceId}
   </select>
+
+  <update id="updateDCodd">
+    update AMS_CONTRACT_TRANSPORT_PRICE set deleted =1 where capacity_type_id in (20,21,22,23,24,25,26,27,28,41,42,40) and deleted =0
+  </update>
+
+  <update id="updateDCnew">
+   update AMS_CONTRACT_TRANSPORT_PRICE set deleted =0 where capacity_type_id in (20,21,22,23,24,25,26,27,28,41,42,40) and price_date  = to_date('2022-09-26', 'yyyy-mm-dd');
+  </update>
 </mapper>

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

@@ -1964,7 +1964,7 @@
     and ASM.DELETED IS NULL
     and ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="con != null">
-      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+      and r_consignee.CONSIGNEE_COMPANY_NAME||a_s_order.SALE_NUMBER||rm.material_name||RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like #{con}
     </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
@@ -4609,4 +4609,9 @@
     set ASOM.SALE_ORDER_CONSIGNEE_TEL=#{consigneeTel}
     WHERE ASOM.SALE_ORDER_MATERIAL_ID=#{saleodermatetialid}
   </update>
+    <update id="updateSaleOrderStatus">
+      update AMS_SALE_ORDER ASO
+      set aso.DELETED = 2
+      WHERE ASO.SALE_NUMBER = #{saleNumber}
+    </update>
 </mapper>

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

@@ -653,6 +653,7 @@
             and AIP.PLAN_STATUS = 2
         </if>
         <if test="planStatus == 3">
+            and AIP.PLAN_STATUS = 3
             and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
         <if test="con != null">