tijiao

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

@@ -72,7 +72,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckInwardRequirement.setPurchaseOrderId(new BigDecimal(purchaseOrderId));
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
-        amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(capacityTypeId));
+        amstruckInwardRequirement.setCapacityTypeId(new BigDecimal(1));
         amstruckInwardRequirement.setRequirementTruckTime(requirementTruckTime);
         amstruckInwardRequirement.setRequirementWorkType(new BigDecimal(requirementWorkType));
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
@@ -82,7 +82,6 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
         amstruckInwardRequirement.setRequirementUnloadUnitId(new BigDecimal(requirementUnloadUnitId));
-        amstruckInwardRequirement.setRequirementPlatformId(DataChange.dataToBigDecimal(mapValue.get("requirementPlatformId")));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername("admin");

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

@@ -1046,14 +1046,15 @@
     <!-- 查询批次和采购订单信息 -->
     <select id="getPurchaseIdByBatch" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT * FROM(
-        SELECT DISTINCT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
-        APO.PURCHASE_ORDER_ID AS "purchaseOrderId",
+        SELECT DISTINCT APO.PURCHASE_ORDER_NO       AS "purchaseOrderNo",
+        APO.PURCHASE_ORDER_ID       AS "purchaseOrderId",
         DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        RM.MATERIAL_NAME AS "materialName",
-        DB.INSERT_TIME AS "insertTime",
-        RS.SHIPPER_NAME "shipperName"
-
-        FROM (SELECT * FROM AMS_PURCHASE_ORDER APO
+        RM.MATERIAL_NAME            AS "materialName",
+        DB.INSERT_TIME              AS "insertTime",
+        RS.SHIPPER_NAME             "shipperName",
+        RSR.SUPPLIER_NAME           "supplierName"
+        FROM (SELECT *
+        FROM AMS_PURCHASE_ORDER APO
         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
         ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         WHERE AIR.PURCHASE_ORDER_ID IS NULL) APOIR
@@ -1062,7 +1063,9 @@
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON APO.BATCH_ID = DB.BATCH_ID
         LEFT JOIN RMS_SHIPPER RS
-        ON  RS.SHIPPER_ID=APO.RECEIVE_UNIT_ID
+        ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_SUPPLIER RSR
+        ON RSR.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = DB.MATERIAL_ID)
         <where>
@@ -1090,6 +1093,12 @@
                     "shipperName" like '%${item}%'
                 </foreach>
             </if>
+             <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
     </select>
@@ -1110,11 +1119,41 @@
 
     <!-- 仓库模代框 -->
     <select id="getWareHouse" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT RW.WAREHOUSE_ID   AS "wareHouseId",
-               RW.WAREHOUSE_NAME AS "wareHouseName"
-        FROM RMS_WAREHOUSE RW
+        SELECT RW.WAREHOUSE_ID           AS "wareHouseId",
+       RW.WAREHOUSE_NAME         AS "wareHouseName",
+       rs.shipper_abbreviation   as "shipperName",
+       rs.shipper_company_branch as "companyBranchName",
+       rs.shipper_branch_factory as "branchFactory"
+       FROM RMS_WAREHOUSE RW
+       left join rms_shipper rs
+       on rs.shipper_id = rw.shipper_id
+        <where>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="companyBranchName != null">
+                and
+                <foreach collection="companyBranchName" item="item" open="(" separator="or" close=")">
+                    "companyBranchName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="branchFactory != null">
+                and
+                <foreach collection="branchFactory" item="item" open="(" separator="or" close=")">
+                    "branchFactory" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
     </select>
-
     <select id="getMaterialId" parameterType="DECIMAL" resultType="DECIMAL">
         SELECT DB.MATERIAL_ID AS "materialId"
         FROM AMS_PURCHASE_ORDER APO