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

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

@@ -99,8 +99,6 @@ public class WmsInboundResultController extends BaseRESTfulController {
                                              String endTime) {
 
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
-        List<Map<String,Object>> inboundResultList = wmsInboundResultServiceImpl.getInboundResult(mapValue,warehouseId);
-
         /*分页*/
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String,Object>> columnList = wmsInboundResultServiceImpl.getInboundResult(mapValue,warehouseId);
@@ -116,7 +114,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 map.put("isComplete","异常入库");
             }
         }
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,inboundResultList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,columnList);
         return success(pageList);
     }
     /**

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

@@ -422,6 +422,7 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
             entry.put("wareHouseNumber","WZCCZ-CP-002");
             entry.put("poundwei",actuallyWeight);
             entry.put("remark",remark);
+            entry.put("qty",materialTheWeight);
             entries.add(entry);
             Map<String,Object> input = new HashMap<>();
             input.put("head",head);

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

@@ -457,6 +457,7 @@
   
                  WHERE RPG.WAREHOUSE_ID =#{warehouseId}
                  AND WIR.INBOUND_ISCOMPLETE=#{status}
+                 AND WIR.INBOUND_TYPE = 0
                 GROUP BY RM.MATERIAL_CODE
         ) table1
        ON table1.code = RM.MATERIAL_CODE
@@ -466,6 +467,7 @@
         AND table1.count>0
       </if>
       AND WIR.INBOUND_ISCOMPLETE=#{status}
+      AND WIR.INBOUND_TYPE = 0
       <include refid="orderBy"></include>
     </select>
   <select id="getSteelWarehouseList" resultType="java.util.Map">

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

@@ -792,10 +792,11 @@
       AND WIR.INBOUND_ISCOMPLETE =#{status}
       AND WIR.RESULT_STATUS >1
       AND RPG.WAREHOUSE_ID = #{warehouseId}
+      AND WIR.INBOUND_TYPE = 0
       AND RM.MATERIAL_CODE = #{materialCode}
       AND RM.MATERIAL_MODEL= #{materialModel}
       AND RM.MATERIAL_SPECIFICATION = #{materialSpecification}
-    ORDER BY RMS.INSERT_TIME DESC
+    ORDER BY RMS.INSERT_TIME desc
   </select>
     <select id="getGridMaterialAgeList" resultType="java.util.Map">
       SELECT