Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

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

@@ -111,6 +111,15 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         return success(result);
     }
 
+    /*
+    根据需求ID查询需求详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public RESTfulResult getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        List<Map<String,Object>> listMap = amstruckInwardRequirementService.getRequirementMaterial(requirementId);
+        return success(listMap);
+    }
+
     /**
      * 展示未下发的用车需求
      * @param mapValue
@@ -132,42 +141,21 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  Integer requirementStatus,
-                                                 String con) {
-        if (con != null) {
-            if (!con.equals("undefined")) {
-                String index="get_truck_requirement_list2";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                                 String orgCode) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> truckRequirementList = null;
-        if (mapValue.size() == 1) {
-            //将查询结果存入索引中
-            truckRequirementList =  amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_truck_requirement_list2");
-            //添加id
-            map1.put("indexId","requirementId");
-            truckRequirementList.add(map1);
-            //新建索引
-            esFeign.insertIndex(truckRequirementList);
-            //删除
-            truckRequirementList.remove(truckRequirementList.size()-1);
-        }
-        if (truckRequirementList == null) {
-            truckRequirementList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+        if (orgCode != null && !orgCode.equals("null")) {
+            mapValue.put("orgCode",orgCode);
         }
+        mapValue.put("requirementStatus",requirementStatus);
+        List<Map<String, Object>> truckRequirementList  = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
         return success(data);
     }
-
     //展示采购内转需求
     @PostMapping("/getPurRequirementList")
     public RESTfulResult getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -180,12 +168,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  String carrierSsoId,
                                                  String enableStatus,
                                                  String planStatus) {
-        if (con != null) {
-            if (!con.equals("undefined")) {
-                String index="get_pur_requirement_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -203,23 +186,8 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         }
         mapValue.put("requirementStatus",requirementStatus);
         List<Map<String, Object>> truckRequirementList = null;
-        if (mapValue.size() == 1) {
-            //将查询结果存入索引中
-            truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_pur_requirement_list");
-            //添加id
-            map1.put("indexId","purRequirementId");
-            truckRequirementList.add(map1);
-            //新建索引
-            esFeign.insertIndex(truckRequirementList);
-            //删除
-            truckRequirementList.remove(truckRequirementList.size()-1);
-        }
-        if (truckRequirementList == null) {
-            truckRequirementList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
-        }
+        //将查询结果存入索引中
+        truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurRequirementList(mapValue);

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

@@ -17,4 +17,7 @@ public interface AmstruckRequirementMaterialMapper extends IBaseMapper<AmstruckR
 
 
     List<Map<String, Object>> getOffsetWarehouse();
+
+    List<Map<String,Object>> getRequirementMaterial(Integer requirementId);
+
 }

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

@@ -3,25 +3,26 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="需求物资中间表")
 public class AmstruckRequirementMaterial implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(REQUIREMENT_MATERIAL_ID,DECIMAL,38)
+     * 主键ID(REQUIREMENT_MATERIAL_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="主键ID",required=false)
+    @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal requirementMaterialId;
 
     /**
-     * 需求ID(REQUIREMENT_ID,DECIMAL,38)
+     * 需求ID(REQUIREMENT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="需求ID",required=false)
     private BigDecimal requirementId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="物资ID",required=false)
     private BigDecimal materialId;
@@ -68,6 +69,24 @@ public class AmstruckRequirementMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 卸货点(REQUIREMENT_UNLOAD_UNIT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货点",required=false)
+    private BigDecimal requirementUnloadUnitId;
+
+    /**
+     * 装货点(REQUIREMENT_PLATFORM_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装货点",required=false)
+    private BigDecimal requirementPlatformId;
+
+    /**
+     * 装卸货次序(LOAD_UNLOAD_SEQUENCE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装卸货次序",required=false)
+    private BigDecimal loadUnloadSequence;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -160,6 +179,30 @@ public class AmstruckRequirementMaterial implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getRequirementUnloadUnitId() {
+        return requirementUnloadUnitId;
+    }
+
+    public void setRequirementUnloadUnitId(BigDecimal requirementUnloadUnitId) {
+        this.requirementUnloadUnitId = requirementUnloadUnitId;
+    }
+
+    public BigDecimal getRequirementPlatformId() {
+        return requirementPlatformId;
+    }
+
+    public void setRequirementPlatformId(BigDecimal requirementPlatformId) {
+        this.requirementPlatformId = requirementPlatformId;
+    }
+
+    public BigDecimal getLoadUnloadSequence() {
+        return loadUnloadSequence;
+    }
+
+    public void setLoadUnloadSequence(BigDecimal loadUnloadSequence) {
+        this.loadUnloadSequence = loadUnloadSequence;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -176,6 +219,9 @@ public class AmstruckRequirementMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", requirementUnloadUnitId=").append(requirementUnloadUnitId);
+        sb.append(", requirementPlatformId=").append(requirementPlatformId);
+        sb.append(", loadUnloadSequence=").append(loadUnloadSequence);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -54,5 +54,8 @@ public interface IAmstruckInwardRequirementService extends IBaseService<Amstruck
     //查询采购内转需求
     List<Map<String, Object>> getPurRequirementList(Map<String, Object> mapValue);
 
+    //查询纯内转需求
+    List<Map<String,Object>> getRequirementMaterial(Integer requirementId);
+
 //    int insertInwardRequirementPlan(Map<String, Object> mapValue);
 }

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

@@ -136,7 +136,7 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         for (Map<String,Object> map : mapList) {
             Integer planId = (Integer) map.get("planId");
             AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
-            amstruckInwardPlan.setPlanStatus(new BigDecimal(1));
+            amstruckInwardPlan.setPlanStatus(new BigDecimal(2));
             amstruckInwardPlan.setPlanIssueName("admin");
             amstruckInwardPlan.setPlanIssueTime(new Date());
             result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);

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

@@ -17,10 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * AmstruckInwardRequirement服务实现：
@@ -60,17 +57,13 @@ 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");
-        Date requirementTruckTime = new Date((Long) mapValue.get("requirementTruckTime"));
+        Long requirementTruckTime = (Long) mapValue.get("requirementTruckTime");
         Integer requirementShipperId = (Integer) mapValue.get("requirementShipperId");
         String requirementWorkType = (String) mapValue.get("requirementWorkType");
         String requirementWorkContent = (String) mapValue.get("requirementWorkContent");
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
-        Integer requiremntUnitId = (Integer) mapValue.get("requiremntUnitId");
-        Integer requirementUnloadUnitId = (Integer) mapValue.get("requirementUnloadUnitId");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
-        BigDecimal materialWeight = DataChange.dataToBigDecimal(mapValue.get("materialWeight"));
-        BigDecimal materialCount = DataChange.dataToBigDecimal(mapValue.get("materialNumber"));
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
@@ -81,40 +74,56 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckInwardRequirement.setPurchaseOrderId(new BigDecimal(purchaseOrderId));
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
-        amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(1));
-        amstruckInwardRequirement.setRequirementTruckTime(requirementTruckTime);
+        amstruckInwardRequirement.setRequirementTruckTime(new Date(requirementTruckTime));
         amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
         amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
-        amstruckInwardRequirement.setRequiremntUnitId(new BigDecimal(requiremntUnitId));
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
+        //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
-        amstruckInwardRequirement.setRequirementUnloadUnitId(new BigDecimal(requirementUnloadUnitId));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
-        amstruckInwardRequirement.setInsertUsername("admin");
+        amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
         amstruckInwardRequirement.setInsertUpdateRemark("无");
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
         // 物资中间表
-        BigDecimal materialId = DataChange.dataToBigDecimal(mapValue.get("materialId"));
-        if(materialId.intValue() == 0)
-            if(purchaseOrderId != null)
-                materialId = amstruckInwardRequirementMapper.getMaterialId(new BigDecimal(purchaseOrderId));
-        AmstruckRequirementMaterial amstruckRequirementMaterial = new AmstruckRequirementMaterial();
-        amstruckRequirementMaterial.setRequirementMaterialId(amstruckRequirementMaterialMapper.selectRequirementMaterialId());
-        amstruckRequirementMaterial.setRequirementId(requirementId);
-        if(materialCount.intValue() != 0)
-            amstruckRequirementMaterial.setMaterialCount(materialCount);
-        if(materialWeight.intValue() != 0)
-            amstruckRequirementMaterial.setMaterialWeight(materialWeight);
-        amstruckRequirementMaterial.setMaterialId(materialId);
-        amstruckRequirementMaterial.setInsertTime(new Date());
-        amstruckRequirementMaterial.setInsertUsername("admin");
-        amstruckRequirementMaterial.setInsertUpdateRemark("无");
-        result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
+        List<Map<String,Object>> mapList =( List<Map<String,Object>>) mapValue.get("mapList");
+        for (Map<String,Object> requireMaterialMap:mapList
+             ) {
+            BigDecimal materialId = DataChange.dataToBigDecimal(requireMaterialMap.get("materialId"));
+            if(materialId.intValue() == 0)
+                if(purchaseOrderId != null)
+                    materialId = amstruckInwardRequirementMapper.getMaterialId(new BigDecimal(purchaseOrderId));
+            AmstruckRequirementMaterial amstruckRequirementMaterial = new AmstruckRequirementMaterial();
+            requireMaterialMap.get("requirementPlatformId");
+            requireMaterialMap.get("requirementUnloadUnitId");
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(requireMaterialMap.get("orderMaterialNumber"));
+            BigDecimal materialWeight = DataChange.dataToBigDecimal(requireMaterialMap.get("orderMaterialWeight"));
+            BigDecimal materialPriority = DataChange.dataToBigDecimal(requireMaterialMap.get("materialPriority"));
+            BigDecimal requirementPlatformId = DataChange.dataToBigDecimal(requireMaterialMap.get("requirementPlatformId"));
+            BigDecimal requirementUnloadUnitId = DataChange.dataToBigDecimal(requireMaterialMap.get("requirementUnloadUnitId"));
+            amstruckRequirementMaterial.setRequirementMaterialId(amstruckRequirementMaterialMapper.selectRequirementMaterialId());
+            amstruckRequirementMaterial.setRequirementId(requirementId);
+            amstruckRequirementMaterial.setLoadUnloadSequence(materialPriority);
+            if(materialNumber.intValue() != 0)
+                amstruckRequirementMaterial.setMaterialCount(materialNumber);
+            if(materialWeight.intValue() != 0)
+                amstruckRequirementMaterial.setMaterialWeight(materialWeight);
+            if(requirementPlatformId.intValue() !=0){
+                amstruckRequirementMaterial.setRequirementPlatformId(requirementPlatformId);
+            }
+            if(requirementUnloadUnitId.intValue() !=0){
+                amstruckRequirementMaterial.setRequirementUnloadUnitId(requirementUnloadUnitId);
+            }
+            amstruckRequirementMaterial.setMaterialId(materialId);
+            amstruckRequirementMaterial.setInsertTime(new Date());
+            amstruckRequirementMaterial.setInsertUsername("admin");
+            amstruckRequirementMaterial.setInsertUpdateRemark("无");
+            result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
+        }
         return result;
     }
 
@@ -182,7 +191,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         for (Map<String,Object> map : requirementIds) {
             Integer requirementId = (Integer) map.get("requirementId");
             AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(new BigDecimal(requirementId));
-            amstruckInwardRequirement.setRequirementStatus(new BigDecimal(1));
+            amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
             result += amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
         }
         return result;
@@ -318,6 +327,13 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
                 }
             return mapList;
     }
+
+    //查询纯内转需求物资详情
+    @Override
+    public List<Map<String,Object>> getRequirementMaterial(Integer requirementId) {
+        return amstruckRequirementMaterialMapper.getRequirementMaterial(requirementId);
+    }
+
     public int insertInwardRequirementPlan(Map<String, Object> mapValue) {
         AmstruckInwardPlan amstruckInwardPlan = new AmstruckInwardPlan();
         BigDecimal planId = amstruckInwardPlanMapper.selectOtherId();

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

@@ -249,6 +249,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             case 13:
             case 15:
             case 16:
+            case 20:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -338,6 +339,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     if (type.intValue() == 13) {
                         orderType += "内转零星出厂";
                     }
+                    if (type.intValue() == 20) {
+                        orderType += "内转零星(新区-老区)进厂";
+                    }
                     if (tranStatus.intValue() == 0){
                         Status += "禁用";
                     }

src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: DAL-OMS-API-DEV
+    name: DAL-AMS-API-DEV
 
 #feign设置
 openfeign:

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

@@ -446,52 +446,32 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <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",
+        FROM (SELECT 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_ID                 AS "requirementId",
         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",
-        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
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-        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 = 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
+        AND AIR.PURCHASE_ORDER_ID IS NULL
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -597,52 +577,34 @@
     <!-- 展示运输计划 -->
     <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",
+        FROM (SELECT 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",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
         AIP.PLAN_ID                        AS "planId",
         AIP.CARRIER_ID                     AS "carrierId",
         AIP.INSERT_TIME                    AS "insertTime",
-        RW1.WAREHOUSE_NAME                 AS "unloadWarehouseName"
+        RS.SHIPPER_NAME                    AS "shipperName"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-        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 = 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_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_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
-        WHERE AIP.PLAN_STATUS = #{planStatus}
-        AND AIP.DELETED = 0
+        WHERE  AIP.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">
             and AIP.PLAN_ID = #{planId}
         </if>
@@ -651,6 +613,21 @@
              rc.carrier_sso_id from rms_carrier rc
              where rc.carrier_id = AIP.CARRIER_ID) = #{carrierId}
         </if>
+        <if test="planStatus == 0">
+            and AIP.PLAN_STATUS = 0
+        </if>
+        <if test="planStatus == 1">
+            and AIP.PLAN_STATUS in (1,2)
+        </if>
+        <if test="planStatus == 4">
+            and AIP.PLAN_STATUS = 4
+        </if>
+        <if test="planStatus == 2">
+            and AIP.PLAN_STATUS = 2
+        </if>
+        <if test="planStatus == 3">
+            and AIP.PLAN_STATUS = 3
+        </if>
         )
         <where>
             <if test="purchaseOrderNo != null">

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

@@ -687,12 +687,8 @@
     <!-- 展示用车需求 -->
     <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",
+        (SELECT 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",
@@ -702,80 +698,29 @@
         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"
+        AIR.REQUIREMENT_ID                 AS "requirementId"
         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 DB.BATCH_ID = APO.BATCH_ID
-        LEFT JOIN RMS_WAREHOUSE RW
-        ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
-        LEFT JOIN RMS_CAPACITY_TYPE RCT
-        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
-        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-        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
-        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
-        AND AIR.DELETED = 0
+        WHERE  AIR.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
+        <if test="orgCode !=null ">
+        AND AIR.INSERT_USERNAME = #{orgCode}
+        </if>
+        <if test="requirementStatus ==0 ">
+            AND AIR.REQUIREMENT_STATUS = 0
+        </if>
+        <if test="requirementStatus ==1 ">
+            AND AIR.REQUIREMENT_STATUS in (1,2)
+        </if>
         )
         <where>
-            <if test="purchaseOrderNo != null">
-                and
-                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderNo" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-                    "materialName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="materialNumber != null">
-                and
-                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
-                    "materialNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementNumber != null">
-                and
-                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
-                    "requirementNumber" like '%${item}%'
-                </foreach>
-            </if>
             <if test="requirementType != null">
                 and
                 <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
                     "requirementType" like '%${item}%'
                 </foreach>
             </if>
-            <if test="capacityTypeName != null">
-                and
-                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
-                    "capacityTypeName" like '%${item}%'
-                </foreach>
-            </if>
             <if test="requirementTruckTime != null">
                 and
                 <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
@@ -842,10 +787,7 @@
     <!-- 展示用车需求 -->
     <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",
+        (SELECT AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
         AIR.REQUIREMENT_TYPE               AS "requirementType",
         AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
         AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
@@ -857,11 +799,8 @@
         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"
+        AIR.UPDATE_USERNAME                AS "updateUserName"
         FROM (SELECT AIR2.REQUIREMENT_ID
         FROM AMSTRUCK_INWARD_REQUIREMENT AIR2
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
@@ -869,29 +808,15 @@
         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_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)
+        AND AIR.DELETED = 0
+        <if test="orgCode !=null ">
+        AND AIR.INSERT_USERNAME = #{orgCode}
+        </if>
+        )
         <where>
-            <if test="purchaseOrderNo != null">
-                and
-                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderNo" like '%${item}%'
-                </foreach>
-            </if>
             <if test="materialName != null">
                 and
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
@@ -904,12 +829,6 @@
                     "materialNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" like '%${item}%'
-                </foreach>
-            </if>
             <if test="requirementNumber != null">
                 and
                 <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">

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

@@ -12,14 +12,19 @@
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="REQUIREMENT_UNLOAD_UNIT_ID" jdbcType="DECIMAL" property="requirementUnloadUnitId" />
+    <result column="REQUIREMENT_PLATFORM_ID" jdbcType="DECIMAL" property="requirementPlatformId" />
+    <result column="LOAD_UNLOAD_SEQUENCE" jdbcType="DECIMAL" property="loadUnloadSequence" />
   </resultMap>
   <sql id="columns">
-    REQUIREMENT_MATERIAL_ID, REQUIREMENT_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_COUNT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    REQUIREMENT_MATERIAL_ID, REQUIREMENT_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_COUNT,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID, LOAD_UNLOAD_SEQUENCE
   </sql>
   <sql id="columns_alias">
-    t.REQUIREMENT_MATERIAL_ID, t.REQUIREMENT_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_COUNT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    t.REQUIREMENT_MATERIAL_ID, t.REQUIREMENT_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_COUNT,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.LOAD_UNLOAD_SEQUENCE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMSTRUCK_REQUIREMENT_MATERIAL
@@ -28,7 +33,7 @@
     SELECT <include refid="columns_alias" /> FROM AMSTRUCK_REQUIREMENT_MATERIAL t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="requirementMaterialId != null">
         and REQUIREMENT_MATERIAL_ID = #{requirementMaterialId}
       </if>
@@ -59,10 +64,19 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="requirementUnloadUnitId != null">
+        and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+      </if>
+      <if test="requirementPlatformId != null">
+        and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
+      </if>
+      <if test="loadUnloadSequence != null">
+        and LOAD_UNLOAD_SEQUENCE = #{loadUnloadSequence}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="requirementMaterialId != null">
         and REQUIREMENT_MATERIAL_ID = #{requirementMaterialId}
       </if>
@@ -93,52 +107,74 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="requirementUnloadUnitId != null">
+        and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+      </if>
+      <if test="requirementPlatformId != null">
+        and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
+      </if>
+      <if test="loadUnloadSequence != null">
+        and LOAD_UNLOAD_SEQUENCE = #{loadUnloadSequence}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from AMSTRUCK_REQUIREMENT_MATERIAL
     where REQUIREMENT_MATERIAL_ID = #{requirementMaterialId,jdbcType=DECIMAL}
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMSTRUCK_REQUIREMENT_MATERIAL
-    where 1!=1 
-      <if test="requirementId != null">
-        or REQUIREMENT_ID = #{requirementId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="materialWeight != null">
-        or MATERIAL_WEIGHT = #{materialWeight}
-      </if>
-      <if test="materialCount != null">
-        or MATERIAL_COUNT = #{materialCount}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
+    where 1!=1
+    <if test="requirementId != null">
+      or REQUIREMENT_ID = #{requirementId}
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="materialWeight != null">
+      or MATERIAL_WEIGHT = #{materialWeight}
+    </if>
+    <if test="materialCount != null">
+      or MATERIAL_COUNT = #{materialCount}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="requirementUnloadUnitId != null">
+      or REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+    </if>
+    <if test="requirementPlatformId != null">
+      or REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
+    </if>
+    <if test="loadUnloadSequence != null">
+      or LOAD_UNLOAD_SEQUENCE = #{loadUnloadSequence}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckRequirementMaterial">
-    insert into AMSTRUCK_REQUIREMENT_MATERIAL (REQUIREMENT_MATERIAL_ID, REQUIREMENT_ID, 
-      MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_COUNT, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{requirementMaterialId,jdbcType=DECIMAL}, #{requirementId,jdbcType=DECIMAL}, 
-      #{materialId,jdbcType=DECIMAL}, #{materialWeight,jdbcType=DECIMAL}, #{materialCount,jdbcType=DECIMAL}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    insert into AMSTRUCK_REQUIREMENT_MATERIAL (REQUIREMENT_MATERIAL_ID, REQUIREMENT_ID,
+      MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_COUNT,
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+      UPDATE_TIME, INSERT_UPDATE_REMARK, REQUIREMENT_UNLOAD_UNIT_ID,
+      REQUIREMENT_PLATFORM_ID, LOAD_UNLOAD_SEQUENCE
+      )
+    values (#{requirementMaterialId,jdbcType=DECIMAL}, #{requirementId,jdbcType=DECIMAL},
+      #{materialId,jdbcType=DECIMAL}, #{materialWeight,jdbcType=DECIMAL}, #{materialCount,jdbcType=DECIMAL},
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
+      #{requirementPlatformId,jdbcType=DECIMAL}, #{loadUnloadSequence,jdbcType=DECIMAL}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckRequirementMaterial">
     insert into AMSTRUCK_REQUIREMENT_MATERIAL
@@ -173,6 +209,15 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="requirementUnloadUnitId != null">
+        REQUIREMENT_UNLOAD_UNIT_ID,
+      </if>
+      <if test="requirementPlatformId != null">
+        REQUIREMENT_PLATFORM_ID,
+      </if>
+      <if test="loadUnloadSequence != null">
+        LOAD_UNLOAD_SEQUENCE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="requirementMaterialId != null">
@@ -205,6 +250,15 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="requirementUnloadUnitId != null">
+        #{requirementUnloadUnitId,jdbcType=DECIMAL},
+      </if>
+      <if test="requirementPlatformId != null">
+        #{requirementPlatformId,jdbcType=DECIMAL},
+      </if>
+      <if test="loadUnloadSequence != null">
+        #{loadUnloadSequence,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckRequirementMaterial">
@@ -217,7 +271,10 @@
       INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
       UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
       UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
+      REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
+      LOAD_UNLOAD_SEQUENCE = #{loadUnloadSequence,jdbcType=DECIMAL}
     where REQUIREMENT_MATERIAL_ID = #{requirementMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckRequirementMaterial">
@@ -250,10 +307,19 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="requirementUnloadUnitId != null">
+        REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
+      </if>
+      <if test="requirementPlatformId != null">
+        REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
+      </if>
+      <if test="loadUnloadSequence != null">
+        LOAD_UNLOAD_SEQUENCE = #{loadUnloadSequence,jdbcType=DECIMAL},
+      </if>
     </set>
     where REQUIREMENT_MATERIAL_ID = #{requirementMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where REQUIREMENT_MATERIAL_ID = #{requirementMaterialId,jdbcType=DECIMAL}
   </select>
@@ -265,89 +331,116 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-  <select id="getOffsetWarehouse" resultType="java.util.Map">
-        SELECT rw.warehouse_id   AS "id",
-       rw.warehouse_id   AS "value",
-       rw.warehouse_name AS "label"
-  FROM rms_warehouse rw
- where rw.warehouse_type_id = 2
-
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMSTRUCK_REQUIREMENT_MATERIAL 
-      (REQUIREMENT_MATERIAL_ID, 
-      REQUIREMENT_ID, MATERIAL_ID, MATERIAL_WEIGHT, 
-      MATERIAL_COUNT, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.requirementMaterialId,jdbcType=DECIMAL}, 
-      #{item.requirementId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.materialWeight,jdbcType=DECIMAL}, 
-      #{item.materialCount,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
+    <select id="getRequirementMaterial" resultType="java.util.Map">
+      select rw1.warehouse_name "unloadName",
+             rw1.WAREHOUSE_ID "unloadId",
+             rw2.warehouse_name "loadName",
+             rw2.WAREHOUSE_ID "loadId",
+             arm.material_weight "materialWeight",
+             arm.material_count "materialCount",
+             arm.MATERIAL_ID "materialId",
+             rm.material_name || rm.material_specification || '(' ||
+             rm.material_model || ')' "materialName",
+             arm.load_unload_sequence "loadSequence"
+      from amstruck_requirement_material arm
+             left join rms_warehouse rw1
+                       on rw1.warehouse_id = arm.requirement_unload_unit_id
+             left join rms_warehouse rw2
+                       on rw2.warehouse_id = arm.requirement_platform_id
+             left join rms_material rm
+                       on rm.material_id = arm.material_id
+             left join amstruck_inward_requirement air
+                       on air.requirement_id = arm.requirement_id
+      where air.requirement_id = #{requirementId}
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMSTRUCK_REQUIREMENT_MATERIAL
+    (REQUIREMENT_MATERIAL_ID,
+    REQUIREMENT_ID, MATERIAL_ID, MATERIAL_WEIGHT,
+    MATERIAL_COUNT, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
+    LOAD_UNLOAD_SEQUENCE)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.requirementMaterialId,jdbcType=DECIMAL},
+    #{item.requirementId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.materialWeight,jdbcType=DECIMAL},
+    #{item.materialCount,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
+    #{item.loadUnloadSequence,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMSTRUCK_REQUIREMENT_MATERIAL
-     set
-       REQUIREMENT_MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,REQUIREMENT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_COUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialCount,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
-          when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where REQUIREMENT_MATERIAL_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.requirementMaterialId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMSTRUCK_REQUIREMENT_MATERIAL
+    set
+    REQUIREMENT_MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementMaterialId,jdbcType=DECIMAL}
+    </foreach>
+    ,REQUIREMENT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_WEIGHT=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_COUNT=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.materialCount,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,REQUIREMENT_UNLOAD_UNIT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementUnloadUnitId,jdbcType=DECIMAL}
+    </foreach>
+    ,REQUIREMENT_PLATFORM_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.requirementPlatformId,jdbcType=DECIMAL}
+    </foreach>
+    ,LOAD_UNLOAD_SEQUENCE=
+    <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_MATERIAL_ID" separator=" ">
+      when #{item.requirementMaterialId,jdbcType=DECIMAL} then #{item.loadUnloadSequence,jdbcType=DECIMAL}
+    </foreach>
+    where REQUIREMENT_MATERIAL_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.requirementMaterialId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMSTRUCK_REQUIREMENT_MATERIAL
-    where REQUIREMENT_MATERIAL_ID in 
+    where REQUIREMENT_MATERIAL_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-  
+
 </mapper>