本地最新代码:同步所有修改及新增模块

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java

@@ -58,9 +58,10 @@ public class BasStockController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('stock:management:query')")
     @GetMapping(value = "/{stockId}")
-    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    public AjaxResult getInfo(@PathVariable("stockId") String stockId, @RequestParam(value = "warehouseCode", required = false) String warehouseCode)
     {
-        return success(basStockService.selectBasStockByStockId(stockId));
+        BasStock basStock = basStockService.selectBasStockByStockId2(stockId, warehouseCode);
+        return success(basStock);
     }
 
     /**
@@ -91,9 +92,10 @@ public class BasStockController extends BaseController
     @PreAuthorize("@ss.hasPermi('stock:management:remove')")
     @Log(title = "库存信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{stockIds}")
-    public AjaxResult remove(@PathVariable String[] stockIds)
+    public AjaxResult remove(@PathVariable String[] stockIds,@RequestParam(value = "warehouseCode",required = false) String warehouseCode)
     {
-        return toAjax(basStockService.deleteBasStockByStockIds(stockIds));
+        System.out.println(warehouseCode);
+        return toAjax(basStockService.deleteBasStockByStockIds2(stockIds,warehouseCode));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java

@@ -11,6 +11,7 @@ import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.data.annotation.Transient;
 
 import java.util.List;
 
@@ -184,6 +185,8 @@ public class BasStock extends BaseEntity
     /** 仓库 */
 //     @Excel(name = "${stock.BasStock.warehouseId}")
     private String warehouseId;
+    @Transient
+    private String warehouseCode;
 
 
     /** 垛型ID */

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.stock.stock.mapper;
 
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.stock.stock.domain.BasStock;
 import org.apache.ibatis.annotations.Param;
 
@@ -73,4 +74,20 @@ public interface BasStockMapper
     List<BasStock> getStockBySerial(String trayCode);
 
     List<BasStock> selectHasHalfTray(InStockinDetail inStockinDetail);
+
+    List<BasStock> selectBasStockHcCount(BasStock  basStock);
+
+    List<BasStock> selectBasStockListHc(BasStock basStock);
+
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int updateBasStock2(BasStock basStock);
+
+    int deleteBasStockByStockIds2(@Param("stockIds") String[] stockIds, @Param("warehouseCode")String warehouseCode);
+
+    List<BasStock> selectBasStockList2(BasStock basStock);
+
+    List<BasStock> selectBasStockHcs(@Param("trayCode") String trayCode, @Param("out") OutStockoutDetail outStockoutDetail);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java

@@ -83,4 +83,10 @@ public interface IBasStockService
     AjaxResult resetPdRecord();
 
     List<BasStock> getStockBySerial(String serial);
+
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java

@@ -58,7 +58,7 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public List<BasStock> selectBasStockList(BasStock basStock)
     {
-        return basStockMapper.selectBasStockList(basStock);
+        return basStockMapper.selectBasStockList2(basStock);
     }
     /**
      * 无权限查询库存信息列表
@@ -115,10 +115,10 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public int updateBasStock(BasStock basStock)
     {
-        BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
+        BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(basStock.getStockId(),basStock.getWarehouseCode());
         insertMaintainRecord(oldBasStock,basStock,"2");
         insertFreezeRecord(oldBasStock,basStock);
-        return basStockMapper.updateBasStock(basStock);
+        return basStockMapper.updateBasStock2(basStock);
     }
 
     private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) {
@@ -194,6 +194,28 @@ public class BasStockServiceImpl implements IBasStockService
         return basStockMapper.getStockBySerial(trayCode);
     }
 
+    @Override
+    public BasStock selectBasStockByStockId2(String stockId, String warehouseCode) {
+        return basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode)
+    {
+        for (String stockId : stockIds) {
+            BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+            insertMaintainRecord(oldBasStock,oldBasStock,"3");
+        }
+        return basStockMapper.deleteBasStockByStockIds2(stockIds,warehouseCode);
+    }
+
+    @Override
+    public BasStock selectBasStockListTopOne(String trayCode) {
+
+        return basStockMapper.selectBasStockListTopOne(trayCode);
+    }
+
     /**
      * 新增库存信息（不记录维护记录）
      *