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

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

@@ -629,33 +629,21 @@
         </if>
         )
         <where>
-            <if test="purchaseOrderNo != null">
-                <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}%'
+            <if test="planNumber != null">
+                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
+                    "planNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="materialWeight != null">
+            <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">
@@ -664,12 +652,6 @@
                     "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=")">
@@ -682,10 +664,10 @@
                     "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">
@@ -718,28 +700,34 @@
                     "requirementEstimatedDuration" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planNumber != null">
+            <if test="requirementId != null">
                 and
-                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
-                    "planNumber" like '%${item}%'
+                <foreach collection="requirementId" item="item" open="(" separator="or" close=")">
+                    "requirementId" like '%${item}%'
                 </foreach>
             </if>
-            <if test="carrierName != null">
+            <if test="planId != null">
                 and
-                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-                    "carrierName" like '%${item}%'
+                <foreach collection="planId" item="item" open="(" separator="or" close=")">
+                    "planId" like '%${item}%'
                 </foreach>
             </if>
-            <if test="planTruckNumber != null">
+            <if test="carrierId != null">
                 and
-                <foreach collection="planTruckNumber" item="item" open="(" separator="or" close=")">
-                    "planTruckNumber" like '%${item}%'
+                <foreach collection="carrierId" item="item" open="(" separator="or" close=")">
+                    "carrierId" like '%${item}%'
                 </foreach>
             </if>
-            <if test="wareHouseName != null">
+            <if test="insertTime != null">
                 and
-                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
-                    "wareHouseName" like '%${item}%'
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
                 </foreach>
             </if>
         </where>