tijiao

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

@@ -177,7 +177,8 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  String enableStatus,
                                                  String planStatus,
                                                String startTime,
-                                               String endTime) {
+                                               String endTime,
+                                               BigDecimal planId) {
 
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -197,6 +198,9 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         if(con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");
         }
+        if(planId != null && !"null".equals(planId)){
+            mapValue.put("planId", planId);
+        }
         mapValue.put("requirementStatus",requirementStatus);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);

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

@@ -311,6 +311,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     public int insertPurInwardRequirement(Map<String, Object> mapValue) {
         BigDecimal purchaseOrderId = DataChange.dataToBigDecimal(mapValue.get("purchaseOrderId"));
         BigDecimal unloadPointId = DataChange.dataToBigDecimal(mapValue.get("unloadPointId"));
+        BigDecimal loadPointId  = DataChange.dataToBigDecimal(mapValue.get("loadPointId"));
         //承运起止范围ID
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
         String userId = (String)mapValue.get("userId");
@@ -325,6 +326,9 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
         amstruckInwardRequirement.setPurchaseOrderId(purchaseOrderId);
         amstruckInwardRequirement.setRequirementUnloadUnitId(unloadPointId);
+        if(loadPointId != null){
+            amstruckInwardRequirement.setRequirementPlatformId(loadPointId);
+        }
         //采购内转现在先默认装货点是新区轨道衡
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());

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

@@ -1295,11 +1295,13 @@
         RS.SUPPLIER_NAME          "supplierName",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
         RW.WAREHOUSE_NAME         "warehouseName",
+        RW1.WAREHOUSE_NAME        "loadPointName",
         rm.material_id            "materialId",
         AIP.PLAN_STATUS           "planStatus",
         RM.MATERIAL_NAME          "materialName",
         RCR.CARRIER_NAME          "carrierName",
         AIP.PLAN_EABLE_STATUS     "enable",
+        AIP.PLAN_EABLE_STATUS     "enable1",
         AIR.INSERT_TIME           "insertTime",
         DB.RESULT_FOREIGN_SHIP_NAME     "shipName",
         APO.PURCHASE_ORDER_NO||RS.SUPPLIER_NAME||RW.WAREHOUSE_NAME||RM.MATERIAL_NAME||DB.RESULT_FOREIGN_SHIP_NAME "likeCon"
@@ -1312,6 +1314,8 @@
         ON RC.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN RMS_MATERIAL RM
@@ -1332,6 +1336,9 @@
         <if test="userId != null">
             and air.insert_username = #{userId}
         </if>
+        <if test="planId != null">
+            and AIP.PLAN_ID = #{planId}
+        </if>
         <if test="carrierSsoId != null">
             and AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
             where rc.carrier_sso_id  = #{carrierSsoId})
@@ -1342,10 +1349,10 @@
         <if test="planStatus != null">
             and AIP.PLAN_STATUS = #{planStatus}
         </if>
-        <if test="oneDate != null">
+        <if test="oneDate != null and planStatus !=3">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
-        <if test="startDate != null">
+        <if test="startDate != null and planStatus !=3">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>