Ver código fonte

维多利亚

24282 2 anos atrás
pai
commit
51bd1d4449

+ 16 - 13
hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.stock.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.stock.StockCheckrecord;
@@ -116,20 +117,8 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
                 JSONObject.toJSONString(rfidList)
         );
 
-        // 添加盘点记录
-        StockCheckrecord stockCheckrecord = new StockCheckrecord();
-        stockCheckrecord.setIsDelete(0);
-        stockCheckrecord.setCreatedTime(date);
-        stockCheckrecord.setUpdatedTime(date);
-        stockCheckrecord.setStockCheckResult(0);
-        stockCheckrecord.setType(3);
-        stockCheckrecord.setStockHouseId(stockHouseId);
-        stockCheckrecord.setApproveBillState(0);
-        stockCheckrecord.setCheckState(0);
-        stockCheckrecord.setPeopleCheckResut(1);
-        save(stockCheckrecord);
 
-        String recordId = stockCheckrecord.getId();
+        String recordId = IdWorker.getIdStr();
 
         // 获取所有在库物料
         List<Map<String, Object>> stockList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
@@ -213,6 +202,20 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
             });
         }
 
+
+        // 添加盘点记录
+        StockCheckrecord stockCheckrecord = new StockCheckrecord();
+        stockCheckrecord.setId(recordId);
+        stockCheckrecord.setIsDelete(0);
+        stockCheckrecord.setCreatedTime(date);
+        stockCheckrecord.setUpdatedTime(date);
+        stockCheckrecord.setStockCheckResult(list.size() == 0 ? 1 : 0);
+        stockCheckrecord.setType(3);
+        stockCheckrecord.setStockHouseId(stockHouseId);
+        stockCheckrecord.setApproveBillState(0);
+        stockCheckrecord.setCheckState(0);
+        stockCheckrecord.setPeopleCheckResut(1);
+        save(stockCheckrecord);
         // 添加异常物料信息
         stockCheckrecorddetailService.saveBatch(list);
     }

+ 1 - 2
hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -74,8 +74,7 @@ public class ScheduleTaskController {
     /**
      * 盘点
      */
-//    @Scheduled(cron = "0 0 1 * * ?")
-    @Scheduled(cron = "0 50 12 * * ?")
+   @Scheduled(cron = "0 0 1 * * ?")
 //    @PostConstruct
     private void checkStart() {
         if (BladeApplication.isLocalDev()) {