Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -93,9 +93,10 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         String newDate=simpleDateFormat.format(new Date(date2));
         mapval.put("warehouseId",warehouseId);
         List<Map<String ,Object>> list1 = wmspGridMaterialMapper.selectGridMaterial(mapval);
-        mapval.put("newDate",newDate);
+        /*mapval.put("newDate",newDate);
         List<Map<String ,Object>> list2 = wmspGridMaterialMapper.getGridMaterialAgeList(mapval);
-        mapval.clear();
+        //因为要查询所以把该值去掉了
+        //mapval.clear();
         for (Map<String,Object> map1:list1){
             Integer status = 0;
             for (Map<String,Object> map2:list2){
@@ -108,7 +109,7 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
                 }
             }
             map1.put("status",status);
-        }
+        }*/
         return list1;
     }
     //根据仓储网格统计数据

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

@@ -416,21 +416,26 @@
   
   
   <!-- 友情提示！！！-->
+  <!--
+  RS.STACKING_NO "stackingNo",
+    RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
+    RMS.MATERIAL_FURNACE_NUMBER "materialFunraceNumber",
+  -->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectGridMaterial" resultType="java.util.Map" parameterType="java.util.Map">
     select distinct *
     from (select
     RW.WAREHOUSE_NAME "warehouseName",
-    RS.STACKING_NO "stackingNo",
-    RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
-    RMS.MATERIAL_FURNACE_NUMBER "materialFunraceNumber",
     RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
     WGM.GM_NUMBER "gmNumber",
     RM.MATERIAL_NAME "materialName",
     RPG.GRID_ID  "gridId",
     RMS.MATERIAL_STEEL_ID "materialId",
     RMS.MATERIAL_ONLY_CODE "materialOnlyCode",
-    WGM.GM_ID "gmId"
+    WGM.GM_ID "gmId",
+    RM.MATERIAL_SPECIFICATION   "specification",
+    RM.MATERIAL_MODEL   "materialModel",
+    RM.MATERIAL_LENGTH  "materialLength"
     from WMSP_GRID_MATERIAL WGM
     left join RMS_PWAREHOUSE_GRID RPG
     on  WGM.GRID_ID=RPG.GRID_ID
@@ -448,13 +453,16 @@
     on WIR.MATERIAL_ID = WGM.MATERIAL_ID
     where WGM.DELETED = 0
       and WIR.INBOUND_ISCOMPLETE = 1
+      and to_char(WGM.INSERT_TIME,'yyyy-mm-dd hh24:mi:ss')
+      between to_char(trunc(sysdate,'dd'),'yyyy-mm-dd hh24:mi:ss')
+      and to_char(trunc(sysdate,'dd')+23/24+59/24/60+59/24/60/60,'yyyy-mm-dd hh24:mi:ss')
     <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}
+    where "materialName" like #{con} or "specification" like #{con} or "materialModel" like #{con}
   </if>
     <where>
       <if test="warehouseName != null">
@@ -806,7 +814,8 @@
         ON RPG.GRID_ID = WGM.GRID_ID
         LEFT JOIN RMS_MATERIAL_STEEL RMS
         ON RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
-        WHERE WGM.INSERT_TIME &lt;= to_date(#{newDate}, 'yyyy-mm-dd hh24:mi:ss' )   AND WGM.UPDATE_TIME IS NULL AND RPG.WAREHOUSE_ID =#{warehouseId}
+        WHERE WGM.INSERT_TIME &lt;= to_date(#{newDate}, 'yyyy-mm-dd hh24:mi:ss' )
+        AND WGM.UPDATE_TIME IS NULL AND RPG.WAREHOUSE_ID =#{warehouseId}
     </select>
   <select id="getMaterialIdesNoTime" resultType="java.util.Map">
         SELECT