tj

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

@@ -165,4 +165,18 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amstruckInwardPlanService.getCarrierList();
         return success(mapList);
     }
+
+    @PostMapping("/getPlanOrder")
+    public RESTfulResult getPlanOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId,Integer planId,Integer orderStatus){
+        mapValue.put("planId",planId);
+        mapValue.put("orderStatus",orderStatus);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amstruckInwardPlanService.getPlanOrder(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        return success(data);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.java

@@ -22,4 +22,7 @@ public interface AmstruckInwardPlanMapper extends IBaseMapper<AmstruckInwardPlan
     List<Map<String, Object>> getCarrierList();
 
     List<Map<String, Object>> getIssuedPlanList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

src/main/java/com/steerinfo/dil/service/IAmstruckInwardPlanService.java

@@ -40,4 +40,6 @@ public interface IAmstruckInwardPlanService extends IBaseService<AmstruckInwardP
 
     int changePlanStatus(BigDecimal planId);
 
+    List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue);
+
 }

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

@@ -186,4 +186,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         int result = amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         return result;
     }
+
+    @Override
+    public List<Map<String, Object>> getPlanOrder(Map<String, Object> mapValue) {
+        return amstruckInwardPlanMapper.getPlanOrder(mapValue);
+    }
 }

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

@@ -64,6 +64,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
+        String InsertUpdateRemark = (String) mapValue.get("remark");
         Long dueTime =(Long) mapValue.get("DueTime");
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
@@ -96,7 +97,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
-        amstruckInwardRequirement.setInsertUpdateRemark("无");
+        amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
@@ -132,7 +133,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
             amstruckRequirementMaterial.setMaterialId(materialId);
             amstruckRequirementMaterial.setInsertTime(new Date());
             amstruckRequirementMaterial.setInsertUsername("admin");
-            amstruckRequirementMaterial.setInsertUpdateRemark("无");
+            amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
             result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
         }
         return result;

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

@@ -779,4 +779,17 @@
                RC.CARRIER_NAME AS "label"
         FROM RMS_CARRIER RC
     </select>
+    <select id="getPlanOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_ID     "capacityId",
+               rc.capacity_number "capacityNumber",
+               oo.order_number    "orderNumber",
+               oo.order_id        "orderId"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join amstruck_inward_plan aip
+                           on aip.plan_id = oo.order_plan_id
+        where oo.order_plan_id = #{planId}
+            and oo.order_status = #{orderStatus}
+    </select>
 </mapper>

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

@@ -741,23 +741,42 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        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
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        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_OVERLIMIT          AS "requirementOverlimit",
-        RS.SHIPPER_NAME                    AS "shipperName",
-        AIR.INSERT_TIME                    AS "insertTime",
-        AIR.INSERT_USERNAME                AS "insertUsername",
-        AIR.REQUIREMENT_ID                 AS "requirementId"
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE  AIR.DELETED = 0
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        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_REQUIREMENT AIR
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        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
+        LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        WHERE
+        AIR.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="orgCode !=null ">
             AND AIR.INSERT_USERNAME = #{orgCode}
@@ -841,31 +860,45 @@
     </select>
     <!-- 展示用车需求 -->
     <select id="getFinishTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT * FROM
-        (SELECT AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
-        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
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        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_OVERLIMIT          AS "requirementOverlimit",
-        RS.SHIPPER_NAME                    AS "shipperName",
-        AIR.INSERT_TIME                    AS "insertTime",
-        AIR.INSERT_USERNAME                AS "insertUsername",
-        AIR.REQUIREMENT_ID                 AS "requirementId",
-        AIR.UPDATE_TIME                    AS "updateTime",
-        AIR.UPDATE_USERNAME                AS "updateUserName"
-        FROM (SELECT AIR2.REQUIREMENT_ID
-        FROM AMSTRUCK_INWARD_REQUIREMENT AIR2
-        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-        ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        WHERE ARP.PLAN_ID IS NULL) AIRP
-        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-        ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
-        LEFT JOIN RMS_SHIPPER RS
-        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-        WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
+        AIR.REQUIREMENT_OVERLIMIT AS "requirementOverlimit",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        AIR.INSERT_USERNAME AS "insertUsername",
+        AIR.REQUIREMENT_ID AS "requirementId",
+        AIR.UPDATE_TIME AS "updateTime",
+        AIR.UPDATE_USERNAME AS "updateUserName",
+        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
+        ( SELECT AIR2.REQUIREMENT_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR2 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON AIR2.REQUIREMENT_ID = ARP.REQUIREMENT_ID WHERE ARP.PLAN_ID IS NULL ) AIRP
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = AIRP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        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
+        LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
+        WHERE
+        AIR.REQUIREMENT_STATUS = #{ requirementStatus }
         AND AIR.DELETED = 0
         <if test="orgCode !=null ">
             AND AIR.INSERT_USERNAME = #{orgCode}