Merge branch 'master' into dev

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

@@ -63,8 +63,8 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping("/lockDispatchSaleOrder")
     public RESTfulResult lockDispatchSaleOrder(@RequestParam Integer dispatchId,
-                                               @RequestParam Integer carrierId) {
-        int result = amsDispatchSaleOrderService.lockDispatchSaleOrder(new BigDecimal(dispatchId),new BigDecimal(carrierId));
+                                               @RequestParam String carrierSsoId) {
+        int result = amsDispatchSaleOrderService.lockDispatchSaleOrder(new BigDecimal(dispatchId),carrierSsoId);
         return success(result);
     }
 
@@ -77,11 +77,11 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              String carrierSSOId){
+                                              String carrierSsoId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        mapValue.put("carrierSSOId",carrierSSOId);
+        mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
@@ -99,6 +99,7 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer dispatchType,
+                                                    String carrierSsoId,
                                                     String con){
         if (con != null) {
             if(!"undefined".equals(con)){
@@ -107,8 +108,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             }
         }
         mapValue.put("dispatchType",dispatchType);
+        mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == 1) {
+        if (mapValue.size() == 2) {
             //将查询结果存入索引中
             dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
             Map<String, Object> map1 = new HashMap<>();

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

@@ -127,13 +127,13 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer planStatus,
-                                          Integer carrierId,
+                                          String carrierId,
                                           Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (carrierId != null && !"undefined".equals(carrierId.toString())) {
-            mapValue.put("carrierId",new BigDecimal(carrierId));
+        if (carrierId != null && !"undefined".equals(carrierId)){
+            mapValue.put("carrierId",carrierId);
         }
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));

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

@@ -122,7 +122,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  String con) {
         if (con != null) {
             if (!con.equals("undefined")) {
-                String index="get_truck_requirement_list";//设置要查询的索引名称
+                String index="get_truck_requirement_list2";//设置要查询的索引名称
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
             }
         }
@@ -136,7 +136,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             truckRequirementList =  amstruckInwardRequirementService.getTruckRequirementList(mapValue);
             Map<String, Object> map1 = new HashMap<>();
             //添加索引
-            map1.put("index","get_truck_requirement_list");
+            map1.put("index","get_truck_requirement_list2");
             //添加id
             map1.put("indexId","requirementId");
             truckRequirementList.add(map1);
@@ -165,16 +165,17 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
     public RESTfulResult getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId) {
+                                                 Integer apiId,
+                                                 String  con) {
 //        if (con != null) {
 //            if (!con.equals("undefined")) {
 //                String index="get_purchase_batch";//设置要查询的索引名称
 //                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
 //            }
 //        }
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
+//        if (mapValue == null) {
+//            mapValue = new HashMap<>();
+//        }
 //        List<Map<String, Object>> truckRequirementList = null;
 //        if (mapValue.size() == 0) {
 //            //将查询结果存入索引中
@@ -193,7 +194,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
 //        if (truckRequirementList == null) {
 //            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
 //        }
-        List<Map<String, Object>> truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+        List<Map<String,Object>> truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);

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

@@ -42,5 +42,5 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
     List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
 
     // 通过ssoid查询承运商
-    BigDecimal getCarrierIdBySSO(String carrierSSOId);
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
 }

src/main/java/com/steerinfo/dil/model/AmstruckInwardRequirement.java

@@ -55,7 +55,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
      * 费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）(REQUIREMENT_WORK_TYPE,DECIMAL,38)
      */
     @ApiModelProperty(value="费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）",required=false)
-    private BigDecimal requirementWorkType;
+    private String requirementWorkType;
 
     /**
      * 作业内容(REQUIREMENT_WORK_CONTENT,VARCHAR,20)
@@ -215,11 +215,11 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.requirementShipperId = requirementShipperId;
     }
 
-    public BigDecimal getRequirementWorkType() {
+    public String getRequirementWorkType() {
         return requirementWorkType;
     }
 
-    public void setRequirementWorkType(BigDecimal requirementWorkType) {
+    public void setRequirementWorkType(String requirementWorkType) {
         this.requirementWorkType = requirementWorkType;
     }
 

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

@@ -39,10 +39,10 @@ public interface IAmsDispatchSaleOrderService{
     /**
      * 抢单
      * @param dispatchId
-     * @param carrierId
+     * @param carrierSsoId
      * @return
      */
-    int lockDispatchSaleOrder(BigDecimal dispatchId,BigDecimal carrierId);
+    int lockDispatchSaleOrder(BigDecimal dispatchId,String carrierSsoId);
 
     /**
      * 查询app端已抢的销售订单

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

@@ -147,11 +147,12 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     /**
      * 抢单/接收订单
      * @param dispatchId
-     * @param carrierId
+     * @param carrierSsoId
      * @return
      */
     @Override
-    public int lockDispatchSaleOrder(BigDecimal dispatchId, BigDecimal carrierId) {
+    public int lockDispatchSaleOrder(BigDecimal dispatchId, String carrierSsoId) {
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(dispatchId);
         amsDispatchSaleOrder.setDispatchDealTime(new Date());
         amsDispatchSaleOrder.setCarrierId(carrierId);
@@ -253,8 +254,8 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
-        String carrierSSOId = (String) mapValue.get("carrierSSOId");
-        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSSOId);
+        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
         mapValue.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
@@ -340,6 +341,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue) {
+        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        mapValue.put("carrierId",carrierId);
         List<Map<String, Object>> dispatchSaleOrderList = amsDispatchSaleOrderMapper.getPCDispatchSaleOrderList(mapValue);
         for (Map<String,Object> map: dispatchSaleOrderList) {
 //            Date dispatchDealTime = (Date) map.get("dispatchDealTime");

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

@@ -50,7 +50,6 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     public int  insert(Map<String,Object> mapValue) {
         Integer purchaseOrderId = (Integer) mapValue.get("purchaseOrderId");
         String requirementType = (String) mapValue.get("requirementType");
-        Integer capacityTypeId = (Integer) mapValue.get("capacityTypeId");
         Date requirementTruckTime = new Date((Long) mapValue.get("requirementTruckTime"));
         Integer requirementShipperId = (Integer) mapValue.get("requirementShipperId");
         String requirementWorkType = (String) mapValue.get("requirementWorkType");
@@ -74,7 +73,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementType(requirementType);
         amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(1));
         amstruckInwardRequirement.setRequirementTruckTime(requirementTruckTime);
-        amstruckInwardRequirement.setRequirementWorkType(new BigDecimal(requirementWorkType));
+        amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
         amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
@@ -123,27 +122,6 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         else {
             mapList = amstruckInwardRequirementMapper.getTruckRequirementList(mapValue);
         }
-        for (Map<String,Object> map : mapList) {
-            BigDecimal workType = (BigDecimal) map.get("requirementWorkType");
-            map.remove("requirementWorkType");
-            String requirementWorkType;
-            switch (workType.intValue()) {
-                case 0 : requirementWorkType = "日常内转费";
-                    break;
-                case 1 : requirementWorkType = "推进办费用";
-                    break;
-                case 2 : requirementWorkType = "大修费用";
-                    break;
-                case 3 : requirementWorkType = "新增建设项目";
-                    break;
-                case 4 : requirementWorkType = "外委吊车";
-                    break;
-                case 5 : requirementWorkType = "外委转机";
-                    break;
-                default: requirementWorkType = "环保绿化项目";
-            }
-            map.put("workType",requirementWorkType);
-        }
         return mapList;
     }
 

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

@@ -520,7 +520,9 @@
                  LEFT JOIN RMS_CARRIER RCA
                            ON RCA.CARRIER_ID = ADSO.CARRIER_ID
         WHERE ADSO.DISPATCH_STATUS = 0
-          AND ADSO.CARRIER_ID = #{carrierId}
+          <if test="carrierId != null" >
+              AND ADSO.CARRIER_ID = #{carrierId}
+          </if>
           AND OO.CAPACITY_ID IS NULL
           AND ADSO.DISPATCH_DEAL_TIME IS NOT NULL
     </select>
@@ -563,6 +565,9 @@
         WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
         AND ADSO.DISPATCH_STATUS = 0
         AND ADSO.DISPATCH_DEAL_TIME IS NULL
+        <if test="carrierId != null" >
+            AND ADSO.CARRIER_ID = #{carrierId}
+        </if>
         )
         <where>
             <if test="saleOrderMaterialTruckNo != null">
@@ -647,6 +652,6 @@
         SELECT
             RC.CARRIER_ID AS "carrierId"
         FROM RMS_CARRIER RC
-        WHERE RC.CARRIER_SSO_ID = #{carrierSSOId}
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
     </select>
 </mapper>

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

@@ -429,25 +429,27 @@
     <!-- 展示运输计划 -->
     <select id="getTruckPlanList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIP.PLAN_NUMBER AS "planNumber",
-        RCA.CARRIER_NAME AS "carrierName",
-        AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+        ARM.MATERIAL_COUNT                 AS "materialNumber",
+        ARM.MATERIAL_WEIGHT                AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIP.PLAN_ID AS "planId",
-        AIP.INSERT_TIME AS "insertTime"
+        AIP.PLAN_ID                        AS "planId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RW1.WAREHOUSE_NAME                 AS "unLoadWarehouse",
+        RS.SHIPPER_NAME                    AS "shipperName"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
@@ -463,10 +465,14 @@
         ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT
         ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         WHERE AIP.PLAN_STATUS = #{planStatus}
         AND AIP.DELETED = 0
         )
@@ -574,28 +580,29 @@
     <!-- 展示运输计划 -->
     <select id="getIssuedPlanList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIP.PLAN_NUMBER AS "planNumber",
-        RCA.CARRIER_NAME AS "carrierName",
-        AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME AS "planIssueName",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+        ARM.MATERIAL_COUNT                 AS "materialNumber",
+        ARM.MATERIAL_WEIGHT                AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIP.PLAN_ID AS "planId",
-        AIP.CARRIER_ID AS "carrierId",
-        AIP.INSERT_TIME AS "insertTime"
+        AIP.PLAN_ID                        AS "planId",
+        AIP.CARRIER_ID                     AS "carrierId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RW1.WAREHOUSE_NAME                 AS "unloadWarehouseName"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
@@ -611,6 +618,8 @@
         ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT
@@ -621,7 +630,9 @@
             and AIP.PLAN_ID = #{planId}
         </if>
         <if test="carrierId != null">
-            and AIP.CARRIER_ID = #{carrierId}
+            and (select
+             rc.carrier_sso_id from rms_carrier rc
+             where rc.carrier_id = AIP.CARRIER_ID) = #{carrierId}
         </if>
         )
         <where>

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

@@ -687,40 +687,49 @@
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM
-        (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
-        RS.SHIPPER_NAME AS "shipperName",
-        AIR.INSERT_TIME AS "insertTime",
-        AIR.INSERT_USERNAME AS "insertUsername",
-        AIR.REQUIREMENT_ID AS "requirementId",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT "materialWeight",
-        RW.WAREHOUSE_NAME AS "wareHouseName"
+        AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
+        RS.SHIPPER_NAME                    AS "shipperName",
+        AIR.INSERT_TIME                    AS "insertTime",
+        AIR.INSERT_USERNAME                AS "insertUsername",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        ARM.MATERIAL_COUNT                 AS "materialNumber",
+        ARM.MATERIAL_WEIGHT                "materialWeight",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        RWZ.WAREHOUSE_NAME                 AS "loadWarehouseName",
+        RS1.SHIPPER_NAME                    AS "receiveUnitName",
+        RSR.SUPPLIER_NAME                  AS "sendUnitName"
         FROM AMSTRUCK_INWARD_REQUIREMENT AIR
         LEFT JOIN AMS_PURCHASE_ORDER APO
-            ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         LEFT JOIN DIL_BATCH DB
-            ON DB.BATCH_ID = APO.BATCH_ID
+        ON DB.BATCH_ID = APO.BATCH_ID
         LEFT JOIN RMS_WAREHOUSE RW
-            ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
         LEFT JOIN RMS_CAPACITY_TYPE RCT
-            ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+        ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+        left join RMS_WAREHOUSE RWZ
+        on RWZ.WAREHOUSE_ID = air.requiremnt_unit_id
         LEFT JOIN RMS_SHIPPER RS
-            ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-            ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS1
+        ON RS1.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_SUPPLIER RSR
+        ON RSR.SUPPLIER_ID = APO.RECEIVE_UNIT_ID
         LEFT JOIN RMS_MATERIAL RM
-            ON RM.MATERIAL_ID = ARM.MATERIAL_ID
+        ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0
         )
@@ -830,52 +839,50 @@
         </where>
         <include refid="orderBy"></include>
     </select>
-
     <!-- 展示用车需求 -->
     <select id="getFinishTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM
-        (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+        RM.MATERIAL_NAME                   AS "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
-        RS.SHIPPER_NAME AS "shipperName",
-        AIR.INSERT_TIME AS "insertTime",
-        AIR.INSERT_USERNAME AS "insertUsername",
-        AIR.REQUIREMENT_ID AS "requirementId",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        AIR.UPDATE_TIME AS "updateTime",
-        AIR.UPDATE_USERNAME AS "updateUserName",
-        RW.WAREHOUSE_NAME AS "wareHouseName"
-        FROM (
-        SELECT AIR2.REQUIREMENT_ID
+        AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
+        RS.SHIPPER_NAME                    AS "shipperName",
+        AIR.INSERT_TIME                    AS "insertTime",
+        AIR.INSERT_USERNAME                AS "insertUsername",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        ARM.MATERIAL_WEIGHT                AS "materialWeight",
+        AIR.UPDATE_TIME                    AS "updateTime",
+        AIR.UPDATE_USERNAME                AS "updateUserName",
+        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        RW1.WAREHOUSE_NAME                 AS "unloadWarehouseName"
+        FROM (SELECT AIR2.REQUIREMENT_ID
         FROM AMSTRUCK_INWARD_REQUIREMENT AIR2
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        WHERE ARP.PLAN_ID IS NULL
-        ) AIRP
+        WHERE ARP.PLAN_ID IS NULL) AIRP
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
         ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         LEFT JOIN DIL_BATCH DB
         ON DB.BATCH_ID = APO.BATCH_ID
-
-        LEFT JOIN RMS_CAPACITY_TYPE RCT ON AIR.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
-        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0)
         <where>
@@ -1015,34 +1022,45 @@
     </select>
 
     <select id="selectRequirement" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
-               APO.PURCHASE_ORDER_ID              AS "purchaseOrderId",
-               RM.MATERIAL_NAME                   AS "materialName",
-               DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
-               RW.WAREHOUSE_NAME                  AS "wareHouseName",
-               AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
-               AIR.REQUIREMENT_UNLOAD_UNIT_ID     AS "requirementUnloadUnitId",
-               AIR.REQUIREMENT_TYPE               AS "requirementType",
-               AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
-               AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-               AIR.REQUIREMENT_SHIPPER_ID         AS "requirementShipperId",
-               AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-               AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-               AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
-               AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-               AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit"
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-                 LEFT JOIN AMS_PURCHASE_ORDER APO
-                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-                 LEFT JOIN DIL_BATCH DB
-                           ON APO.BATCH_ID = DB.BATCH_ID
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
-        WHERE AIR.REQUIREMENT_ID = #{requirementId}
+SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+       APO.PURCHASE_ORDER_ID              AS "purchaseOrderId",
+       RM.MATERIAL_NAME                   AS "materialName",
+       DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+       RW.WAREHOUSE_NAME                  AS "wareHouseName",
+       ARM.MATERIAL_WEIGHT                AS "materialWeight",
+       AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
+       AIR.REQUIREMENT_UNLOAD_UNIT_ID     AS "requirementUnloadUnitId",
+       AIR.REQUIREMENT_TYPE               AS "requirementType",
+       AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
+       AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+       AIR.REQUIREMENT_SHIPPER_ID         AS "requirementShipperId",
+       AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+       AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+       AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+       AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+       AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
+       RS.SHIPPER_NAME                    AS "receiveUnitName",
+       RSR.SUPPLIER_NAME                  AS "sendUnitName",
+       RWUL.WAREHOUSE_NAME                AS "unWarehouseName"
+  FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+  LEFT JOIN AMS_PURCHASE_ORDER APO
+    ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+  LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+  LEFT JOIN RMS_SUPPLIER RSR
+    ON RSR.SUPPLIER_ID = APO.RECEIVE_UNIT_ID
+  LEFT JOIN DIL_BATCH DB
+    ON APO.BATCH_ID = DB.BATCH_ID
+  LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = DB.MATERIAL_ID
+  LEFT JOIN RMS_WAREHOUSE RW
+    ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+  LEFT JOIN RMS_WAREHOUSE RWUL
+    ON RWUL.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+  LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+    ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+ WHERE AIR.REQUIREMENT_ID = #{requirementId}
     </select>
-
     <!-- 查询批次和采购订单信息 -->
     <select id="getPurchaseIdByBatch" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT * FROM(