2.28

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

@@ -63,16 +63,17 @@ public class WmspGridMaterialController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId,
-                                                Integer warehouseId,
+                                                String warehouseId,
+                                                String time,
                                                 String con) {
 
 
         if (con!=null&&!con.equals("undefined")) {
             mapVal.put("con", "%" + con + "%");
         }
-        List<Map<String, Object>>   libaryInBoundList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId);
+        List<Map<String, Object>>   libaryInBoundList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId,time);
         PageHelper.startPage(pageNum, pageSize);
-        List<Map<String, Object>> columnList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId);
+        List<Map<String, Object>> columnList = wmspGridMaterialService.selectGridMaterial(mapVal,warehouseId,time);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, libaryInBoundList, columnList);
 //        //库龄预警
 //        for (Map mapValue : columnList) {

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

@@ -85,17 +85,10 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer apiId,
-                                               String con,
+                                               Integer warehouseId,
                                                String startTime,
-                                               String endTime)
-    {
-
-        if (mapval.containsKey("starTime")&&mapval.get("starTime")!=null){
-            startTime=mapval.get("starTime").toString();
-        }
-        if (mapval.containsKey("endTime")&&mapval.get("endTime")!=null){
-            endTime=mapval.get("endTime").toString();
-        }
+                                               String endTime){
+        mapval.put("warehouseId",warehouseId);
         DataChange.queryDataByDateTime(startTime,endTime,mapval,simpleDateFormat);
         List<Map<String, Object>> libaryOutBoundList  = wmspOutboundResultService.selectResultNumber(mapval);
         PageHelper.startPage(pageNum, pageSize);

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

@@ -28,7 +28,7 @@ public interface IWmspGridMaterialService  {
    int updateByPrimaryKeySelective(WmspGridMaterial wmspGridMaterial);
 
    //查询实时库存数据
-   List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,Integer warehouseId);
+   List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,String warehouseId,String time);
 
    //统计实时库存当前表格数据
    Long countByGmId();

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

@@ -65,11 +65,17 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     }
     //查询实时库存数据
     @Override
-    public List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,Integer warehouseId) {
+    public List<Map<String, Object>> selectGridMaterial(Map<String, Object> mapval,String warehouseId,String time) {
         //        通过当前时间获得前一个月的时间
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar cal= Calendar.getInstance();
-        cal.add(Calendar.MONTH, -1);
+//        根据前端床过来的time的数值进行时间区间的判断
+        if (time.equals("1")){
+            cal.add(Calendar.MONTH, -1);
+        }else if (time.equals("2")){
+            cal.add(Calendar.DATE, -15);
+        }
+
         long date2 = cal.getTimeInMillis();
         String newDate=simpleDateFormat.format(new Date(date2));
         mapval.put("warehouseId",warehouseId);

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

@@ -407,16 +407,8 @@
     </select>
     <select id="getSteelMaterialModelList" resultType="java.util.Map">
       SELECT DISTINCT
-        --             物资名称
-        RM.MATERIAL_NAME "materialName",
-        --                物资编码
-        RM.MATERIAL_CODE "materialCode",
-        --                物资规格
-        RM.MATERIAL_SPECIFICATION "materialSpecification",
-        --                物资型号
-        RM.MATERIAL_MODEL "materialModel",
-        --                物资长度
-        RM.MATERIAL_LENGTH "materialLength",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
+          RM.MATERIAL_MODEL || ')' "materialName",
         table1.count "max"
       FROM RMS_MATERIAL_STEEL RMS
 --                 关联物资表

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

@@ -446,7 +446,12 @@
     on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
     left join WMSP_INBOUND_RESULT WIR
     on WIR.MATERIAL_ID = WGM.MATERIAL_ID
-    where RPG.WAREHOUSE_ID = #{warehouseId} AND WGM.DELETED = 0 and WIR.INBOUND_ISCOMPLETE = 1 order by WGM.INSERT_TIME DESC
+    where WGM.DELETED = 0
+      and WIR.INBOUND_ISCOMPLETE = 1
+    <if test="warehouseId!=0">
+        and RPG.WAREHOUSE_ID = #{warehouseId}
+    </if>
+    order by WGM.INSERT_TIME DESC
     )
    <if test="con!=null">
     where "materialName" like #{con} or "warehouseName" like #{con} or "stackingNo" like #{con}

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

@@ -367,31 +367,31 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectTransitInventory" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-    select  RC.CAPACITY_NUMBER "number",
+    select * from (
+    select RC.CAPACITY_NUMBER "number",
     OOT.ORDER_WAGON_NO "No",
     ARD.DAYPLAN_NO "dayplanNo",
     OO.ORDER_NUMBER "orderNumber",
     RM.MATERIAL_CODE "materialCode",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "specification",
-    RMS.MATERIAL_SINGLE_BUNDLE_WEIGHT  "bundleWeight",
+    RMS.MATERIAL_SINGLE_BUNDLE_WEIGHT "bundleWeight",
     RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
     OOM.ORDER_MATERIAL_NUMBER "materialNumber",
     TWR.RESULT_POUND_NO "poundNo",
     RW.WAREHOUSE_NAME "warehouseName",
     WII.INSERT_TIME "insertTime"
-
     from WMSP_INTRANSIT_INVENTORY WII
-    left join  AMSTRUCK_RAIL_DAYPLAN ARD
+    left join AMSTRUCK_RAIL_DAYPLAN ARD
     on ARD.DAYPLAN_ID=WII.RAIL_DAYPLAY_ID
-    left  join OMSTRUCK_ORDER OO
+    left join OMSTRUCK_ORDER OO
     on OO.ORDER_ID=WII.ORDER_ID
     left join OMSTRUCK_ORDER_MATERIAL OOM
     on OOM.ORDER_ID=OO.ORDER_ID
     left join RMS_CAPACITY RC
     on RC.CAPACITY_ID=OO.CAPACITY_ID
-    left join  OMSTRAIN_ORDER OOT
-    on  WII.ORDER_ID=OO.ORDER_ID
+    left join OMSTRAIN_ORDER OOT
+    on WII.ORDER_ID=OO.ORDER_ID
     left join RMS_MATERIAL RM
     on RM.MATERIAL_ID = OOM.MATERIAL_ID
     left join RMS_MATERIAL_STEEL RMS
@@ -409,6 +409,7 @@
     left join TMSTRUCK_WEIGHT_RESULT TWR
     on TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
     where RW.WAREHOUSE_TYPE_ID=2 and OO.ORDER_STATUS = 5 and TWR.RESULT_GROSS_WEIGHT is not null
+    )
     <where>
   <if test="number!= null">
     and

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

@@ -446,24 +446,26 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectWmspInventoryClose" resultType="java.util.LinkedHashMap">
+    select * from (
     select
-          rw.warehouse_name "warehouse_name",
-          rm.material_name "material_name",
-          wpic.close_lastmonth_inventory "close_lastmonth_inventory",
-          wpic.close_thismonth_inbound "close_thismonth_inbound",
-          wpic.close_thismonth_outbound "close_thismonth_outbound",
-          wpic.close_thismonth_inventory "close_thismonth_inventory"
-   from
-          wmsp_inventory_close wpic
-  join rms_material rm
-  on rm.material_id=wpic.material_id
-  join rms_warehouse rw
-  on rw.warehouse_id=wpic.warehouse_id
-  where wpic.WAREHOUSE_ID = #{warehouseId}
+    rw.warehouse_name "warehouse_name",
+    rm.MATERIAL_NAME || rm.MATERIAL_SPECIFICATION || '(' ||
+    rm.MATERIAL_MODEL || ')' "material_name",
+    wpic.close_lastmonth_inventory "close_lastmonth_inventory",
+    wpic.close_thismonth_inbound "close_thismonth_inbound",
+    wpic.close_thismonth_outbound "close_thismonth_outbound",
+    wpic.close_thismonth_inventory "close_thismonth_inventory"
+    from
+    wmsp_inventory_close wpic
+    join rms_material rm
+    on rm.material_id=wpic.material_id
+    join rms_warehouse rw
+    on rw.warehouse_id=wpic.warehouse_id
+    where wpic.WAREHOUSE_ID = #{warehouseId}
     <if test="value!=null">
       and #{value}= to_char(wpic.INSERT_TIME,'yyyy-mm')
     </if>
-
+    )
     <where>
       <if test="warehouse_name != null">
         and "warehouse_name" in

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

@@ -619,18 +619,37 @@
     END MATERIAL_QUALIFIED,
     ckd.INSERT_UPDATE_REMARK "insertUpdateRemark"
     FROM WMSP_OUTBOUND_RESULT ckd
-    LEFT JOIN OMSTRUCK_ORDER ysdd ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
-    LEFT JOIN RMS_CAPACITY ylxx ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
-    LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz ON ysdd.ORDER_ID = yswz.ORDER_ID
-    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
-    LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
-    LEFT JOIN WMSP_GRID_MATERIAL wzwg ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
-    LEFT JOIN RMS_PWAREHOUSE_GRID wg ON wzwg.GRID_ID = wg.GRID_ID
-    LEFT JOIN RMS_WAREHOUSE ck ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
-    LEFT JOIN RMS_STACKING dw ON wg.STACKING_ID = dw.STACKING_ID
-    LEFT JOIN RMS_MATERIAL_STEEL gcwz ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
-    LEFT JOIN RMS_MATERIAL wz ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
-    LEFT JOIN RMS_UNIT_OF_MEASURE jldw ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
+    LEFT JOIN OMSTRUCK_ORDER ysdd
+        ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
+    LEFT JOIN RMS_CAPACITY ylxx
+        ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
+    LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz
+        ON ysdd.ORDER_ID = yswz.ORDER_ID
+    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr
+        ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
+    LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr
+        ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
+    LEFT JOIN WMSP_GRID_MATERIAL wzwg
+        ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
+    LEFT JOIN RMS_PWAREHOUSE_GRID wg
+        ON wzwg.GRID_ID = wg.GRID_ID
+    LEFT JOIN RMS_WAREHOUSE ck
+        ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
+    LEFT JOIN RMS_STACKING dw
+        ON wg.STACKING_ID = dw.STACKING_ID
+    LEFT JOIN RMS_MATERIAL_STEEL gcwz
+        ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
+    LEFT JOIN RMS_MATERIAL wz
+        ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
+    LEFT JOIN RMS_UNIT_OF_MEASURE jldw
+        ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
+               WHERE  wg.WAREHOUSE_ID = #{warehouseId}
+    <if test="startTime != null and endTime !=null">
+      and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
+    </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time
+    </if>
     <where>
       <if test="resultNumber != null">
         and
@@ -734,12 +753,6 @@
           "resultOutboundType" like '%${item}%'
         </foreach>
       </if>
-      <if test="startTime != null and endTime !=null">
-        and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
-      </if>
-      <if test="oneDate != null">
-        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time
-      </if>
     </where>
    
   </select>

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

@@ -626,6 +626,7 @@
     left join RMS_WAREHOUSE t8
     on RPG.WAREHOUSE_ID=t8.WAREHOUSE_ID
      where WGM.DELETED=0 and WGM.STATUS!=1
+       and RPG.WAREHOUSE_ID != 3
     <if test="warehouseid != null">
       and t8.WAREHOUSE_ID = #{warehouseid,jdbcType=DECIMAL}
     </if>