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

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

@@ -222,6 +222,22 @@ public class WmspGridMaterialController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
         return success(pageList);
     }
+
+//    根据仓库id查询对应库的物资id,没有传库的id直接查询所有钢材的物资
+    @ApiOperation(value = "查询所有钢材的物资信息",notes = "查询所有钢材的物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "443", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getSteelMaterialList")
+    public  RESTfulResult getSteelMaterialList(Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId){
+        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialList();
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialList();
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
+        return success(pageList);
+    }
 }
 
 

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

@@ -14,4 +14,6 @@ public interface WmspCheckWarehouseMapper extends IBaseMapper<WmspCheckWarehouse
     List<Map<String, Object>> getStockTakingList();
 
     BigDecimal getMaxId();
+//    查找钢材物资信息
+    List<Map<String, Object>> getSteelMaterialList();
 }

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

@@ -53,4 +53,6 @@ public interface IWmspGridMaterialService  {
    int insertStockTaking(String warehouseid, String materialCode, Integer quantity);
 //   查询盘库实绩
     List<Map<String, Object>> getStockTakingList();
+//    获得钢材物资信息
+    List<Map<String, Object>> getSteelMaterialList();
 }

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

@@ -272,11 +272,6 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         wmspCheckWarehouse.setInsertUsername("admin");
 //        查找当前盘点库存实绩表的最大Id
         BigDecimal checkId = wmspCheckWarehouseMapper.getMaxId();
-        if (checkId==null){
-            checkId=new BigDecimal(1);
-        }else{
-            checkId.add(new BigDecimal(1));
-        }
         wmspCheckWarehouse.setCheckId(checkId);
         int result = wmspCheckWarehouseMapper.insertSelective(wmspCheckWarehouse);
 
@@ -288,4 +283,9 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
 
         return wmspCheckWarehouseMapper.getStockTakingList();
     }
+
+    @Override
+    public List<Map<String, Object>> getSteelMaterialList() {
+        return wmspCheckWarehouseMapper.getSteelMaterialList();
+    }
 }

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

@@ -386,7 +386,23 @@
     ORDER BY WCW.INSERT_TIME DESC
   </select>
   <select id="getMaxId" resultType="java.math.BigDecimal">
-    SELECT MAX(WCM.CHECK_ID)
+    SELECT MAX(WCM.CHECK_ID)+1 "checkId"
     FROM WMSP_CHECK_WAREHOUSE WCM
   </select>
+    <select id="getSteelMaterialList" 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"
+        FROM RMS_MATERIAL_STEEL RMS
+        LEFT JOIN RMS_MATERIAL RM
+        ON RMS.MATERIAL_ID = RM.MATERIAL_ID
+    </select>
 </mapper>

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

@@ -566,14 +566,14 @@
   </update>
 
   <select id="selectSendReceiveThisdayInbound" parameterType="java.util.Map" resultType="java.math.BigDecimal">
-    select wsr.SEND_RECEIVE_THISDAY_INBOUND
+    select DISTINCT wsr.SEND_RECEIVE_THISDAY_INBOUND
     from WMSP_SEND_RECEIVE wsr
     where wsr.MATERIAL_ID = #{materialId} and wsr.WAREHOUSE_ID = #{warehouseId}
      and trunc(wsr.INSERT_TIME) = trunc(sysdate-1)
   </select>
 
   <select id="selectSendReceiveThisdayOutbound" parameterType="java.util.Map" resultType="java.math.BigDecimal">
-    select wsr.SEND_RECEIVE_THISDAY_OUTBOUND
+    select DISTINCT wsr.SEND_RECEIVE_THISDAY_OUTBOUND
     from WMSP_SEND_RECEIVE wsr
     where wsr.MATERIAL_ID = #{materialId} and wsr.WAREHOUSE_ID = #{warehouseId}
     and trunc(wsr.INSERT_TIME) = trunc(sysdate-1)