杰生迭代

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/check/Check.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/check/CheckInfo.java

@@ -1,9 +1,7 @@
 package com.fjhx.entity.check;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.fjhx.base.StorageBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -21,7 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class Check extends StorageBaseEntity {
+public class CheckInfo extends StorageBaseEntity {
 
 
     /**

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/check/CheckEx.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/check/CheckInfoEx.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.check;
 
-import com.fjhx.entity.check.Check;
+import com.fjhx.entity.check.CheckInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,6 +12,6 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CheckEx extends Check {
+public class CheckInfoEx extends CheckInfo {
 
 }

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/check/CheckVo.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/check/CheckInfoVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.check;
 
-import com.fjhx.entity.check.Check;
+import com.fjhx.entity.check.CheckInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,6 +12,6 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CheckVo extends Check {
+public class CheckInfoVo extends CheckInfo {
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/controller/check/CheckController.java

@@ -1,10 +1,10 @@
 package com.fjhx.controller.check;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.check.CheckInfo;
+import com.fjhx.params.check.CheckInfoVo;
 import org.springblade.core.tool.api.R;
-import com.fjhx.entity.check.Check;
-import com.fjhx.params.check.CheckVo;
-import com.fjhx.service.check.CheckService;
+import com.fjhx.service.check.CheckInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,29 +26,29 @@ import java.util.Map;
 public class CheckController {
 
     @Autowired
-    private CheckService checkService;
+    private CheckInfoService checkInfoService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition){
-        Page<Check> result = checkService.getPage(condition);
+        Page<CheckInfo> result = checkInfoService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody CheckVo checkVo){
-        checkService.add(checkVo);
+    public R add(@RequestBody CheckInfoVo checkVo){
+        checkInfoService.add(checkVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody CheckVo checkVo){
-        checkService.edit(checkVo);
+    public R edit(@RequestBody CheckInfoVo checkVo){
+        checkInfoService.edit(checkVo);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody CheckVo checkVo){
-        checkService.delete(checkVo);
+    public R delete(@RequestBody CheckInfoVo checkVo){
+        checkInfoService.delete(checkVo);
         return R.success();
     }
 

hx-service/storage-restructure/src/main/java/com/fjhx/controller/task/ScheduleTaskController.java

@@ -1,6 +1,6 @@
 package com.fjhx.controller.task;
 
-import com.fjhx.service.check.CheckService;
+import com.fjhx.service.check.CheckInfoService;
 import com.fjhx.service.v3.V3PlanService;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ public class ScheduleTaskController {
     private V3PlanService v3PlanService;
 
     @Autowired
-    private CheckService checkService;
+    private CheckInfoService checkInfoService;
 
     /**
      * 获取排班面积
@@ -33,13 +33,14 @@ public class ScheduleTaskController {
     /**
      * 盘点
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 10 19 * * ?")
 //    @PostConstruct
     private void automaticCheck() {
-        if (BladeApplication.isLocalDev()) {
-            return;
-        }
-        checkService.automaticCheck();
+//        if (BladeApplication.isLocalDev()) {
+//            return;
+//        }
+        checkInfoService.automaticCheck();
     }
 
 

hx-service/storage-restructure/src/main/java/com/fjhx/listener/WebSocketEventListener.java

@@ -7,7 +7,7 @@ import com.fjhx.entity.MessageEntity;
 import com.fjhx.event.WebSocketOnMessageEvent;
 import com.fjhx.event.WebSocketOnOpenEvent;
 import com.fjhx.service.WebSocketServer;
-import com.fjhx.service.check.impl.CheckServiceImpl;
+import com.fjhx.service.check.impl.CheckInfoServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -54,7 +54,7 @@ public class WebSocketEventListener {
             case WebSocketConstant.PUSH_RFID:
 
                 if (ObjectUtil.equals(data.get("flag"), "automaticCheck")) {
-                    CheckServiceImpl.RFID_LIST.add(data.getString("rfid"));
+                    CheckInfoServiceImpl.RFID_LIST.add(data.getString("rfid"));
                 } else {
                     WebSocketServer.sendInfo(sendEntity.getUserId(), sendEntity.getSessionId(), type, data);
                 }

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/check/CheckMapper.java → hx-service/storage-restructure/src/main/java/com/fjhx/mapper/check/CheckInfoMapper.java

@@ -1,6 +1,6 @@
 package com.fjhx.mapper.check;
 
-import com.fjhx.entity.check.Check;
+import com.fjhx.entity.check.CheckInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ${author}
  * @since 2022-11-01
  */
-public interface CheckMapper extends BaseMapper<Check> {
+public interface CheckInfoMapper extends BaseMapper<CheckInfo> {
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/CheckInfoService.java

@@ -0,0 +1,33 @@
+package com.fjhx.service.check;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.StorageBaseService;
+import com.fjhx.entity.check.CheckInfo;
+import com.fjhx.params.check.CheckInfoVo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 盘点 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-01
+ */
+public interface CheckInfoService extends StorageBaseService<CheckInfo> {
+
+    Page<CheckInfo> getPage(Map<String, String> condition);
+
+    void add(CheckInfoVo checkVo);
+
+    void edit(CheckInfoVo checkVo);
+
+    void delete(CheckInfoVo checkVo);
+
+    /**
+     * 自动盘点
+     */
+    void automaticCheck();
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/CheckService.java

@@ -1,33 +0,0 @@
-package com.fjhx.service.check;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.base.StorageBaseService;
-import com.fjhx.entity.check.Check;
-import com.fjhx.params.check.CheckVo;
-
-import java.util.Map;
-
-/**
- * <p>
- * 盘点 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-11-01
- */
-public interface CheckService extends StorageBaseService<Check> {
-
-    Page<Check> getPage(Map<String, String> condition);
-
-    void add(CheckVo checkVo);
-
-    void edit(CheckVo checkVo);
-
-    void delete(CheckVo checkVo);
-
-    /**
-     * 自动盘点
-     */
-    void automaticCheck();
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/impl/CheckServiceImpl.java → hx-service/storage-restructure/src/main/java/com/fjhx/service/check/impl/CheckInfoServiceImpl.java

@@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.HouseConstant;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.WebSocketConstant;
-import com.fjhx.entity.check.Check;
 import com.fjhx.entity.check.CheckDetail;
+import com.fjhx.entity.check.CheckInfo;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.entity.water.WaterTag;
-import com.fjhx.mapper.check.CheckMapper;
-import com.fjhx.params.check.CheckVo;
+import com.fjhx.mapper.check.CheckInfoMapper;
+import com.fjhx.params.check.CheckInfoVo;
 import com.fjhx.service.WebSocketServer;
 import com.fjhx.service.check.CheckDetailService;
-import com.fjhx.service.check.CheckService;
+import com.fjhx.service.check.CheckInfoService;
 import com.fjhx.service.stock.StockService;
 import com.fjhx.service.water.WaterTagService;
 import com.fjhx.utils.WrapperUtil;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * @since 2022-11-01
  */
 @Service
-public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements CheckService {
+public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo> implements CheckInfoService {
 
     /**
      * 上位机读取的rfid
@@ -55,29 +55,29 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
     private CheckDetailService checkDetailService;
 
     @Override
-    public Page<Check> getPage(Map<String, String> condition) {
+    public Page<CheckInfo> getPage(Map<String, String> condition) {
 
-        QueryWrapper<Check> wrapper = Wrappers.query();
+        QueryWrapper<CheckInfo> wrapper = Wrappers.query();
 
         WrapperUtil.init(condition, wrapper)
                 .createTimeDesc();
 
-        Page<Check> page = page(condition, wrapper);
+        Page<CheckInfo> page = page(condition, wrapper);
         return page;
     }
 
     @Override
-    public void add(CheckVo checkVo) {
+    public void add(CheckInfoVo checkVo) {
         save(checkVo);
     }
 
     @Override
-    public void edit(CheckVo checkVo) {
+    public void edit(CheckInfoVo checkVo) {
         updateById(checkVo);
     }
 
     @Override
-    public void delete(CheckVo checkVo) {
+    public void delete(CheckInfoVo checkVo) {
         removeById(checkVo.getId());
     }
 
@@ -92,7 +92,7 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
 
         WebSocketServer.sendInfo(WebSocketConstant.WEB_STOCK_PROGRAM, WebSocketConstant.OPERATING_UPPER_COMPUTER, data);
 
-        ThreadUtil.sleep(1000 * 60 * 10);
+        ThreadUtil.sleep(1000);
 
         data.clear();
         data.put("type", 9);
@@ -110,8 +110,11 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
         // 保存盘点结果
         Long checkId = savaCheck(errorMaterialId);
 
-        // 保存盘点结果明细
-        savaCheckDetailList(errorMaterialId, checkId);
+        if (errorMaterialId.size() > 0) {
+            // 保存盘点结果明细
+            savaCheckDetailList(errorMaterialId, checkId);
+        }
+
 
     }
 
@@ -159,14 +162,14 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
      * 保存盘点结果
      */
     private Long savaCheck(List<Long> errorMaterialId) {
-        Check check = new Check();
-        check.setCheckResult(errorMaterialId.size() == 0 ? 1 : 0);
-        check.setType(1);
-        check.setStatus(0);
-        check.setStockHouseId(HouseConstant.GROUND_FLOOR_ID);
-        check.setBeginTime(new Date());
-        save(check);
-        return check.getId();
+        CheckInfo checkInfo = new CheckInfo();
+        checkInfo.setCheckResult(errorMaterialId.size() == 0 ? 1 : 0);
+        checkInfo.setType(1);
+        checkInfo.setStatus(0);
+        checkInfo.setStockHouseId(HouseConstant.GROUND_FLOOR_ID);
+        checkInfo.setBeginTime(new Date());
+        save(checkInfo);
+        return checkInfo.getId();
     }
 
     /**
@@ -176,6 +179,7 @@ public class CheckServiceImpl extends ServiceImpl<CheckMapper, Check> implements
 
         // 库存信息
         List<Stock> stockList = stockService.list(q -> q.in(Stock::getMaterialId, errorMaterialId));
+
         // 库存信息map
         Map<Long, Stock> stockMap = stockList.stream().collect(Collectors.toMap(
                 Stock::getMaterialId,