tijiao

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

@@ -71,32 +71,32 @@ public class WmspGridMaterialController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> columnList = wmspGridMaterialService.selectGridMaterial(mapVal);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, libaryInBoundList, columnList);
-        //库龄预警
-        for (Map mapValue : columnList) {
-            BigDecimal gridId = (BigDecimal) mapValue.get("gridId");
-            List<Map<String, Object>> map2 = wmspGridMaterialService.selectInboundTimeAndThreshold(gridId);
-            //取出入库日期转换为时间戳
-            for (Map<String, Object> map1 : map2) {
-                Date inboundTime = (Date) map1.get("inboundTime");
-                Date date1 = new Date();
-                //当前时间减去入库日期
-                long data1 = date1.getTime() - inboundTime.getTime();
-                //日期
-                long days = data1 / (1000 * 60 * 60 * 24);
-                //小时
-                long hours = (data1 - days * (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
-                //分钟
-                long minutes = (data1 - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);
-                //获取标准值
-                BigDecimal max = (BigDecimal) map1.get("max");
-                Long Max = max.longValue();
-                BigDecimal min = (BigDecimal) map1.get("min");
-                Long Min = min.longValue();
-                if (days < Max && days >= Min) {
-                    return success();
-                }
-            }
-        }
+//        //库龄预警
+//        for (Map mapValue : columnList) {
+//            BigDecimal gridId = (BigDecimal) mapValue.get("gridId");
+//            List<Map<String, Object>> map2 = wmspGridMaterialService.selectInboundTimeAndThreshold(gridId);
+//            //取出入库日期转换为时间戳
+//            for (Map<String, Object> map1 : map2) {
+//                Date inboundTime = (Date) map1.get("inboundTime");
+//                Date date1 = new Date();
+//                //当前时间减去入库日期
+//                long data1 = date1.getTime() - inboundTime.getTime();
+//                //日期
+//                long days = data1 / (1000 * 60 * 60 * 24);
+//                //小时
+//                long hours = (data1 - days * (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
+//                //分钟
+//                long minutes = (data1 - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);
+//                //获取标准值
+//                BigDecimal max = (BigDecimal) map1.get("max");
+//                Long Max = max.longValue();
+//                BigDecimal min = (BigDecimal) map1.get("min");
+//                Long Min = min.longValue();
+//                if (days < Max && days >= Min) {
+//                    return success();
+//                }
+//            }
+//        }
         return success(pageList);
     }
     //统计实时库存数量

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

@@ -272,6 +272,9 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
         wmspCheckWarehouse.setInsertUsername("admin");
 //        查找当前盘点库存实绩表的最大Id
         BigDecimal checkId = wmspCheckWarehouseMapper.getMaxId();
+        if (checkId==null){
+            checkId = new BigDecimal(1);
+        }
         wmspCheckWarehouse.setCheckId(checkId);
         int result = wmspCheckWarehouseMapper.insertSelective(wmspCheckWarehouse);
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -444,6 +444,7 @@
     on  RM.MATERIAL_ID=RMS.MATERIAL_ID
     left join RMS_MATERIAL_TYPE RMT
     on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
+    where WGM.DELETED = 0
     )
     <where>
       <if test="warehouseName != null">