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

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

@@ -147,10 +147,15 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));
         }
-        mapValue.put("planStatus",new BigDecimal(planStatus));
+        List<Map<String, Object>> columnList = null;
         PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = amstruckInwardPlanService.getTruckPlanList(mapValue);
+        if(planStatus == 100){
+            columnList = amstruckInwardPlanService.getTruckPlanList2(mapValue);
+        }else {
+            mapValue.put("planStatus",new BigDecimal(planStatus));
+            //分页查询数据
+            columnList =  amstruckInwardPlanService.getTruckPlanList(mapValue);
+        }
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
@@ -165,4 +170,26 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amstruckInwardPlanService.getCarrierList();
         return success(mapList);
     }
+
+    @PostMapping("/getPlanOrder")
+    public RESTfulResult getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId,
+                                      Integer planId,
+                                      Integer orderStatus,
+                                      Integer requirementId) {
+        if(planId !=null){
+            mapValue.put("planId",planId);
+        }
+        if(requirementId !=null){
+            mapValue.put("requirementId",requirementId);
+        }
+        mapValue.put("orderStatus",orderStatus);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amstruckInwardPlanService.getPlanOrder(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
 }

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

@@ -146,13 +146,15 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         if (orgCode != null && !orgCode.equals("null")) {
-            mapValue.put("orgCode",orgCode);
+            String con = "%"+orgCode+"%";
+            mapValue.put("con",con);
         }
         mapValue.put("requirementStatus",requirementStatus);
+        List<Map<String, Object>> list = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
     //展示采购内转需求

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

@@ -22,4 +22,9 @@ public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan
     List<Map<String, Object>> getCarrierList();
 
     List<Map<String, Object>> getIssuedPlanList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getIssuedPlanList2(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

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

@@ -26,6 +26,8 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue);
+
     int deleteTruckPlan(BigDecimal planId);
 
     int updateTruckPlan(AmstruckInwardPlan amstruckInwardPlan);
@@ -40,4 +42,6 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     int changePlanStatus(BigDecimal planId);
 
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -57,9 +58,11 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setPlanId(planId);
         //获取承运商id，车数
         BigDecimal carrierId=new BigDecimal(mapValue.get("carrierId").toString());
-        BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
+        BigDecimal planTruckNumber = DataChange.dataToBigDecimal(mapValue.get("planTruckNumber"));
+        if(planTruckNumber.intValue() != 0){
+            amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
+        }
         amstruckInwardPlan.setCarrierId(carrierId);
-        amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
         amstruckInwardPlan.setPlanNumber(DataChange.generateEightDigitsNumber("YSJH",planId.intValue()));
         //设置计划状态为未下发
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));
@@ -89,6 +92,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Override
     public List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue) {
         BigDecimal planStatus = (BigDecimal)mapValue.get("planStatus");
+//        在mapValue中存储当前时间
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        mapValue.put("newTime",format.format(new Date()));
         List<Map<String,Object>> mapList;
         if (planStatus.intValue() == 0) {
             mapList = amstruckInwardPlanMapper.getTruckPlanList(mapValue);
@@ -99,6 +105,10 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         return mapList;
     }
 
+    public List<Map<String, Object>> getTruckPlanList2(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getIssuedPlanList2(mapValue);
+    }
+
     /**
      * 删除计划
      * @param planId
@@ -184,4 +194,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         return result;
     }
+
+    @Override
+    public List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getPlanOrder(mapValue);
+    }
 }

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

@@ -64,6 +64,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
+        String InsertUpdateRemark = (String) mapValue.get("remark");
         Long dueTime =(Long) mapValue.get("DueTime");
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
@@ -76,10 +77,14 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
         amstruckInwardRequirement.setRequirementTruckTime(new Date(requirementTruckTime));
-        amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        if(requirementWorkType != null){
+            amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        }
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
-        amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+        if(requirementEstimatedDuration != null){
+            amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+        }
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
@@ -92,7 +97,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
-        amstruckInwardRequirement.setInsertUpdateRemark("无");
+        amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
@@ -128,7 +133,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setMaterialId(materialId);
             amstruckRequirementMaterial.setInsertTime(new Date());
             amstruckRequirementMaterial.setInsertUsername("admin");
-            amstruckRequirementMaterial.setInsertUpdateRemark("无");
+            amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
         }
         return result;

src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 

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

@@ -475,7 +475,6 @@
         )
         <where>
             <if test="purchaseOrderNo != null">
-                and
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'
                 </foreach>
@@ -576,24 +575,36 @@
 
     <!-- 展示运输计划 -->
     <select id="getIssuedPlanList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT *
-        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",
-        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 *
+        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",
+        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_ID                 AS "requirementId",
-        AIP.PLAN_ID                        AS "planId",
-        AIP.CARRIER_ID                     AS "carrierId",
-        AIP.INSERT_TIME                    AS "insertTime",
-        RS.SHIPPER_NAME                    AS "shipperName"
+        AIR.REQUIREMENT_ID AS "requirementId",
+        AIP.PLAN_ID AS "planId",
+        AIP.CARRIER_ID AS "carrierId",
+        AIP.INSERT_TIME AS "insertTime",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        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",
+        AIR.INSERT_UPDATE_REMARK "Tel"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
@@ -603,7 +614,15 @@
         ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
-        WHERE  AIP.DELETED = 0
+        LEFT JOIN amstruck_requirement_material arm
+        ON air.requirement_id = arm.requirement_id
+        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
+        WHERE AIP.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">
             and AIP.PLAN_ID = #{planId}
@@ -620,44 +639,46 @@
             and AIP.PLAN_STATUS in (1,2)
         </if>
         <if test="planStatus == 4">
-            and AIP.PLAN_STATUS = 4
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.DUE_DATE
         </if>
         <if test="planStatus == 2">
             and AIP.PLAN_STATUS = 2
         </if>
         <if test="planStatus == 3">
-            and AIP.PLAN_STATUS = 3
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
         )
         <where>
-            <if test="purchaseOrderNo != null">
-                and
-                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderNo" like '%${item}%'
+            <if test="planNumber != null">
+                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
+                    "planNumber" 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}%'
+            <if test="loadName != null">
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="materialWeight != null">
+            <if test="unloadName != null">
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
                 and
-                <foreach collection="materialWeight" item="item" open="(" separator="or" close=")">
-                    "materialWeight" like '%${item}%'
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultForeignShipName != null">
+            <if test="planTruckNumber != null">
                 and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" like '%${item}%'
+                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
+                    "planTruckNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="requirementNumber != null">
@@ -666,28 +687,16 @@
                     "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="planIssueTime != null">
                 and
                 <foreach collection="planIssueTime" item="item" open="(" separator="or" close=")">
                     "planIssueTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planIssueName != null">
-                and
-                <foreach collection="planIssueName" item="item" open="(" separator="or" close=")">
-                    "planIssueName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="capacityTypeName != null">
+            <if test="requirementType != null">
                 and
-                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
-                    "capacityTypeName" like '%${item}%'
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
                 </foreach>
             </if>
             <if test="requirementTruckTime != null">
@@ -696,58 +705,58 @@
                     "requirementTruckTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="requirementWorkType != null">
-                and
-                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
-                    "requirementWorkType" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementWorkContent != null">
-                and
-                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
-                    "requirementWorkContent" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementWorkEnvironment != null">
-                and
-                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
-                    "requirementWorkEnvironment" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementEstimatedDuration != null">
-                and
-                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
-                    "requirementEstimatedDuration" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="planNumber != null">
-                and
-                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
-                    "planNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="carrierName != null">
+            <if test="insertTime != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planTruckNumber != null">
+            <if test="shipperName != null">
                 and
-                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
-                    "planTruckNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="wareHouseName != null">
-                and
-                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
-                    "wareHouseName" like '%${item}%'
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
                 </foreach>
             </if>
         </where>
         <include refid="orderBy"></include>
     </select>
 
+    <select id="getIssuedPlanList2" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        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",
+        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_ID                 AS "requirementId",
+        AIP.PLAN_ID                        AS "planId",
+        AIP.CARRIER_ID                     AS "carrierId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        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 RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        WHERE  AIP.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
+        <if test="planId != null">
+            and AIP.PLAN_ID = #{planId}
+        </if>
+        )
+    </select>
+
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">
             order by "${orderField}"
@@ -779,4 +788,26 @@
                RC.CARRIER_NAME AS "label"
         FROM RMS_CARRIER RC
     </select>
+    <select id="getPlanOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_ID     "capacityId",
+               rc.capacity_number "capacityNumber",
+               oo.order_number    "orderNumber",
+               oo.order_id        "orderId"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join amstruck_inward_plan aip
+                           on aip.plan_id = oo.order_plan_id
+                 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
+        where    oo.order_status = #{orderStatus}
+        <if test="planId != null  ">
+            and aip.plan_id = #{planId}
+        </if>
+        <if test="requirementId != null  ">
+            and air.requirement_id = #{requirementId}
+        </if>
+    </select>
 </mapper>

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

@@ -741,26 +741,46 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT 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",
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        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"
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE  AIR.DELETED = 0
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        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",
+        AIR.INSERT_UPDATE_REMARK "Tel"
+        FROM
+        AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
+        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.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
-        <if test="orgCode !=null ">
-            AND AIR.INSERT_USERNAME = #{orgCode}
+        <if test="con !=null ">
+            AND AIR.INSERT_USERNAME LIKE #{con}
         </if>
         <if test="requirementStatus ==0 ">
             AND AIR.REQUIREMENT_STATUS = 0
@@ -824,6 +844,12 @@
                     "wareHouseName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertTime != null">
                 and
                 <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
@@ -841,34 +867,49 @@
     </select>
     <!-- 展示用车需求 -->
     <select id="getFinishTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT 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",
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        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",
-        AIR.UPDATE_TIME                    AS "updateTime",
-        AIR.UPDATE_USERNAME                AS "updateUserName"
-        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
-        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-        ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
+        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",
+        AIR.UPDATE_TIME AS "updateTime",
+        AIR.DUE_DATE AS "dueDate",
+        AIR.UPDATE_USERNAME AS "updateUserName",
+        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",
+        AIR.INSERT_UPDATE_REMARK "Tel"
+        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
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
+        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_STATUS = #{ requirementStatus }
         AND AIR.DELETED = 0
-        <if test="orgCode !=null ">
-            AND AIR.INSERT_USERNAME = #{orgCode}
+        <if test="con !=null ">
+            AND AIR.INSERT_USERNAME LIKE #{con}
         </if>
         )
         <where>
@@ -950,6 +991,12 @@
                     "insertTime" like '%${item}%'
                 </foreach>
             </if>
+            <if test="dueDate != null">
+                and
+                <foreach collection="dueDate" item="item" open="(" separator="or" close=")">
+                    "dueDate" like '%${item}%'
+                </foreach>
+            </if>
             <if test="insertUsername != null">
                 and
                 <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">