fsafj

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

@@ -575,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
@@ -602,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}
@@ -634,6 +654,21 @@
                     "planNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadName != null">
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
+                </foreach>
+            </if>
+            <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="carrierName" item="item" open="(" separator="or" close=")">
@@ -658,12 +693,6 @@
                     "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="requirementType != null">
                 and
                 <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
@@ -676,48 +705,6 @@
                     "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="requirementId != null">
-                and
-                <foreach collection="requirementId" item="item" open="(" separator="or" close=")">
-                    "requirementId" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="planId != null">
-                and
-                <foreach collection="planId" item="item" open="(" separator="or" close=")">
-                    "planId" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="carrierId != null">
-                and
-                <foreach collection="carrierId" item="item" open="(" separator="or" close=")">
-                    "carrierId" like '%${item}%'
-                </foreach>
-            </if>
             <if test="insertTime != null">
                 and
                 <foreach collection="insertTime" item="item" open="(" separator="or" close=")">