修改平库盘点逻辑 库存物料状态、库存状态、货位状态、货位是否锁定逻辑修改

ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java

@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 盘点差异Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
@@ -77,7 +77,7 @@ public class CheckDifferenceRecordController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CheckDifferenceRecord checkDifferenceRecord)
     {
-        return toAjax(checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord));
+        return checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java

@@ -2,18 +2,19 @@ package com.ruoyi.check.difference.service;
 
 import java.util.List;
 import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
+import com.ruoyi.common.core.domain.AjaxResult;
 
 /**
  * 盘点差异Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface ICheckDifferenceRecordService 
+public interface ICheckDifferenceRecordService
 {
     /**
      * 查询盘点差异
-     * 
+     *
      * @param checkGuid 盘点差异主键
      * @return 盘点差异
      */
@@ -21,7 +22,7 @@ public interface ICheckDifferenceRecordService
 
     /**
      * 查询盘点差异列表
-     * 
+     *
      * @param checkDifferenceRecord 盘点差异
      * @return 盘点差异集合
      */
@@ -29,15 +30,15 @@ public interface ICheckDifferenceRecordService
 
     /**
      * 新增盘点差异
-     * 
+     *
      * @param checkDifferenceRecord 盘点差异
      * @return 结果
      */
-    public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
+    public AjaxResult insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
 
     /**
      * 修改盘点差异
-     * 
+     *
      * @param checkDifferenceRecord 盘点差异
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface ICheckDifferenceRecordService
 
     /**
      * 批量删除盘点差异
-     * 
+     *
      * @param checkGuids 需要删除的盘点差异主键集合
      * @return 结果
      */
@@ -53,7 +54,7 @@ public interface ICheckDifferenceRecordService
 
     /**
      * 删除盘点差异信息
-     * 
+     *
      * @param checkGuid 盘点差异主键
      * @return 结果
      */

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ruoyi.check.difference.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.util.IdUtil;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.service.IBasStockService;
@@ -58,21 +60,33 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
      * @return 结果
      */
     @Override
-    public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
+    public AjaxResult insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
     {
         if (checkDifferenceRecord.getRecordType()==1){
             String stockId = checkDifferenceRecord.getStockId();
             BasStock basStock = basStockService.selectBasStockByStockId(stockId);
+            if (!"1".equals(basStock.getProductStatus())){
+                return AjaxResult.warn("库存非正常状态");
+            }
+            basStock.setProductStatus("2");
+            basStockService.updateBasStock(basStock);
             checkDifferenceRecord.setOldQuantity(basStock.getQuantity());
         }else if (checkDifferenceRecord.getRecordType()==2){
             checkDifferenceRecord.setOldQuantity("0");
         }else if (checkDifferenceRecord.getRecordType()==3){
+            BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId());
+            if (!"1".equals(basStock.getProductStatus())){
+                return AjaxResult.warn("库存非正常状态");
+            }
+            basStock.setProductStatus("2");
+            basStockService.updateBasStock(basStock);
             checkDifferenceRecord.setNewQuantity("0");
         }
-        checkDifferenceRecord.setCreateTime(DateUtils.getNowDate());
+        checkDifferenceRecord.setCreateTime(new Date());
         checkDifferenceRecord.setCheckGuid(IdUtil.fastSimpleUUID());
         checkDifferenceRecord.setStatus("0");
-        return checkDifferenceRecordMapper.insertCheckDifferenceRecord(checkDifferenceRecord);
+        checkDifferenceRecordMapper.insertCheckDifferenceRecord(checkDifferenceRecord);
+        return AjaxResult.success("操作成功");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/check/flat/FlatStockCheckController.java

@@ -1,28 +0,0 @@
-package com.ruoyi.check.flat;
-
-import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
-import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
-import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 平库盘点
- */
-@RestController
-@RequestMapping("/check/flatStockCheck")
-public class FlatStockCheckController {
-
-    @Autowired
-    private ICheckDifferenceRecordService checkDifferenceRecordService;
-
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody CheckDifferenceRecord checkDifferenceRecord) {
-        int i = checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord);
-        return i > 0 ? AjaxResult.success(): AjaxResult.error();
-    }
-
-}