tijiao

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

@@ -132,42 +132,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) {
+            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,

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

@@ -60,17 +60,17 @@ 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");
+        Integer requirementPlatformId = (Integer) mapValue.get("requirementPlatformId");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
         BigDecimal materialWeight = DataChange.dataToBigDecimal(mapValue.get("materialWeight"));
-        BigDecimal materialCount = DataChange.dataToBigDecimal(mapValue.get("materialNumber"));
+        BigDecimal materialNumber = DataChange.dataToBigDecimal(mapValue.get("materialNumber"));
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
@@ -81,19 +81,21 @@ 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.setRequirementPlatformId(new BigDecimal(requirementPlatformId));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
-        amstruckInwardRequirement.setInsertUsername("admin");
+        amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
         amstruckInwardRequirement.setInsertUpdateRemark("无");
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         int result = 0;
@@ -106,8 +108,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         AmstruckRequirementMaterial amstruckRequirementMaterial = new AmstruckRequirementMaterial();
         amstruckRequirementMaterial.setRequirementMaterialId(amstruckRequirementMaterialMapper.selectRequirementMaterialId());
         amstruckRequirementMaterial.setRequirementId(requirementId);
-        if(materialCount.intValue() != 0)
-            amstruckRequirementMaterial.setMaterialCount(materialCount);
+        if(materialNumber.intValue() != 0)
+            amstruckRequirementMaterial.setMaterialCount(materialNumber);
         if(materialWeight.intValue() != 0)
             amstruckRequirementMaterial.setMaterialWeight(materialWeight);
         amstruckRequirementMaterial.setMaterialId(materialId);

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,27 +446,25 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="getTruckPlanList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
-        RM.MATERIAL_NAME                   AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
-        AIP.PLAN_NUMBER                    AS "planNumber",
-        RCA.CARRIER_NAME                   AS "carrierName",
-        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
-        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        AIR.REQUIREMENT_TYPE               AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
-        ARM.MATERIAL_COUNT                 AS "materialNumber",
-        ARM.MATERIAL_WEIGHT                AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME                  AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        FROM (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
+        rm.material_model || ')' AS "materialName",
+        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",
+        ARM.MATERIAL_COUNT AS "materialNumber",
+        ARM.MATERIAL_WEIGHT AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIP.PLAN_ID                        AS "planId",
-        AIP.INSERT_TIME                    AS "insertTime",
-        RW1.WAREHOUSE_NAME                 AS "unLoadWarehouse",
-        RS.SHIPPER_NAME                    AS "shipperName"
+        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
@@ -474,24 +472,19 @@
         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
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_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,29 +590,27 @@
     <!-- 展示运输计划 -->
     <select id="getIssuedPlanList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
-        RM.MATERIAL_NAME                   AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
-        AIP.PLAN_NUMBER                    AS "planNumber",
-        RCA.CARRIER_NAME                   AS "carrierName",
-        AIP.PLAN_TRUCK_NUMBER              AS "planTruckNumber",
-        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
-        AIR.REQUIREMENT_TYPE               AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
-        ARM.MATERIAL_COUNT                 AS "materialNumber",
-        ARM.MATERIAL_WEIGHT                AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME                  AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        FROM (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
+        rm.material_model || ')' AS "materialName",
+        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",
+        ARM.MATERIAL_COUNT AS "materialNumber",
+        ARM.MATERIAL_WEIGHT AS "materialWeight",
+        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
+        RW.WAREHOUSE_NAME AS "wareHouseName",
+        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        AIP.PLAN_ID                        AS "planId",
-        AIP.CARRIER_ID                     AS "carrierId",
-        AIP.INSERT_TIME                    AS "insertTime",
-        RW1.WAREHOUSE_NAME                 AS "unloadWarehouseName"
+        AIP.PLAN_ID AS "planId",
+        AIP.CARRIER_ID AS "carrierId",
+        AIP.INSERT_TIME AS "insertTime",
+        RW1.WAREHOUSE_NAME AS "unloadWarehouseName"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID
@@ -627,22 +618,17 @@
         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
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_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
         WHERE AIP.PLAN_STATUS = #{planStatus}
         AND AIP.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="planId != null">
             and AIP.PLAN_ID = #{planId}
         </if>

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

@@ -687,12 +687,10 @@
     <!-- 展示用车需求 -->
     <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",
+        (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
+        rm.material_model || ')'                  AS "materialName",
         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",
@@ -706,40 +704,25 @@
         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"
+        RWZ.WAREHOUSE_NAME                 AS "loadWarehouseName"
         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_WAREHOUSE RWZ
+        ON RWZ.WAREHOUSE_ID = air.requirement_platform_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
+        <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=")">
@@ -752,12 +735,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=")">
@@ -842,9 +819,8 @@
     <!-- 展示用车需求 -->
     <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",
+        (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
+        rm.material_model || ')'                   AS "materialName",
         AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
         AIR.REQUIREMENT_TYPE               AS "requirementType",
         AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
@@ -869,10 +845,6 @@
         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
@@ -880,18 +852,16 @@
         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
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_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 +874,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=")">