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

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.in.stockindetailfinish.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.in.stockindetailfinish.domain.InStockinDetailFinish;
+import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 历史入库单据子信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/in/stockinDetailFinish")
+public class InStockinDetailFinishController extends BaseController
+{
+    @Autowired
+    private IInStockinDetailFinishService inStockinDetailFinishService;
+
+    /**
+     * 查询历史入库单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InStockinDetailFinish inStockinDetailFinish)
+    {
+        startPage();
+        List<InStockinDetailFinish> list = inStockinDetailFinishService.selectInStockinDetailFinishList(inStockinDetailFinish);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出历史入库单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:export')")
+    @Log(title = "历史入库单据子信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InStockinDetailFinish inStockinDetailFinish)
+    {
+        List<InStockinDetailFinish> list = inStockinDetailFinishService.selectInStockinDetailFinishList(inStockinDetailFinish);
+        ExcelUtil<InStockinDetailFinish> util = new ExcelUtil<InStockinDetailFinish>(InStockinDetailFinish.class);
+        util.exportExcel(response, list, "历史入库单据子信息数据");
+    }
+
+    /**
+     * 获取历史入库单据子信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:query')")
+    @GetMapping(value = "/{stockinDetailId}")
+    public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId)
+    {
+        return success(inStockinDetailFinishService.selectInStockinDetailFinishByStockinDetailId(stockinDetailId));
+    }
+
+    /**
+     * 新增历史入库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:add')")
+    @Log(title = "历史入库单据子信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InStockinDetailFinish inStockinDetailFinish)
+    {
+        return toAjax(inStockinDetailFinishService.insertInStockinDetailFinish(inStockinDetailFinish));
+    }
+
+    /**
+     * 修改历史入库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:edit')")
+    @Log(title = "历史入库单据子信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InStockinDetailFinish inStockinDetailFinish)
+    {
+        return toAjax(inStockinDetailFinishService.updateInStockinDetailFinish(inStockinDetailFinish));
+    }
+
+    /**
+     * 删除历史入库单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinDetailFinish:remove')")
+    @Log(title = "历史入库单据子信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinDetailIds}")
+    public AjaxResult remove(@PathVariable String[] stockinDetailIds)
+    {
+        return toAjax(inStockinDetailFinishService.deleteInStockinDetailFinishByStockinDetailIds(stockinDetailIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java

@@ -0,0 +1,458 @@
+package com.ruoyi.in.stockindetailfinish.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;
+
+/**
+ * 历史入库单据子信息对象 in_stockin_detail_finish
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class InStockinDetailFinish extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 子单ID */
+    private String stockinDetailId;
+
+    /** 主单GUID */
+    @Excel(name = "主单GUID")
+    private String stockinGuid;
+
+    /** 主单ID */
+    @Excel(name = "主单ID")
+    private String stockinId;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 物料ID */
+    @Excel(name = "物料ID")
+    private String productGuid;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 计划数量 */
+    @Excel(name = "计划数量")
+    private String quantity;
+
+    /** 计划数量(箱) */
+    @Excel(name = "计划数量(箱)")
+    private String quantityX;
+
+    /** 计划数量(件) */
+    @Excel(name = "计划数量(件)")
+    private String quantityJ;
+
+    /** 参考单价 */
+    @Excel(name = "参考单价")
+    private String price;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String cargoNo;
+
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private String assignNum;
+
+    /** 实际数量(箱) */
+    @Excel(name = "实际数量(箱)")
+    private String assignNumX;
+
+    /** 实际数量(件) */
+    @Excel(name = "实际数量(件)")
+    private String assignNumJ;
+
+    /** 入库日期 */
+    @Excel(name = "入库日期")
+    private String printDate;
+
+    /** 单据状态 */
+    @Excel(name = "单据状态")
+    private String stockStatus;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierId;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    private String customerId;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spare5;
+
+    /** 备用字段6 */
+    @Excel(name = "备用字段6")
+    private String spare6;
+
+    /** 扫码数量 */
+    @Excel(name = "扫码数量")
+    private String scanNum;
+
+    /** 扫码数量(箱) */
+    @Excel(name = "扫码数量(箱)")
+    private String scanNumX;
+
+    /** 扫码数量(件) */
+    @Excel(name = "扫码数量(件)")
+    private String scanNumJ;
+
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setQuantityX(String quantityX) 
+    {
+        this.quantityX = quantityX;
+    }
+
+    public String getQuantityX() 
+    {
+        return quantityX;
+    }
+
+    public void setQuantityJ(String quantityJ) 
+    {
+        this.quantityJ = quantityJ;
+    }
+
+    public String getQuantityJ() 
+    {
+        return quantityJ;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setCargoNo(String cargoNo) 
+    {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getCargoNo() 
+    {
+        return cargoNo;
+    }
+
+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAssignNumX(String assignNumX) 
+    {
+        this.assignNumX = assignNumX;
+    }
+
+    public String getAssignNumX() 
+    {
+        return assignNumX;
+    }
+
+    public void setAssignNumJ(String assignNumJ) 
+    {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public String getAssignNumJ() 
+    {
+        return assignNumJ;
+    }
+
+    public void setPrintDate(String printDate) 
+    {
+        this.printDate = printDate;
+    }
+
+    public String getPrintDate() 
+    {
+        return printDate;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierId() 
+    {
+        return supplierId;
+    }
+
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNum() 
+    {
+        return scanNum;
+    }
+
+    public void setScanNumX(String scanNumX) 
+    {
+        this.scanNumX = scanNumX;
+    }
+
+    public String getScanNumX() 
+    {
+        return scanNumX;
+    }
+
+    public void setScanNumJ(String scanNumJ) 
+    {
+        this.scanNumJ = scanNumJ;
+    }
+
+    public String getScanNumJ() 
+    {
+        return scanNumJ;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("lotNo", getLotNo())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("quantityX", getQuantityX())
+            .append("quantityJ", getQuantityJ())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("remark", getRemark())
+            .append("assignNum", getAssignNum())
+            .append("assignNumX", getAssignNumX())
+            .append("assignNumJ", getAssignNumJ())
+            .append("printDate", getPrintDate())
+            .append("stockStatus", getStockStatus())
+            .append("supplierId", getSupplierId())
+            .append("customerId", getCustomerId())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("scanNum", getScanNum())
+            .append("scanNumX", getScanNumX())
+            .append("scanNumJ", getScanNumJ())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.in.stockindetailfinish.mapper;
+
+import java.util.List;
+import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
+
+/**
+ * 历史入库单据子信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface InStockinDetailFinishMapper 
+{
+    /**
+     * 查询历史入库单据子信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 历史入库单据子信息
+     */
+    public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 查询历史入库单据子信息列表
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 历史入库单据子信息集合
+     */
+    public List<InStockinDetailFinish> selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 新增历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 修改历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 删除历史入库单据子信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 结果
+     */
+    public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 批量删除历史入库单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.in.stockindetailfinish.service;
+
+import java.util.List;
+import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
+
+/**
+ * 历史入库单据子信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface IInStockinDetailFinishService 
+{
+    /**
+     * 查询历史入库单据子信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 历史入库单据子信息
+     */
+    public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 查询历史入库单据子信息列表
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 历史入库单据子信息集合
+     */
+    public List<InStockinDetailFinish> selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 新增历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 修改历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish);
+
+    /**
+     * 批量删除历史入库单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的历史入库单据子信息主键集合
+     * @return 结果
+     */
+    public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+
+    /**
+     * 删除历史入库单据子信息信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 结果
+     */
+    public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.in.stockindetailfinish.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper;
+import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
+import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
+
+/**
+ * 历史入库单据子信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService 
+{
+    @Autowired
+    private InStockinDetailFinishMapper inStockinDetailFinishMapper;
+
+    /**
+     * 查询历史入库单据子信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 历史入库单据子信息
+     */
+    @Override
+    public InStockinDetailFinish selectInStockinDetailFinishByStockinDetailId(String stockinDetailId)
+    {
+        return inStockinDetailFinishMapper.selectInStockinDetailFinishByStockinDetailId(stockinDetailId);
+    }
+
+    /**
+     * 查询历史入库单据子信息列表
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 历史入库单据子信息
+     */
+    @Override
+    public List<InStockinDetailFinish> selectInStockinDetailFinishList(InStockinDetailFinish inStockinDetailFinish)
+    {
+        return inStockinDetailFinishMapper.selectInStockinDetailFinishList(inStockinDetailFinish);
+    }
+
+    /**
+     * 新增历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    @Override
+    public int insertInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish)
+    {
+        return inStockinDetailFinishMapper.insertInStockinDetailFinish(inStockinDetailFinish);
+    }
+
+    /**
+     * 修改历史入库单据子信息
+     * 
+     * @param inStockinDetailFinish 历史入库单据子信息
+     * @return 结果
+     */
+    @Override
+    public int updateInStockinDetailFinish(InStockinDetailFinish inStockinDetailFinish)
+    {
+        return inStockinDetailFinishMapper.updateInStockinDetailFinish(inStockinDetailFinish);
+    }
+
+    /**
+     * 批量删除历史入库单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的历史入库单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds)
+    {
+        return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailIds(stockinDetailIds);
+    }
+
+    /**
+     * 删除历史入库单据子信息信息
+     * 
+     * @param stockinDetailId 历史入库单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId)
+    {
+        return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailId(stockinDetailId);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.in.stockinfinish.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.in.stockinfinish.domain.InStockinFinish;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 历史入库单据主信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/in/stockinFinish")
+public class InStockinFinishController extends BaseController
+{
+    @Autowired
+    private IInStockinFinishService inStockinFinishService;
+
+    /**
+     * 查询历史入库单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InStockinFinish inStockinFinish)
+    {
+        startPage();
+        List<InStockinFinish> list = inStockinFinishService.selectInStockinFinishList(inStockinFinish);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出历史入库单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:export')")
+    @Log(title = "历史入库单据主信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InStockinFinish inStockinFinish)
+    {
+        List<InStockinFinish> list = inStockinFinishService.selectInStockinFinishList(inStockinFinish);
+        ExcelUtil<InStockinFinish> util = new ExcelUtil<InStockinFinish>(InStockinFinish.class);
+        util.exportExcel(response, list, "历史入库单据主信息数据");
+    }
+
+    /**
+     * 获取历史入库单据主信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:query')")
+    @GetMapping(value = "/{stockinGuid}")
+    public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
+    {
+        return success(inStockinFinishService.selectInStockinFinishByStockinGuid(stockinGuid));
+    }
+
+    /**
+     * 新增历史入库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:add')")
+    @Log(title = "历史入库单据主信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InStockinFinish inStockinFinish)
+    {
+        return toAjax(inStockinFinishService.insertInStockinFinish(inStockinFinish));
+    }
+
+    /**
+     * 修改历史入库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:edit')")
+    @Log(title = "历史入库单据主信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InStockinFinish inStockinFinish)
+    {
+        return toAjax(inStockinFinishService.updateInStockinFinish(inStockinFinish));
+    }
+
+    /**
+     * 删除历史入库单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockinFinish:remove')")
+    @Log(title = "历史入库单据主信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinGuids}")
+    public AjaxResult remove(@PathVariable String[] stockinGuids)
+    {
+        return toAjax(inStockinFinishService.deleteInStockinFinishByStockinGuids(stockinGuids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java

@@ -0,0 +1,307 @@
+package com.ruoyi.in.stockinfinish.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;
+
+/**
+ * 历史入库单据主信息对象 in_stockin_finish
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class InStockinFinish extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** GUID */
+    private String stockinGuid;
+
+    /** 入库订单ID */
+    @Excel(name = "入库订单ID")
+    private String stockinId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型")
+    private String inType;
+
+    /** 建立时间 */
+    @Excel(name = "建立时间")
+    private String createDate;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createManId;
+
+    /** 单据状态 */
+    @Excel(name = "单据状态")
+    private String status;
+
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /**  完成日期 */
+    @Excel(name = " 完成日期")
+    private String finishDate;
+
+    /** erp单号 */
+    @Excel(name = "erp单号")
+    private String erpBill;
+
+    /** 单据来源 */
+    @Excel(name = "单据来源")
+    private String stockSource;
+
+    /** 部门编码 */
+    @Excel(name = "部门编码")
+    private String departmentNo;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    private String customerNo;
+
+    /** 班组编码 */
+    @Excel(name = "班组编码")
+    private String classNo;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierNo;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spare5;
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setInType(String inType) 
+    {
+        this.inType = inType;
+    }
+
+    public String getInType() 
+    {
+        return inType;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setFinishDate(String finishDate) 
+    {
+        this.finishDate = finishDate;
+    }
+
+    public String getFinishDate() 
+    {
+        return finishDate;
+    }
+
+    public void setErpBill(String erpBill) 
+    {
+        this.erpBill = erpBill;
+    }
+
+    public String getErpBill() 
+    {
+        return erpBill;
+    }
+
+    public void setStockSource(String stockSource) 
+    {
+        this.stockSource = stockSource;
+    }
+
+    public String getStockSource() 
+    {
+        return stockSource;
+    }
+
+    public void setDepartmentNo(String departmentNo) 
+    {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getDepartmentNo() 
+    {
+        return departmentNo;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setClassNo(String classNo) 
+    {
+        this.classNo = classNo;
+    }
+
+    public String getClassNo() 
+    {
+        return classNo;
+    }
+
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSupplierNo() 
+    {
+        return supplierNo;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("createDate", getCreateDate())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("warehouseId", getWarehouseId())
+            .append("finishDate", getFinishDate())
+            .append("erpBill", getErpBill())
+            .append("stockSource", getStockSource())
+            .append("departmentNo", getDepartmentNo())
+            .append("customerNo", getCustomerNo())
+            .append("classNo", getClassNo())
+            .append("supplierNo", getSupplierNo())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.in.stockinfinish.mapper;
+
+import java.util.List;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+
+/**
+ * 历史入库单据主信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface InStockinFinishMapper 
+{
+    /**
+     * 查询历史入库单据主信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 历史入库单据主信息
+     */
+    public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 查询历史入库单据主信息列表
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 历史入库单据主信息集合
+     */
+    public List<InStockinFinish> selectInStockinFinishList(InStockinFinish inStockinFinish);
+
+    /**
+     * 新增历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    public int insertInStockinFinish(InStockinFinish inStockinFinish);
+
+    /**
+     * 修改历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    public int updateInStockinFinish(InStockinFinish inStockinFinish);
+
+    /**
+     * 删除历史入库单据主信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 结果
+     */
+    public int deleteInStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 批量删除历史入库单据主信息
+     * 
+     * @param stockinGuids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInStockinFinishByStockinGuids(String[] stockinGuids);
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.in.stockinfinish.service;
+
+import java.util.List;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+
+/**
+ * 历史入库单据主信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface IInStockinFinishService 
+{
+    /**
+     * 查询历史入库单据主信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 历史入库单据主信息
+     */
+    public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 查询历史入库单据主信息列表
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 历史入库单据主信息集合
+     */
+    public List<InStockinFinish> selectInStockinFinishList(InStockinFinish inStockinFinish);
+
+    /**
+     * 新增历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    public int insertInStockinFinish(InStockinFinish inStockinFinish);
+
+    /**
+     * 修改历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    public int updateInStockinFinish(InStockinFinish inStockinFinish);
+
+    /**
+     * 批量删除历史入库单据主信息
+     * 
+     * @param stockinGuids 需要删除的历史入库单据主信息主键集合
+     * @return 结果
+     */
+    public int deleteInStockinFinishByStockinGuids(String[] stockinGuids);
+
+    /**
+     * 删除历史入库单据主信息信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 结果
+     */
+    public int deleteInStockinFinishByStockinGuid(String stockinGuid);
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.in.stockinfinish.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
+
+/**
+ * 历史入库单据主信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class InStockinFinishServiceImpl implements IInStockinFinishService 
+{
+    @Autowired
+    private InStockinFinishMapper inStockinFinishMapper;
+
+    /**
+     * 查询历史入库单据主信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 历史入库单据主信息
+     */
+    @Override
+    public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid)
+    {
+        return inStockinFinishMapper.selectInStockinFinishByStockinGuid(stockinGuid);
+    }
+
+    /**
+     * 查询历史入库单据主信息列表
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 历史入库单据主信息
+     */
+    @Override
+    public List<InStockinFinish> selectInStockinFinishList(InStockinFinish inStockinFinish)
+    {
+        return inStockinFinishMapper.selectInStockinFinishList(inStockinFinish);
+    }
+
+    /**
+     * 新增历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    @Override
+    public int insertInStockinFinish(InStockinFinish inStockinFinish)
+    {
+        return inStockinFinishMapper.insertInStockinFinish(inStockinFinish);
+    }
+
+    /**
+     * 修改历史入库单据主信息
+     * 
+     * @param inStockinFinish 历史入库单据主信息
+     * @return 结果
+     */
+    @Override
+    public int updateInStockinFinish(InStockinFinish inStockinFinish)
+    {
+        return inStockinFinishMapper.updateInStockinFinish(inStockinFinish);
+    }
+
+    /**
+     * 批量删除历史入库单据主信息
+     * 
+     * @param stockinGuids 需要删除的历史入库单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInStockinFinishByStockinGuids(String[] stockinGuids)
+    {
+        return inStockinFinishMapper.deleteInStockinFinishByStockinGuids(stockinGuids);
+    }
+
+    /**
+     * 删除历史入库单据主信息信息
+     * 
+     * @param stockinGuid 历史入库单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInStockinFinishByStockinGuid(String stockinGuid)
+    {
+        return inStockinFinishMapper.deleteInStockinFinishByStockinGuid(stockinGuid);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/controller/ReceiveStockinDetailFinishController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.receive.stockindetailfinish.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.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
+import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 历史接收单据子信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/receive/stockinDetailFinish")
+public class ReceiveStockinDetailFinishController extends BaseController
+{
+    @Autowired
+    private IReceiveStockinDetailFinishService receiveStockinDetailFinishService;
+
+    /**
+     * 查询历史接收单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        startPage();
+        List<ReceiveStockinDetailFinish> list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出历史接收单据子信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:export')")
+    @Log(title = "历史接收单据子信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        List<ReceiveStockinDetailFinish> list = receiveStockinDetailFinishService.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
+        ExcelUtil<ReceiveStockinDetailFinish> util = new ExcelUtil<ReceiveStockinDetailFinish>(ReceiveStockinDetailFinish.class);
+        util.exportExcel(response, list, "历史接收单据子信息数据");
+    }
+
+    /**
+     * 获取历史接收单据子信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:query')")
+    @GetMapping(value = "/{stockinDetailId}")
+    public AjaxResult getInfo(@PathVariable("stockinDetailId") String stockinDetailId)
+    {
+        return success(receiveStockinDetailFinishService.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId));
+    }
+
+    /**
+     * 新增历史接收单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:add')")
+    @Log(title = "历史接收单据子信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        return toAjax(receiveStockinDetailFinishService.insertReceiveStockinDetailFinish(receiveStockinDetailFinish));
+    }
+
+    /**
+     * 修改历史接收单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:edit')")
+    @Log(title = "历史接收单据子信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        return toAjax(receiveStockinDetailFinishService.updateReceiveStockinDetailFinish(receiveStockinDetailFinish));
+    }
+
+    /**
+     * 删除历史接收单据子信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinDetailFinish:remove')")
+    @Log(title = "历史接收单据子信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinDetailIds}")
+    public AjaxResult remove(@PathVariable String[] stockinDetailIds)
+    {
+        return toAjax(receiveStockinDetailFinishService.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java

@@ -0,0 +1,413 @@
+package com.ruoyi.receive.stockindetailfinish.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;
+
+/**
+ * 历史接收单据子信息对象 receive_stockin_detail_finish
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class ReceiveStockinDetailFinish extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 子单ID */
+    private String stockinDetailId;
+
+    /** 主单GUID */
+    @Excel(name = "主单GUID")
+    private String stockinGuid;
+
+    /** 主单ID */
+    @Excel(name = "主单ID")
+    private String stockinId;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 物料ID */
+    @Excel(name = "物料ID")
+    private String productGuid;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 计划数量 */
+    @Excel(name = "计划数量")
+    private String quantity;
+
+    /** 计划数量(箱) */
+    @Excel(name = "计划数量(箱)")
+    private String quantityX;
+
+    /** 计划数量(件) */
+    @Excel(name = "计划数量(件)")
+    private String quantityJ;
+
+    /** 参考单价 */
+    @Excel(name = "参考单价")
+    private String price;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String cargoNo;
+
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private String assignNum;
+
+    /** 实际数量(箱) */
+    @Excel(name = "实际数量(箱)")
+    private String assignNumX;
+
+    /** 实际数量(件) */
+    @Excel(name = "实际数量(件)")
+    private String assignNumJ;
+
+    /** 入库日期 */
+    @Excel(name = "入库日期")
+    private String printDate;
+
+    /** 单据状态 */
+    @Excel(name = "单据状态")
+    private String stockStatus;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierId;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    private String customerId;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spare5;
+
+    /** 备用字段6 */
+    @Excel(name = "备用字段6")
+    private String spare6;
+
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setQuantityX(String quantityX) 
+    {
+        this.quantityX = quantityX;
+    }
+
+    public String getQuantityX() 
+    {
+        return quantityX;
+    }
+
+    public void setQuantityJ(String quantityJ) 
+    {
+        this.quantityJ = quantityJ;
+    }
+
+    public String getQuantityJ() 
+    {
+        return quantityJ;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setCargoNo(String cargoNo) 
+    {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getCargoNo() 
+    {
+        return cargoNo;
+    }
+
+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAssignNumX(String assignNumX) 
+    {
+        this.assignNumX = assignNumX;
+    }
+
+    public String getAssignNumX() 
+    {
+        return assignNumX;
+    }
+
+    public void setAssignNumJ(String assignNumJ) 
+    {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public String getAssignNumJ() 
+    {
+        return assignNumJ;
+    }
+
+    public void setPrintDate(String printDate) 
+    {
+        this.printDate = printDate;
+    }
+
+    public String getPrintDate() 
+    {
+        return printDate;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierId() 
+    {
+        return supplierId;
+    }
+
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("lotNo", getLotNo())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("quantityX", getQuantityX())
+            .append("quantityJ", getQuantityJ())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("remark", getRemark())
+            .append("assignNum", getAssignNum())
+            .append("assignNumX", getAssignNumX())
+            .append("assignNumJ", getAssignNumJ())
+            .append("printDate", getPrintDate())
+            .append("stockStatus", getStockStatus())
+            .append("supplierId", getSupplierId())
+            .append("customerId", getCustomerId())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.receive.stockindetailfinish.mapper;
+
+import java.util.List;
+import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
+
+/**
+ * 历史接收单据子信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface ReceiveStockinDetailFinishMapper 
+{
+    /**
+     * 查询历史接收单据子信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 历史接收单据子信息
+     */
+    public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 查询历史接收单据子信息列表
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 历史接收单据子信息集合
+     */
+    public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 新增历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 修改历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 删除历史接收单据子信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 结果
+     */
+    public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 批量删除历史接收单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.receive.stockindetailfinish.service;
+
+import java.util.List;
+import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
+
+/**
+ * 历史接收单据子信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface IReceiveStockinDetailFinishService 
+{
+    /**
+     * 查询历史接收单据子信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 历史接收单据子信息
+     */
+    public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 查询历史接收单据子信息列表
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 历史接收单据子信息集合
+     */
+    public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 新增历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 修改历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish);
+
+    /**
+     * 批量删除历史接收单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的历史接收单据子信息主键集合
+     * @return 结果
+     */
+    public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+
+    /**
+     * 删除历史接收单据子信息信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 结果
+     */
+    public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.receive.stockindetailfinish.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper;
+import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
+import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
+
+/**
+ * 历史接收单据子信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService 
+{
+    @Autowired
+    private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper;
+
+    /**
+     * 查询历史接收单据子信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 历史接收单据子信息
+     */
+    @Override
+    public ReceiveStockinDetailFinish selectReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId)
+    {
+        return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
+    }
+
+    /**
+     * 查询历史接收单据子信息列表
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 历史接收单据子信息
+     */
+    @Override
+    public List<ReceiveStockinDetailFinish> selectReceiveStockinDetailFinishList(ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        return receiveStockinDetailFinishMapper.selectReceiveStockinDetailFinishList(receiveStockinDetailFinish);
+    }
+
+    /**
+     * 新增历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    @Override
+    public int insertReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        return receiveStockinDetailFinishMapper.insertReceiveStockinDetailFinish(receiveStockinDetailFinish);
+    }
+
+    /**
+     * 修改历史接收单据子信息
+     * 
+     * @param receiveStockinDetailFinish 历史接收单据子信息
+     * @return 结果
+     */
+    @Override
+    public int updateReceiveStockinDetailFinish(ReceiveStockinDetailFinish receiveStockinDetailFinish)
+    {
+        return receiveStockinDetailFinishMapper.updateReceiveStockinDetailFinish(receiveStockinDetailFinish);
+    }
+
+    /**
+     * 批量删除历史接收单据子信息
+     * 
+     * @param stockinDetailIds 需要删除的历史接收单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds)
+    {
+        return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailIds(stockinDetailIds);
+    }
+
+    /**
+     * 删除历史接收单据子信息信息
+     * 
+     * @param stockinDetailId 历史接收单据子信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId)
+    {
+        return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/controller/ReceiveStockinFinishController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.receive.stockinfinish.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.receive.stockinfinish.domain.ReceiveStockinFinish;
+import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 历史接收单据主信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/receive/stockinFinish")
+public class ReceiveStockinFinishController extends BaseController
+{
+    @Autowired
+    private IReceiveStockinFinishService receiveStockinFinishService;
+
+    /**
+     * 查询历史接收单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ReceiveStockinFinish receiveStockinFinish)
+    {
+        startPage();
+        List<ReceiveStockinFinish> list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出历史接收单据主信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:export')")
+    @Log(title = "历史接收单据主信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ReceiveStockinFinish receiveStockinFinish)
+    {
+        List<ReceiveStockinFinish> list = receiveStockinFinishService.selectReceiveStockinFinishList(receiveStockinFinish);
+        ExcelUtil<ReceiveStockinFinish> util = new ExcelUtil<ReceiveStockinFinish>(ReceiveStockinFinish.class);
+        util.exportExcel(response, list, "历史接收单据主信息数据");
+    }
+
+    /**
+     * 获取历史接收单据主信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:query')")
+    @GetMapping(value = "/{stockinGuid}")
+    public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
+    {
+        return success(receiveStockinFinishService.selectReceiveStockinFinishByStockinGuid(stockinGuid));
+    }
+
+    /**
+     * 新增历史接收单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:add')")
+    @Log(title = "历史接收单据主信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ReceiveStockinFinish receiveStockinFinish)
+    {
+        return toAjax(receiveStockinFinishService.insertReceiveStockinFinish(receiveStockinFinish));
+    }
+
+    /**
+     * 修改历史接收单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:edit')")
+    @Log(title = "历史接收单据主信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ReceiveStockinFinish receiveStockinFinish)
+    {
+        return toAjax(receiveStockinFinishService.updateReceiveStockinFinish(receiveStockinFinish));
+    }
+
+    /**
+     * 删除历史接收单据主信息
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockinFinish:remove')")
+    @Log(title = "历史接收单据主信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinGuids}")
+    public AjaxResult remove(@PathVariable String[] stockinGuids)
+    {
+        return toAjax(receiveStockinFinishService.deleteReceiveStockinFinishByStockinGuids(stockinGuids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/domain/ReceiveStockinFinish.java

@@ -0,0 +1,307 @@
+package com.ruoyi.receive.stockinfinish.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;
+
+/**
+ * 历史接收单据主信息对象 receive_stockin_finish
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class ReceiveStockinFinish extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** GUID */
+    private String stockinGuid;
+
+    /** 入库订单ID */
+    @Excel(name = "入库订单ID")
+    private String stockinId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型")
+    private String inType;
+
+    /** 建立时间 */
+    @Excel(name = "建立时间")
+    private String createDate;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createManId;
+
+    /** 单据状态 */
+    @Excel(name = "单据状态")
+    private String status;
+
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spare5;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spare4;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;
+
+    /**  完成日期 */
+    @Excel(name = " 完成日期")
+    private String finishDate;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
+
+    /** erp单号 */
+    @Excel(name = "erp单号")
+    private String erpBill;
+
+    /** 单据来源 */
+    @Excel(name = "单据来源")
+    private String stockSource;
+
+    /** 部门编码 */
+    @Excel(name = "部门编码")
+    private String departmentNo;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    private String customerNo;
+
+    /** 班组编码 */
+    @Excel(name = "班组编码")
+    private String classNo;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierNo;
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setInType(String inType) 
+    {
+        this.inType = inType;
+    }
+
+    public String getInType() 
+    {
+        return inType;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setFinishDate(String finishDate) 
+    {
+        this.finishDate = finishDate;
+    }
+
+    public String getFinishDate() 
+    {
+        return finishDate;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setErpBill(String erpBill) 
+    {
+        this.erpBill = erpBill;
+    }
+
+    public String getErpBill() 
+    {
+        return erpBill;
+    }
+
+    public void setStockSource(String stockSource) 
+    {
+        this.stockSource = stockSource;
+    }
+
+    public String getStockSource() 
+    {
+        return stockSource;
+    }
+
+    public void setDepartmentNo(String departmentNo) 
+    {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getDepartmentNo() 
+    {
+        return departmentNo;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setClassNo(String classNo) 
+    {
+        this.classNo = classNo;
+    }
+
+    public String getClassNo() 
+    {
+        return classNo;
+    }
+
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSupplierNo() 
+    {
+        return supplierNo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("createDate", getCreateDate())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("warehouseId", getWarehouseId())
+            .append("spare5", getSpare5())
+            .append("spare4", getSpare4())
+            .append("spare3", getSpare3())
+            .append("finishDate", getFinishDate())
+            .append("spare2", getSpare2())
+            .append("spare1", getSpare1())
+            .append("erpBill", getErpBill())
+            .append("stockSource", getStockSource())
+            .append("departmentNo", getDepartmentNo())
+            .append("customerNo", getCustomerNo())
+            .append("classNo", getClassNo())
+            .append("supplierNo", getSupplierNo())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.receive.stockinfinish.mapper;
+
+import java.util.List;
+import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
+
+/**
+ * 历史接收单据主信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface ReceiveStockinFinishMapper 
+{
+    /**
+     * 查询历史接收单据主信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 历史接收单据主信息
+     */
+    public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 查询历史接收单据主信息列表
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 历史接收单据主信息集合
+     */
+    public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 新增历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 修改历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 删除历史接收单据主信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 结果
+     */
+    public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 批量删除历史接收单据主信息
+     * 
+     * @param stockinGuids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.receive.stockinfinish.service;
+
+import java.util.List;
+import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
+
+/**
+ * 历史接收单据主信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface IReceiveStockinFinishService 
+{
+    /**
+     * 查询历史接收单据主信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 历史接收单据主信息
+     */
+    public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid);
+
+    /**
+     * 查询历史接收单据主信息列表
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 历史接收单据主信息集合
+     */
+    public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 新增历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 修改历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish);
+
+    /**
+     * 批量删除历史接收单据主信息
+     * 
+     * @param stockinGuids 需要删除的历史接收单据主信息主键集合
+     * @return 结果
+     */
+    public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
+
+    /**
+     * 删除历史接收单据主信息信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 结果
+     */
+    public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.receive.stockinfinish.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper;
+import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
+import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
+
+/**
+ * 历史接收单据主信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService 
+{
+    @Autowired
+    private ReceiveStockinFinishMapper receiveStockinFinishMapper;
+
+    /**
+     * 查询历史接收单据主信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 历史接收单据主信息
+     */
+    @Override
+    public ReceiveStockinFinish selectReceiveStockinFinishByStockinGuid(String stockinGuid)
+    {
+        return receiveStockinFinishMapper.selectReceiveStockinFinishByStockinGuid(stockinGuid);
+    }
+
+    /**
+     * 查询历史接收单据主信息列表
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 历史接收单据主信息
+     */
+    @Override
+    public List<ReceiveStockinFinish> selectReceiveStockinFinishList(ReceiveStockinFinish receiveStockinFinish)
+    {
+        return receiveStockinFinishMapper.selectReceiveStockinFinishList(receiveStockinFinish);
+    }
+
+    /**
+     * 新增历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    @Override
+    public int insertReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish)
+    {
+        return receiveStockinFinishMapper.insertReceiveStockinFinish(receiveStockinFinish);
+    }
+
+    /**
+     * 修改历史接收单据主信息
+     * 
+     * @param receiveStockinFinish 历史接收单据主信息
+     * @return 结果
+     */
+    @Override
+    public int updateReceiveStockinFinish(ReceiveStockinFinish receiveStockinFinish)
+    {
+        return receiveStockinFinishMapper.updateReceiveStockinFinish(receiveStockinFinish);
+    }
+
+    /**
+     * 批量删除历史接收单据主信息
+     * 
+     * @param stockinGuids 需要删除的历史接收单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids)
+    {
+        return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuids(stockinGuids);
+    }
+
+    /**
+     * 删除历史接收单据主信息信息
+     * 
+     * @param stockinGuid 历史接收单据主信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid)
+    {
+        return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid);
+    }
+}

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);
+        }
+    }
+
     /**
      * 批量删除库存信息
      *

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper">
+    
+    <resultMap type="InStockinDetailFinish" id="InStockinDetailFinishResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+    </resultMap>
+
+    <sql id="selectInStockinDetailFinishVo">
+        select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail_finish
+    </sql>
+
+    <select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
+        <include refid="selectInStockinDetailFinishVo"/>
+        <where>  
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
+            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
+        </where>
+    </select>
+    
+    <select id="selectInStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="InStockinDetailFinishResult">
+        <include refid="selectInStockinDetailFinishVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+
+    <insert id="insertInStockinDetailFinish" parameterType="InStockinDetailFinish">
+        insert into in_stockin_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInStockinDetailFinish" parameterType="InStockinDetailFinish">
+        update in_stockin_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteInStockinDetailFinishByStockinDetailId" parameterType="String">
+        delete from in_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteInStockinDetailFinishByStockinDetailIds" parameterType="String">
+        delete from in_stockin_detail_finish where stockin_detail_id in 
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper">
+    
+    <resultMap type="InStockinFinish" id="InStockinFinishResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+    </resultMap>
+
+    <sql id="selectInStockinFinishVo">
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from in_stockin_finish
+    </sql>
+
+    <select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        <where>  
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+        </where>
+    </select>
+    
+    <select id="selectInStockinFinishByStockinGuid" parameterType="String" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        where stockin_guid = #{stockinGuid}
+    </select>
+
+    <insert id="insertInStockinFinish" parameterType="InStockinFinish">
+        insert into in_stockin_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInStockinFinish" parameterType="InStockinFinish">
+        update in_stockin_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteInStockinFinishByStockinGuid" parameterType="String">
+        delete from in_stockin_finish where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteInStockinFinishByStockinGuids" parameterType="String">
+        delete from in_stockin_finish where stockin_guid in 
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper">
+    
+    <resultMap type="ReceiveStockinDetailFinish" id="ReceiveStockinDetailFinishResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+    </resultMap>
+
+    <sql id="selectReceiveStockinDetailFinishVo">
+        select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish
+    </sql>
+
+    <select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
+        <include refid="selectReceiveStockinDetailFinishVo"/>
+        <where>  
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
+            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+        </where>
+    </select>
+    
+    <select id="selectReceiveStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailFinishResult">
+        <include refid="selectReceiveStockinDetailFinishVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+
+    <insert id="insertReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
+        insert into receive_stockin_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
+        update receive_stockin_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteReceiveStockinDetailFinishByStockinDetailId" parameterType="String">
+        delete from receive_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteReceiveStockinDetailFinishByStockinDetailIds" parameterType="String">
+        delete from receive_stockin_detail_finish where stockin_detail_id in 
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper">
+    
+    <resultMap type="ReceiveStockinFinish" id="ReceiveStockinFinishResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+    </resultMap>
+
+    <sql id="selectReceiveStockinFinishVo">
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin_finish
+    </sql>
+
+    <select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
+        <include refid="selectReceiveStockinFinishVo"/>
+        <where>  
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectReceiveStockinFinishByStockinGuid" parameterType="String" resultMap="ReceiveStockinFinishResult">
+        <include refid="selectReceiveStockinFinishVo"/>
+        where stockin_guid = #{stockinGuid}
+    </select>
+
+    <insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">
+        insert into receive_stockin_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReceiveStockinFinish" parameterType="ReceiveStockinFinish">
+        update receive_stockin_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteReceiveStockinFinishByStockinGuid" parameterType="String">
+        delete from receive_stockin_finish where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteReceiveStockinFinishByStockinGuids" parameterType="String">
+        delete from receive_stockin_finish where stockin_guid in 
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper">
+    
+    <resultMap type="BasStockFreezeRecord" id="BasStockFreezeRecordResult">
+        <result property="whGuid"    column="wh_guid"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="oldStatus"    column="old_status"    />
+        <result property="currStatus"    column="curr_status"    />
+        <result property="method"    column="method"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="stockDetailId"    column="stock_detail_id"    />
+        <result property="operatingTarget"    column="operating_target"    />
+        <result property="barCodeOldQuantity"    column="bar_code_old_quantity"    />
+        <result property="barCodeQuantity"    column="bar_code_quantity"    />
+        <result property="productGuid"    column="product_guid"    />
+    </resultMap>
+
+    <sql id="selectBasStockFreezeRecordVo">
+        select wh_guid, stock_id, cargo_space_id, tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid from bas_stock_freeze_record
+    </sql>
+
+    <select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
+        <include refid="selectBasStockFreezeRecordVo"/>
+        <where>  
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="oldStatus != null  and oldStatus != ''"> and old_status = #{oldStatus}</if>
+            <if test="currStatus != null  and currStatus != ''"> and curr_status = #{currStatus}</if>
+            <if test="method != null  and method != ''"> and method = #{method}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if>
+            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target = #{operatingTarget}</if>
+            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if>
+            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity = #{barCodeQuantity}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+        </where>
+    </select>
+    
+    <select id="selectBasStockFreezeRecordByWhGuid" parameterType="String" resultMap="BasStockFreezeRecordResult">
+        <include refid="selectBasStockFreezeRecordVo"/>
+        where wh_guid = #{whGuid}
+    </select>
+
+    <insert id="insertBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
+        insert into bas_stock_freeze_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">wh_guid,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="oldStatus != null">old_status,</if>
+            <if test="currStatus != null">curr_status,</if>
+            <if test="method != null">method,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="stockDetailId != null">stock_detail_id,</if>
+            <if test="operatingTarget != null">operating_target,</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity,</if>
+            <if test="barCodeQuantity != null">bar_code_quantity,</if>
+            <if test="productGuid != null">product_guid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">#{whGuid},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="oldStatus != null">#{oldStatus},</if>
+            <if test="currStatus != null">#{currStatus},</if>
+            <if test="method != null">#{method},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="stockDetailId != null">#{stockDetailId},</if>
+            <if test="operatingTarget != null">#{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">#{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">#{barCodeQuantity},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
+        update bas_stock_freeze_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="oldStatus != null">old_status = #{oldStatus},</if>
+            <if test="currStatus != null">curr_status = #{currStatus},</if>
+            <if test="method != null">method = #{method},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="stockDetailId != null">stock_detail_id = #{stockDetailId},</if>
+            <if test="operatingTarget != null">operating_target = #{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity = #{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">bar_code_quantity = #{barCodeQuantity},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+        </trim>
+        where wh_guid = #{whGuid}
+    </update>
+
+    <delete id="deleteBasStockFreezeRecordByWhGuid" parameterType="String">
+        delete from bas_stock_freeze_record where wh_guid = #{whGuid}
+    </delete>
+
+    <delete id="deleteBasStockFreezeRecordByWhGuids" parameterType="String">
+        delete from bas_stock_freeze_record where wh_guid in 
+        <foreach item="whGuid" collection="array" open="(" separator="," close=")">
+            #{whGuid}
+        </foreach>
+    </delete>
+</mapper>