Merge remote-tracking branch 'origin/master'

pom.xml

@@ -112,7 +112,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
+                        <param>OMSTRAIN_ORDER</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 //import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 
@@ -721,14 +718,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (result == 0) {
             return failed("匹配不到车牌号！");
         }
-        if (result==6){
-            return success("操作成功");
-        }
         else {
-            for (Map<String, Object> map : mapList) {
                 // 调用EAS接口将车牌号传给金蝶
-                BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
-                Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+                Map<String,Object> input = joinFeign.findCarNumberByOrderList(mapList);
                 Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
                 totalMap.put("input",input);
                 System.out.println(totalMap);
@@ -739,7 +731,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                     throw new Exception("登录金蝶失败");
                 }
                 System.out.println(s);
-            }
             return success(result);
         }
     }
@@ -1181,8 +1172,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         else {
             // 调用EAS接口将车牌号传给金蝶
-            BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
-            Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+            List<Map<String,Object>> mapList = new ArrayList<>();
+            mapList.add(mapValue);
+            Map<String, Object> input = joinFeign.findCarNumberByOrderList(mapList);
             Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
             totalMap.put("input", input);
             System.out.println(totalMap);
@@ -1289,4 +1281,31 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.adverseCloseSaleOrder(new BigDecimal(saleOrderId));
         return success(result);
     }
+
+    //库存调拨单
+    @ApiOperation(value = "库存调拨单")
+    @PostMapping("/getKucunList")
+    public RESTfulResult getKucunList(@RequestBody(required = false)Map<String,Object>map,
+                                      String startTime,
+                                      String endTime,
+                                      String remark,
+                                      String transferIndep,
+                                      String consigneeName,
+                                      String totheStation){
+        if(remark != null && !"null".equals(remark)&&!"".equals(remark)){
+            map.put("remark","%" + remark + "%");
+        }
+        if(transferIndep != null && !"null".equals(transferIndep) && !"".equals(transferIndep)){
+            map.put("transferIndep","%" + transferIndep + "%");
+        }
+        if(consigneeName != null && !"null".equals(consigneeName) && !"".equals(consigneeName)){
+            map.put("consigneeName","%" + consigneeName + "%");
+        }
+        if(totheStation != null && !"null".equals(totheStation) && !"".equals(totheStation)){
+            map.put("totheStation","%" + totheStation + "%");
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        List<Map<String,Object>> mapList = amsSaleOrderService.getKucunList(map);
+        return success(mapList);
+    }
 }

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

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -251,12 +250,8 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
     @PostMapping("dispatchInwardTruckOrderBySale")
     public RESTfulResult dispatchInwardTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
         int result = amsSaleOrderMaterialService.dispatchInwardTruckOrderBySale(mapValue);
-        if (result == -1) {
-            return failed("该销售订单的净重已达到97%");
-        }
-        else {
-            return success(result);
-        }
+        return success(result);
+
     }
 
     @ApiOperation(value = "更新内转钢材收货客户")

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,4 +34,8 @@ public interface JoinFeign {
     // 查询车牌号和金蝶分录
     @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderId")
     Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    //根据数组查询车牌号、承运商和金蝶分录
+    @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderList")
+    Map<String, Object> findCarNumberByOrderList(@RequestBody List<Map<String, Object>> mapList);
 }

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

@@ -155,4 +155,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     Map<String, Object> getSaleMaterialMessage(BigDecimal saleMaterialId);
 
     int findOrderMaxNum(BigDecimal resultTotalId);
+
+    List<Map<String, Object>> getKucunList(Map<String, Object> map);
+
 }

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

@@ -1,8 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.AmsSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrderMaterial;
-
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.List;
@@ -169,4 +166,7 @@ public interface IAmsSaleOrderService {
     int adverseCloseSaleMaterial(BigDecimal saleMaterialId);
     // 反关闭整个销售订单
     int adverseCloseSaleOrder(BigDecimal saleOrderId);
+
+    List<Map<String, Object>> getKucunList(Map<String, Object> map);
+
 }

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.controller.AmsSaleTrucknoMaterialController;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
@@ -12,8 +11,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -520,7 +517,13 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
 
     @Override
     public int updateInwardConsignee(Map<String, Object> mapValue) {
-        return amsSaleOrderMaterialMapper.updateInwardConsignee(mapValue);
+        if(mapValue.get("saleMaterialId") != null && mapValue.get("sendStationId") != null ){
+            amsSaleOrderMaterialMapper.updateSendStation(mapValue);
+        }
+        if(mapValue.get("saleOrderId") != null && mapValue.get("consigneeId") != null){
+            amsSaleOrderMaterialMapper.updateInwardConsignee(mapValue);
+        }
+        return 1;
     }
 
     /**

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

@@ -790,7 +790,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             throw new Exception("订单未审核，无法派车！");
         }
         int result = 0;
-        BigDecimal isSteel=null;
         // 遍历每一行
         for (Map<String,Object> map : mapList) {
             // 得到车牌号
@@ -808,16 +807,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 找到详细地址下的省市县id
                 BigDecimal addressId = amsSaleOrderMapper.getAddressByPlace(placeId);
                 // 根据省市县匹配出省市县下的所有单价
-                Map<String,Object> hashMap = new HashMap<>();
-                hashMap.put("addressId",addressId);
-                hashMap.put("carrierId",carrierId);
-                List<Map<String,Object>> priceList = amsSaleOrderMapper.getAddressPriceList(hashMap);
+                Map<String, Object> hashMap = new HashMap<>();
+                hashMap.put("addressId", addressId);
+                hashMap.put("carrierId", carrierId);
+                List<Map<String, Object>> priceList = amsSaleOrderMapper.getAddressPriceList(hashMap);
                 // 如果长度为0，说明此地址所在省市县内也无单价
                 if (priceList != null && priceList.size() != 0) {
                     Map<String, Object> priceMap = priceList.get(0);
                     priceId = (BigDecimal) priceMap.get("priceId");
-                }
-                else {
+                } else {
                     priceId = new BigDecimal(2400);
                 }
             }
@@ -825,17 +823,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
             // 司机电话号码
             String driverTel = (String) map.get("driverTel");
-            //判断是否为内转异地库到钢材
-            BigDecimal isIwardSteel =DataChange.dataToBigDecimal(map.get("isIwardSteel"));
-            if (isIwardSteel==null&&isIwardSteel.intValue()==0) {
-                 isSteel = new BigDecimal(1);
-            }
+            BigDecimal isSteel = new BigDecimal(1);
             // 得到运力id
             BigDecimal capacityId = amsSaleOrderMaterialMapper.getCapacityId(capacityNumber);
             if (capacityId == null) {
                 return 0;
             }
-            List<Map<String,Object>> materialList = amsSaleOrderMaterialMapper.getMaterial(saleOrderMaterialId);
+            List<Map<String, Object>> materialList = amsSaleOrderMaterialMapper.getMaterial(saleOrderMaterialId);
             /*
              定向派单表
              */
@@ -869,9 +863,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
              运输订单
              */
             OmstruckOrder omstruckOrder = new OmstruckOrder();
-            Map<String,Object> map1 = new HashMap<>();
-            map1.put("orderType",new BigDecimal(2));
-            map1.put("orderPlanId",saleOrderMaterialId);
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("orderType", new BigDecimal(2));
+            map1.put("orderPlanId", saleOrderMaterialId);
             List<OmstruckOrder> omstruckOrders = omstruckOrderMapper.selectByParameters(map1);
             if (omstruckOrders == null || omstruckOrders.size() == 0) {
                 // 运输订单主键
@@ -880,11 +874,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 车序号主键
                 omstruckOrder.setOrderPlanId(saleOrderMaterialId);
                 //添加承运商ID 和 运价ID
-                //Object priceId = map.get("priceId");
+//            Object priceId = map.get("priceId");
                 if (priceId != null) {
                     omstruckOrder.setPriceId(priceId);
-                }
-                else {
+                } else {
                     omstruckOrder.setPriceId(new BigDecimal(0));
                 }
                 omstruckOrder.setCarrierId(carrierId);
@@ -909,10 +902,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 if (isSteel != null && isSteel.intValue() == 1) {
                     status = new BigDecimal(1);
                 }
-                //内转钢材到异地库设置为4
-                 else if (isIwardSteel!=null&&isIwardSteel.intValue()==4){
-                    status = new BigDecimal(4);
-                }
                 // 非钢材（危化品，焦炭，副产品）
                 else {
                     status = new BigDecimal(2);
@@ -924,9 +913,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrder.setInsertTime(new Date());
                 omstruckOrder.setInsertUsername("");
                 result += omstruckOrderMapper.insertSelective(omstruckOrder);
-
-            }
-            else {
+            } else {
                 omstruckOrder = omstruckOrders.get(0);
             }
             for (Map<String, Object> materialMap : materialList) {
@@ -952,31 +939,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
             // 调用websocket
-            Map<String,Object> orderIdMap = new HashMap<>();
-            orderIdMap.put("orderId",omstruckOrder.getOrderId());
+            Map<String, Object> orderIdMap = new HashMap<>();
+            orderIdMap.put("orderId", omstruckOrder.getOrderId());
             amsSaleOrderMaterialService.pushMesToWebsocket(orderIdMap);
             // 生成运输执行总实绩
             result += tmsTruckFeign.addTotalResult(orderIdMap);
-            //根据返回的总实绩id新增
-            if (map.get("sendStationId")!=null){
-                BigDecimal maxId = tmstrainPleaseApproveResultMapper.getMaxId();
-                BigDecimal saleOrderId =DataChange.dataToBigDecimal(map.get("saleOrderId"));
-                TmstrainPleaseApproveResult tmstrainPleaseApproveResult=new TmstrainPleaseApproveResult();
-                tmstrainPleaseApproveResult.setResultId(maxId);
-                tmstrainPleaseApproveResult.setRailPlanId(saleOrderId);
-                tmstrainPleaseApproveResult.setSendStationId(DataChange.dataToBigDecimal(map.get("sendStationId")));
-                tmstrainPleaseApproveResult.setResultPleasePlanNo(DataChange.generateEightDigitsNumber("WPCJH",maxId.intValue()));
-                tmstrainPleaseApproveResult.setResultPlanDate(new Date());
-                tmstrainPleaseApproveResult.setResultCategory("钢材");
-                tmstrainPleaseApproveResult.setResultType(new BigDecimal(4));
-                tmstrainPleaseApproveResult.setInsertTime(new Date());
-                tmstrainPleaseApproveResult.setInsertUpdateRemark("内转钢材到异地库");
-                tmstrainPleaseApproveResultMapper.insertSelective(tmstrainPleaseApproveResult);
-
-            }
-            return 6;
         }
-        return result;
+        return  result;
     }
 
     /**
@@ -1937,5 +1906,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         return result;
     }
 
+    @Override
+    public List<Map<String, Object>> getKucunList(Map<String, Object> map) {
+        return amsSaleOrderMapper.getKucunList(map);
+    }
+
 
 }

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

@@ -156,11 +156,11 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setInsertUsername("admin");
             amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
-            if(mapValue.get("rangeId") != null){
-                //承运起止范围
-                requireMaterialMap.put("rangeId",mapValue.get("rangeId"));
-                amsContractTruckPriceService.insertLineNodePoint(requireMaterialMap);
-            }
+            //if(mapValue.get("rangeId") != null){
+            //    //承运起止范围
+            //    requireMaterialMap.put("rangeId",mapValue.get("rangeId"));
+            //    amsContractTruckPriceService.insertLineNodePoint(requireMaterialMap);
+            //}
         }
         return result;
     }

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

@@ -27,7 +27,7 @@ public class EASTestUtil {
     public final String dbType = "1";
     public final String userName = "user";
     // context
-    public final String command = "saveSaleOrderBillHandler";
+    public final String command = "updateSaleOrderCarNumHandler";
 
     /**
      * 得到context的map

src/main/resources/application-dev.yml

@@ -15,13 +15,13 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.166:8006}
 
 
   #测试环境端口
 server:
-    port: 8079
+    port: 8015

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

@@ -1815,6 +1815,7 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
+    a_s_order.SALE_TYPE ,
     DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     a_s_order.CLOSE_STATUS "closeStatus"
@@ -1829,7 +1830,9 @@
     on RM.MATERIAL_ID = ASM.MATERIAL_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is not null
-    and a_s_order.DELETED = 0) SSSR
+    and a_s_order.DELETED = 0
+    and a_s_order.SALE_TYPE is null
+    ) SSSR
     <if test="con != null" >
       where SSSR."consigneeCompanyName" LIKE #{con}
     </if>
@@ -3416,7 +3419,8 @@
            RM.MATERIAL_CODE                                                 AS "materialCode",
            ASM.MATERIAL_NUMBER                                              AS "materialNumber",
            ASM.STEEL_METER                                                  AS "steelMeters",
-           ASM.IS_POUND_SALE                                                AS "isPoundSale"
+           ASM.IS_POUND_SALE                                                AS "isPoundSale",
+           ASOM.TRUCK_REMARK                                                AS "truckRemark"
     FROM AMS_SALE_ORDER ASO
            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                      ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3433,9 +3437,9 @@
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
-  <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.Map" >
-    SELECT DISTINCT *
-    FROM (SELECT RRP.PLACE_ID "placeId",
+  <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.LinkedHashMap" >
+    SELECT  *
+    FROM (SELECT DISTINCT RRP.PLACE_ID "placeId",
     RRP.ADDRESS_DELIVERY_ADDRESS "place",
     RRA.ADDRESS_ID "shipperAddressId",
     RRA.ADDRESS_PROVINCE "addressProvince",
@@ -4456,4 +4460,65 @@
     FROM TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
     WHERE TLFR.RESULT_TOTAL_ID = #{resultTotalId}
   </select>
+    <select id="getKucunList" resultType="java.util.Map" parameterType="java.util.Map">
+      SELECT * FROM (
+                      SELECT ASO.SALE_NUMBER "saleNo", ASO.SALE_REMARK "saleRemark",
+                             RAS1.ARRIVAL_NAME      "sendStation",
+                             RAS.ARRIVAL_NAME       "toTheStation",
+                        RM.MATERIAL_NAME       "materialName",
+                        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpa",
+                        ASM.MATERIAL_NUMBER                                    "materialNum",
+                        ASM.MATERIAL_WEIGHT                                    "materialWeight",
+                        RDOINDEP.ORG_NAME                                       "transInDep",
+                        RDOOUTDEP.ORG_NAME                                         "transOutDep",
+                        RISWINOF.INWARD_WAREHOUSE_NAME                           "transInWarehouse",
+                        RC.CONSIGNEE_COMPANY_NAME                              "receiveName",
+                        ASO.SALE_ORDER_ID                                       "saleOrderId",
+                        RAS1.ARRIVAL_ID                                         "sendStationId",
+                        RAS.ARRIVAL_ID                                          "toTheStationId",
+                        ASM.IS_POUND_SALE                                       "isPoundSale",
+                        ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
+                        TPAR.RESULT_ID                                          "approveId"
+
+                      FROM AMS_SALE_ORDER ASO
+                        LEFT JOIN AMS_SALE_MATERIAL ASM
+                      ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                        LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT  TPAR
+                        ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
+                        LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS
+                        ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                        LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS1
+                        ON RAS1.ARRIVAL_ID = TPAR.SEND_STATION_ID
+                        LEFT JOIN RMS_CONSIGNEE           RC
+                        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                        LEFT JOIN RMS_DEP_ORG   RDOINDEP
+                        ON RDOINDEP.ORG_CODE = ASO.TRANSFER_IN_DEP
+                        LEFT JOIN RMS_DEP_ORG  RDOOUTDEP
+                        ON RDOOUTDEP.ORG_CODE = ASO.TRANSFER_OUT_DEP
+                        LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF
+                        ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
+                      WHERE ASO.SALE_TYPE = 4
+                      <if test="oneDate != null">
+                        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+                      </if>
+                      <if test="startDate != null">
+                        and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+                        and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+                      </if>
+                      <if test="remark != null">
+                        and ASO.SALE_REMARK||RM.MATERIAL_NAME LIKE #{remark}
+                      </if>
+                      <if test="totheStation != null">
+                        and RAS.ARRIVAL_NAME LIKE #{totheStation}
+                      </if>
+                      <if test="consigneeName != null">
+                        and RC.CONSIGNEE_COMPANY_NAME like #{consigneeName}
+                      </if>
+                      <if test="transferIndep != null">
+                        and RISWINDEP.INWARD_WAREHOUSE_NAME = #{transferIndep}
+                      </if>
+       )
+    </select>
 </mapper>

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

@@ -833,7 +833,7 @@
     update
       TMSTRAIN_PLEASE_APPROVE_RESULT
     set SEND_STATION_ID=#{sendStationId}
-    WHERE RAIL_PLAN_ID=#{saleOrderId}
+    WHERE RAIL_PLAN_ID=#{saleMaterialId}
   </update>
   <update id="updateInwardConsignee">
     update