库存冻结 入库单据历史 接收单据历史

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/controller/BasStockFreezeRecordController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.stock.freeze.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
+import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 库存冻结记录Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/stock/freeze")
+public class BasStockFreezeRecordController extends BaseController
+{
+    @Autowired
+    private IBasStockFreezeRecordService basStockFreezeRecordService;
+
+    /**
+     * 查询库存冻结记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BasStockFreezeRecord basStockFreezeRecord)
+    {
+        startPage();
+        List<BasStockFreezeRecord> list = basStockFreezeRecordService.selectBasStockFreezeRecordList(basStockFreezeRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存冻结记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:export')")
+    @Log(title = "库存冻结记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasStockFreezeRecord basStockFreezeRecord)
+    {
+        List<BasStockFreezeRecord> list = basStockFreezeRecordService.selectBasStockFreezeRecordList(basStockFreezeRecord);
+        ExcelUtil<BasStockFreezeRecord> util = new ExcelUtil<BasStockFreezeRecord>(BasStockFreezeRecord.class);
+        util.exportExcel(response, list, "库存冻结记录数据");
+    }
+
+    /**
+     * 获取库存冻结记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:query')")
+    @GetMapping(value = "/{whGuid}")
+    public AjaxResult getInfo(@PathVariable("whGuid") String whGuid)
+    {
+        return success(basStockFreezeRecordService.selectBasStockFreezeRecordByWhGuid(whGuid));
+    }
+
+    /**
+     * 新增库存冻结记录
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:add')")
+    @Log(title = "库存冻结记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BasStockFreezeRecord basStockFreezeRecord)
+    {
+        return toAjax(basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord));
+    }
+
+    /**
+     * 修改库存冻结记录
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:edit')")
+    @Log(title = "库存冻结记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BasStockFreezeRecord basStockFreezeRecord)
+    {
+        return toAjax(basStockFreezeRecordService.updateBasStockFreezeRecord(basStockFreezeRecord));
+    }
+
+    /**
+     * 删除库存冻结记录
+     */
+    @PreAuthorize("@ss.hasPermi('stock:freeze:remove')")
+    @Log(title = "库存冻结记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{whGuids}")
+    public AjaxResult remove(@PathVariable String[] whGuids)
+    {
+        return toAjax(basStockFreezeRecordService.deleteBasStockFreezeRecordByWhGuids(whGuids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java

@@ -0,0 +1,278 @@
+package com.ruoyi.stock.freeze.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 库存冻结记录对象 bas_stock_freeze_record
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class BasStockFreezeRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** guid */
+    private String whGuid;
+
+    /** 库存编码 */
+    @Excel(name = "库存编码")
+    private String stockId;
+
+    /** 货位编码 */
+    @Excel(name = "货位编码")
+    private String cargoSpaceId;
+
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
+
+    /** 物品编码 */
+    @Excel(name = "物品编码")
+    private String productId;
+
+    /** 物品名称 */
+    @Excel(name = "物品名称")
+    private String productName;
+
+    /** 生产日期 */
+    @Excel(name = "生产日期")
+    private String printDate;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String lotNo;
+
+    /** 初始状态 */
+    @Excel(name = "初始状态")
+    private String oldStatus;
+
+    /** 更改状态 */
+    @Excel(name = "更改状态")
+    private String currStatus;
+
+    /** 操作 */
+    @Excel(name = "操作")
+    private String method;
+
+    /** 仓库 */
+    @Excel(name = "仓库")
+    private String warehouseId;
+
+    /** 库存字表id */
+    @Excel(name = "库存字表id")
+    private String stockDetailId;
+
+    /** 操作目标 */
+    @Excel(name = "操作目标")
+    private String operatingTarget;
+
+    /** 条码数量（旧） */
+    @Excel(name = "条码数量", readConverterExp = "旧=")
+    private String barCodeOldQuantity;
+
+    /** 条码数量（新） */
+    @Excel(name = "条码数量", readConverterExp = "新=")
+    private String barCodeQuantity;
+
+    /** 物料guid */
+    @Excel(name = "物料guid")
+    private String productGuid;
+
+    public void setWhGuid(String whGuid) 
+    {
+        this.whGuid = whGuid;
+    }
+
+    public String getWhGuid() 
+    {
+        return whGuid;
+    }
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
+    }
+
+    public void setTrayCode(String trayCode) 
+    {
+        this.trayCode = trayCode;
+    }
+
+    public String getTrayCode() 
+    {
+        return trayCode;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setPrintDate(String printDate) 
+    {
+        this.printDate = printDate;
+    }
+
+    public String getPrintDate() 
+    {
+        return printDate;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setOldStatus(String oldStatus) 
+    {
+        this.oldStatus = oldStatus;
+    }
+
+    public String getOldStatus() 
+    {
+        return oldStatus;
+    }
+
+    public void setCurrStatus(String currStatus) 
+    {
+        this.currStatus = currStatus;
+    }
+
+    public String getCurrStatus() 
+    {
+        return currStatus;
+    }
+
+    public void setMethod(String method) 
+    {
+        this.method = method;
+    }
+
+    public String getMethod() 
+    {
+        return method;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setStockDetailId(String stockDetailId) 
+    {
+        this.stockDetailId = stockDetailId;
+    }
+
+    public String getStockDetailId() 
+    {
+        return stockDetailId;
+    }
+
+    public void setOperatingTarget(String operatingTarget) 
+    {
+        this.operatingTarget = operatingTarget;
+    }
+
+    public String getOperatingTarget() 
+    {
+        return operatingTarget;
+    }
+
+    public void setBarCodeOldQuantity(String barCodeOldQuantity) 
+    {
+        this.barCodeOldQuantity = barCodeOldQuantity;
+    }
+
+    public String getBarCodeOldQuantity() 
+    {
+        return barCodeOldQuantity;
+    }
+
+    public void setBarCodeQuantity(String barCodeQuantity) 
+    {
+        this.barCodeQuantity = barCodeQuantity;
+    }
+
+    public String getBarCodeQuantity() 
+    {
+        return barCodeQuantity;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("whGuid", getWhGuid())
+            .append("stockId", getStockId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("trayCode", getTrayCode())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("printDate", getPrintDate())
+            .append("lotNo", getLotNo())
+            .append("oldStatus", getOldStatus())
+            .append("currStatus", getCurrStatus())
+            .append("method", getMethod())
+            .append("warehouseId", getWarehouseId())
+            .append("createTime", getCreateTime())
+            .append("stockDetailId", getStockDetailId())
+            .append("operatingTarget", getOperatingTarget())
+            .append("barCodeOldQuantity", getBarCodeOldQuantity())
+            .append("barCodeQuantity", getBarCodeQuantity())
+            .append("productGuid", getProductGuid())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/mapper/BasStockFreezeRecordMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.stock.freeze.mapper;
+
+import java.util.List;
+import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
+
+/**
+ * 库存冻结记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface BasStockFreezeRecordMapper 
+{
+    /**
+     * 查询库存冻结记录
+     * 
+     * @param whGuid 库存冻结记录主键
+     * @return 库存冻结记录
+     */
+    public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid);
+
+    /**
+     * 查询库存冻结记录列表
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 库存冻结记录集合
+     */
+    public List<BasStockFreezeRecord> selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 新增库存冻结记录
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 修改库存冻结记录
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 删除库存冻结记录
+     * 
+     * @param whGuid 库存冻结记录主键
+     * @return 结果
+     */
+    public int deleteBasStockFreezeRecordByWhGuid(String whGuid);
+
+    /**
+     * 批量删除库存冻结记录
+     * 
+     * @param whGuids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids);
+}

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/IBasStockFreezeRecordService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.stock.freeze.service;
+
+import java.util.List;
+import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
+
+/**
+ * 库存冻结记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface IBasStockFreezeRecordService 
+{
+    /**
+     * 查询库存冻结记录
+     * 
+     * @param whGuid 库存冻结记录主键
+     * @return 库存冻结记录
+     */
+    public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid);
+
+    /**
+     * 查询库存冻结记录列表
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 库存冻结记录集合
+     */
+    public List<BasStockFreezeRecord> selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 新增库存冻结记录
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 修改库存冻结记录
+     * 
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord);
+
+    /**
+     * 批量删除库存冻结记录
+     * 
+     * @param whGuids 需要删除的库存冻结记录主键集合
+     * @return 结果
+     */
+    public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids);
+
+    /**
+     * 删除库存冻结记录信息
+     * 
+     * @param whGuid 库存冻结记录主键
+     * @return 结果
+     */
+    public int deleteBasStockFreezeRecordByWhGuid(String whGuid);
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.stock.freeze.service.impl;
+
+import java.util.List;
+
+import cn.hutool.core.util.IdUtil;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper;
+import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
+import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService;
+
+/**
+ * 库存冻结记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class BasStockFreezeRecordServiceImpl implements IBasStockFreezeRecordService
+{
+    @Autowired
+    private BasStockFreezeRecordMapper basStockFreezeRecordMapper;
+
+    /**
+     * 查询库存冻结记录
+     *
+     * @param whGuid 库存冻结记录主键
+     * @return 库存冻结记录
+     */
+    @Override
+    public BasStockFreezeRecord selectBasStockFreezeRecordByWhGuid(String whGuid)
+    {
+        return basStockFreezeRecordMapper.selectBasStockFreezeRecordByWhGuid(whGuid);
+    }
+
+    /**
+     * 查询库存冻结记录列表
+     *
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 库存冻结记录
+     */
+    @Override
+    public List<BasStockFreezeRecord> selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord)
+    {
+        return basStockFreezeRecordMapper.selectBasStockFreezeRecordList(basStockFreezeRecord);
+    }
+
+    /**
+     * 新增库存冻结记录
+     *
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    @Override
+    public int insertBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord)
+    {
+        basStockFreezeRecord.setCreateTime(DateUtils.getNowDate());
+        basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID());
+        return basStockFreezeRecordMapper.insertBasStockFreezeRecord(basStockFreezeRecord);
+    }
+
+    /**
+     * 修改库存冻结记录
+     *
+     * @param basStockFreezeRecord 库存冻结记录
+     * @return 结果
+     */
+    @Override
+    public int updateBasStockFreezeRecord(BasStockFreezeRecord basStockFreezeRecord)
+    {
+        return basStockFreezeRecordMapper.updateBasStockFreezeRecord(basStockFreezeRecord);
+    }
+
+    /**
+     * 批量删除库存冻结记录
+     *
+     * @param whGuids 需要删除的库存冻结记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockFreezeRecordByWhGuids(String[] whGuids)
+    {
+        return basStockFreezeRecordMapper.deleteBasStockFreezeRecordByWhGuids(whGuids);
+    }
+
+    /**
+     * 删除库存冻结记录信息
+     *
+     * @param whGuid 库存冻结记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockFreezeRecordByWhGuid(String whGuid)
+    {
+        return basStockFreezeRecordMapper.deleteBasStockFreezeRecordByWhGuid(whGuid);
+    }
+}

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

@@ -6,6 +6,8 @@ import java.util.List;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
+import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService;
 import com.ruoyi.stock.maintain.domain.BasStockMaintainRecord;
 import com.ruoyi.stock.maintain.service.IBasStockMaintainRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,8 @@ public class BasStockServiceImpl implements IBasStockService
     private BasStockMapper basStockMapper;
     @Autowired
     private IBasStockMaintainRecordService basStockMaintainRecordService;
+    @Autowired
+    private IBasStockFreezeRecordService basStockFreezeRecordService;
 
     /**
      * 查询库存信息
@@ -94,9 +98,29 @@ public class BasStockServiceImpl implements IBasStockService
     {
         BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
         insertMaintainRecord(oldBasStock,basStock,"2");
+        insertFreezeRecord(oldBasStock,basStock);
         return basStockMapper.updateBasStock(basStock);
     }
 
+    private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) {
+        if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){
+            BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord();
+            basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID());
+            basStockFreezeRecord.setStockId(basStock.getStockId());
+            basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId());
+            basStockFreezeRecord.setLotNo(basStock.getLotNo());
+            basStockFreezeRecord.setTrayCode(basStock.getTrayCode());
+            basStockFreezeRecord.setProductGuid(basStock.getProductGuid());
+            basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+            basStockFreezeRecord.setCreateTime(new Date());
+            basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus());
+            basStockFreezeRecord.setCurrStatus(basStock.getStockStatus());
+            basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId());
+            basStockFreezeRecord.setMethod("0");
+            basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord);
+        }
+    }
+
     /**
      * 批量删除库存信息
      *