空托盘入库

2025-10-27 15:13:02 +08:00
parent be56b3be9d
commit b7c7597193
11 changed files with 1000 additions and 1908 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
@@ -30,6 +30,8 @@ public class InstockInVo {
    @NotNull
    private String productType;

+    private String remark;
+

    private List<BasProduct> productVoList;

--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -109,6 +109,7 @@ public class InStockinServiceImpl implements IInStockinService
        inStockin.setStatus("1");
        inStockin.setStockSource("1");
        inStockin.setSpare1(inStockinVo.getProductType());
+        inStockin.setSpare5(inStockinVo.getRemark());
        inStockinMapper.insertInStockin(inStockin);
        for (int i = 1; i <= productVoList.size(); i++) {
            BasProduct basProduct = productVoList.get(i-1);
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -311,7 +311,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
            } else {
                return AjaxResult.warn("不存在子作业");
            }
-        }else {
+        }else if ("1".equals(mydoJob.getInOrOut()) || "2".equals(mydoJob.getInOrOut())){
            //正常入库任务
            MydoJobDetail param = new MydoJobDetail();
            param.setJobId(jobId);
@@ -355,24 +355,40 @@ public class MydoJobServiceImpl implements IMydoJobService {
                updateMydoJob(mydoJob);
                // 插入任务历史表 删除任务
                insertHistory(mydoJob.getJobId());
-
-                //修改回传单据表状态
-                /*if ("1".equals(mydoJob.getInOrOut())){
-                    //调拨单
-                    TransferBillCallback transferBillCallbackParam = new TransferBillCallback();
-                    transferBillCallbackParam.setJobId(mydoJob.getJobId());
-                    List<TransferBillCallback> transferBillCallbacks = transferBillCallbackService.selectTransferBillCallbackList(transferBillCallbackParam);
-                    if (CollUtil.isNotEmpty(transferBillCallbacks)){
-                        for (TransferBillCallback transferBillCallback : transferBillCallbacks) {
-                            transferBillCallback.setStatus("2");
-                            transferBillCallbackService.updateTransferBillCallback(transferBillCallback);
-                        }
-                    }
-                }*/
                return AjaxResult.success();
            } else {
                return AjaxResult.warn("不存在子作业");
            }
+        }else if ("3".equals(mydoJob.getInOrOut())){
+            //空托盘入库
+            //正常入库任务
+            MydoJobDetail param = new MydoJobDetail();
+            param.setJobId(jobId);
+            List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
+            BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(mydoJob.getCargoSpaceId());
+            List<BasStock> list = new ArrayList<>();
+
+            for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
+                BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
+                list.add(stockByInStockinDetail);
+
+            }
+            //插入库存信息
+            basStockService.insertBasStockList(list);
+            //修改货位状态
+            basCargoSpace.setStatus("2");
+            basCargoSpace.setTrayCode(mydoJob.getTrayCode());
+            basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId());
+            basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
+            //结束任务
+            mydoJob.setStatus("4");
+            mydoJob.setFinishTime(DateUtil.formatDateTime(DateUtil.date()));
+            updateMydoJob(mydoJob);
+            // 插入任务历史表 删除任务
+            insertHistory(mydoJob.getJobId());
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.warn("不存在入库类型");
        }
    }

--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java
@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

 /**
- * 入库单据历史Controller
+ * 入库单据流水Controller
 * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
 */
@RestController
@RequestMapping("/search/ViewStockinHistory")
@@ -35,7 +35,7 @@ public class ViewStockinHistoryController extends BaseController
    private IViewStockinHistoryService viewStockinHistoryService;

    /**
-     * 查询入库单据历史列表
+     * 查询入库单据流水列表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:list')")
    @GetMapping("/list")
@@ -47,33 +47,33 @@ public class ViewStockinHistoryController extends BaseController
    }

    /**
-     * 导出入库单据历史列表
+     * 导出入库单据流水列表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:export')")
-    @Log(title = "入库单据历史", businessType = BusinessType.EXPORT)
+    @Log(title = "入库单据流水", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ViewStockinHistory viewStockinHistory)
    {
        List<ViewStockinHistory> list = viewStockinHistoryService.selectViewStockinHistoryList(viewStockinHistory);
        ExcelUtil<ViewStockinHistory> util = new ExcelUtil<ViewStockinHistory>(ViewStockinHistory.class);
-        util.exportExcel(response, list, "入库单据历史数据");
+        util.exportExcel(response, list, "入库单据流水数据");
    }

    /**
-     * 获取入库单据历史详细信息
+     * 获取入库单据流水详细信息
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:query')")
-    @GetMapping(value = "/{stockinGuid}")
-    public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid)
+    @GetMapping(value = "/{stockinId}")
+    public AjaxResult getInfo(@PathVariable("stockinId") String stockinId)
    {
-        return success(viewStockinHistoryService.selectViewStockinHistoryByStockinGuid(stockinGuid));
+        return success(viewStockinHistoryService.selectViewStockinHistoryByStockinId(stockinId));
    }

    /**
-     * 新增入库单据历史
+     * 新增入库单据流水
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:add')")
-    @Log(title = "入库单据历史", businessType = BusinessType.INSERT)
+    @Log(title = "入库单据流水", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ViewStockinHistory viewStockinHistory)
    {
@@ -81,10 +81,10 @@ public class ViewStockinHistoryController extends BaseController
    }

    /**
-     * 修改入库单据历史
+     * 修改入库单据流水
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:edit')")
-    @Log(title = "入库单据历史", businessType = BusinessType.UPDATE)
+    @Log(title = "入库单据流水", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ViewStockinHistory viewStockinHistory)
    {
@@ -92,13 +92,13 @@ public class ViewStockinHistoryController extends BaseController
    }

    /**
-     * 删除入库单据历史
+     * 删除入库单据流水
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:remove')")
-    @Log(title = "入库单据历史", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockinGuids}")
-    public AjaxResult remove(@PathVariable String[] stockinGuids)
+    @Log(title = "入库单据流水", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinIds}")
+    public AjaxResult remove(@PathVariable String[] stockinIds)
    {
-        return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinGuids(stockinGuids));
+        return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinIds(stockinIds));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
@@ -1,347 +1,414 @@
 package com.ruoyi.search.ViewStockinHistory.domain;

-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 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;

 /**
- * 入库单据历史对象 view_stockin_history
+ * 入库单据流水对象 view_stockin_history
 * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
 */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
 public class ViewStockinHistory extends BaseEntity
 {
    private static final long serialVersionUID = 1L;

-    /** 入库单guid */
-//    @Excel(name = "入库单guid")
-    private String stockinGuid;
-
    /** 入库单号 */
    @Excel(name = "入库单号")
    private String stockinId;

-    /** 入库明细ID */
+    /** 入库子单号 */
    @Excel(name = "入库子单号")
    private String stockinDetailId;
-    /** 入库类型 */
-    @Excel(name = "入库类型", dictType = "in_job_type")
-    private String inType;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String spec;
+
+    /** 生产图号 */
+    @Excel(name = "生产图号")
+    private String cargoNo;
+
+    /** 产品状态 */
+    @Excel(name = "产品状态")
+    private String productType;
+
+    /** 计划数量 */
+    @Excel(name = "计划数量")
+    private String quantity;
+
+    /** 扫码数量 */
+    @Excel(name = "扫码数量")
+    private String scanNum;
+
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private String assignNum;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private String price;
+
+    /** 单据金额 */
+    @Excel(name = "单据金额")
+    private String priceTotal;
+
+    /** 供应商代号 */
+    @Excel(name = "供应商代号")
+    private String supplierNo;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 合同号 */
+    @Excel(name = "合同号")
+    private String spare6;
+
+    /** 台次 */
+    @Excel(name = "台次")
+    private String spare5;
+
+    /** 件次 */
+    @Excel(name = "件次")
+    private String spare7;
+
+    /** 账套 */
+    @Excel(name = "账套")
+    private String spare3;
+
+    /** 创建用户 */
+    @Excel(name = "创建用户")
+    private String createManId;

    /** 创建时间 */
    @Excel(name = "创建时间")
    private String createDate;

-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createManId;
-    /** ERP单号 */
-    @Excel(name = "订单号")
-    private String erpBill;
-
-    /** 物料编码 */
-    @Excel(name = "物料编码")
-    private String productId;
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String productName;
-    /** 供应商名称 */
-    @Excel(name = "供应商名称")
-    private String supplierName;
    /** 单据状态 */
    @Excel(name = "单据状态")
    private String status;

-    /** 仓库ID */
-//    @Excel(name = "仓库ID")
-    private String warehouseId;
-
-    /** 完成时间 */
-//    @Excel(name = "完成时间")
-    private String finishDate;
-
-    /** 单据来源 */
-//    @Excel(name = "单据来源")
-    private String stockSource;
-
-    /** 部门编码 */
-//    @Excel(name = "部门编码")
-    private String departmentNo;
-
-    /** 班组编码 */
-//    @Excel(name = "班组编码")
-    private String classNo;
-
-    /** 供应商编号 */
-//    @Excel(name = "供应商编号")
-    private String supplierNo;
-
-
-
-    /** 供应商简称 */
-//    @Excel(name = "供应商简称")
-    private String simpleName;
-
-    /** 联系人 */
-//    @Excel(name = "联系人")
-    private String contactName;
-
-    /** 联系电话 */
-//    @Excel(name = "联系电话")
-    private String contactNumber;
-
-    /** 供应商地址 */
-//    @Excel(name = "供应商地址")
-    private String address;
-
-
-
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
-
-    /** 计划数量 */
-//    @Excel(name = "计划数量")
-    private String quantity;
-
-    /** 计划箱数 */
-//    @Excel(name = "计划箱数")
-    private String quantityX;
-
-    /** 计划件数 */
-//    @Excel(name = "计划件数")
-    private String quantityJ;
-
-    /** 实际数量 */
-//    @Excel(name = "实际数量")
-    private String assignNum;
-
-    /** 实际箱数 */
-//    @Excel(name = "实际箱数")
-    private String assignNumX;
-
-    /** 实际件数 */
-//    @Excel(name = "实际件数")
-    private String assignNumJ;
-
-    /** 扫码数量 */
-//    @Excel(name = "扫码数量")
-    private String scanNum;
-
-    /** 扫码箱数 */
-//    @Excel(name = "扫码箱数")
-    private String scanNumX;
-
-    /** 扫码件数 */
-//    @Excel(name = "扫码件数")
-    private String scanNumJ;
-
-    /** 入库日期 */
-//    @Excel(name = "入库日期")
-    private String printDate;
-
-    /** 库存状态 */
-    @Excel(name = "库存状态" ,dictType = "stock_status")
-    private String stockStatus;
-
-    /** 物料主键 */
-//    @Excel(name = "物料主键")
-    private String productGuid;
-
-
-
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 型号 */
-//    @Excel(name = "型号")
-    private String spare1;
-
-    /** 单件净重 */
-//    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-//    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-//    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-//    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-//    @Excel(name = "功率")
-    private String spare6;
-
-
-
-    /** 相位 */
-//    @Excel(name = "相位")
-    private String spare7;
-
-    /** 毛重 */
-//    @Excel(name = "毛重")
+    /** 质量 */
+    @Excel(name = "质量")
    private String spare8;

-    /** NC号 */
-    @Excel(name = "NC号")
-    private String spare9;
+    /** 来源 */
+    @Excel(name = "来源")
+    private String spare1;

-    /** 电源线 */
-    @Excel(name = "电源线")
-    private String spare10;
-
-    /** 插头 */
-    @Excel(name = "插头")
-    private String spare11;
-
-    /** 接嘴 */
-    @Excel(name = "接嘴")
-    private String spare12;
-
-    /** 快捷码 */
-    @Excel(name = "快捷码")
-    private String spare13;
-
-    /** 库存单位编号 */
-    @Excel(name = "库存单位编号")
-    private String spare14;
-
-    /** 库存单位名称 */
-    @Excel(name = "库存单位名称")
-    private String spare15;
-
-    /** 品号群组 */
-    @Excel(name = "品号群组")
-    private String spare16;
-
-    /** 归类品 */
-    @Excel(name = "归类品")
-    private String spare17;
-
-    /** 计量体系 */
-    @Excel(name = "计量体系")
-    private String spare18;
-
-    /** 群组名称 */
-    @Excel(name = "群组名称")
-    private String spare19;
-
-    /** 批号管理 */
-    @Excel(name = "批号管理")
-    private String spare20;
+    /** 用途 */
+    @Excel(name = "用途")
+    private String spare4;

    /** 状态 */
    @Excel(name = "状态")
-    private String spare21;
+    private String spare2;

-    /** 产品大类 */
-    @Excel(name = "产品大类")
-    private String spare22;
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }

-    /** 产品二类 */
-    @Excel(name = "产品二类")
-    private String spare23;
+    public String getStockinId() 
+    {
+        return stockinId;
+    }

-    /** 产品线/产品系列 */
-    @Excel(name = "产品线/产品系列")
-    private String spare24;
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }

-    /** BOM状态 */
-    @Excel(name = "BOM状态")
-    private String spare25;
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }

-    /** 产品定位 */
-    @Excel(name = "产品定位")
-    private String spare26;
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }

-    /** 电脑板型号 */
-    @Excel(name = "电脑板型号")
-    private String spare27;
+    public String getProductId() 
+    {
+        return productId;
+    }

-    /** 非标要求 */
-    @Excel(name = "非标要求")
-    private String spare28;
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }

-    /** 品牌 */
-    @Excel(name = "品牌")
-    private String spare29;
+    public String getProductName() 
+    {
+        return productName;
+    }

-    /** 非标颜色 */
-    @Excel(name = "非标颜色")
-    private String spare30;
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }

-    /** 主颜色 */
-    @Excel(name = "主颜色")
-    private String spare31;
+    public String getSpec() 
+    {
+        return spec;
+    }

-    /** 辅助颜色 */
-    @Excel(name = "辅助颜色")
-    private String spare32;
+    public void setCargoNo(String cargoNo) 
+    {
+        this.cargoNo = cargoNo;
+    }

-    /** 是否标准款 */
-    @Excel(name = "是否标准款")
-    private String spare33;
+    public String getCargoNo() 
+    {
+        return cargoNo;
+    }

-    /** 包装方式 */
-    @Excel(name = "包装方式")
-    private String spare34;
+    public void setProductType(String productType) 
+    {
+        this.productType = productType;
+    }

-    /** 主要包装方式 */
-    @Excel(name = "主要包装方式")
-    private String spare35;
+    public String getProductType() 
+    {
+        return productType;
+    }

-    /** 长 */
-    @Excel(name = "长")
-    private String spare36;
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }

-    /** 宽 */
-    @Excel(name = "宽")
-    private String spare37;
+    public String getQuantity() 
+    {
+        return quantity;
+    }

-    /** 高 */
-    @Excel(name = "高")
-    private String spare38;
+    public void setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
+    }

-    /** 包装材积 */
-    @Excel(name = "包装材积")
-    private String spare39;
-    @Excel(name = "描述")
-    private String remark;
-    /** 仓库名称 */
-//    @Excel(name = "仓库名称")
-    private String warehouseName;
+    public String getScanNum() 
+    {
+        return scanNum;
+    }

+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
+    }

+    public String getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setPriceTotal(String priceTotal) 
+    {
+        this.priceTotal = priceTotal;
+    }
+
+    public String getPriceTotal() 
+    {
+        return priceTotal;
+    }
+
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSupplierNo() 
+    {
+        return supplierNo;
+    }
+
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinId", getStockinId())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("spec", getSpec())
+            .append("cargoNo", getCargoNo())
+            .append("productType", getProductType())
+            .append("quantity", getQuantity())
+            .append("scanNum", getScanNum())
+            .append("assignNum", getAssignNum())
+            .append("unit", getUnit())
+            .append("price", getPrice())
+            .append("priceTotal", getPriceTotal())
+            .append("supplierNo", getSupplierNo())
+            .append("supplierName", getSupplierName())
+            .append("spare6", getSpare6())
+            .append("spare5", getSpare5())
+            .append("spare7", getSpare7())
+            .append("spare3", getSpare3())
+            .append("createManId", getCreateManId())
+            .append("createDate", getCreateDate())
+            .append("status", getStatus())
+            .append("spare8", getSpare8())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare4", getSpare4())
+            .append("spare2", getSpare2())
+            .toString();
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java
@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;

 /**
- * 入库单据历史Mapper接口
+ * 入库单据流水Mapper接口
 * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
 */
 public interface ViewStockinHistoryMapper 
 {
    /**
-     * 查询入库单据历史
+     * 查询入库单据流水
     * 
-     * @param stockinGuid 入库单据历史主键
-     * @return 入库单据历史
+     * @param stockinId 入库单据流水主键
+     * @return 入库单据流水
     */
-    public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid);
+    public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId);

    /**
-     * 查询入库单据历史列表
+     * 查询入库单据流水列表
     * 
-     * @param viewStockinHistory 入库单据历史
-     * @return 入库单据历史集合
+     * @param viewStockinHistory 入库单据流水
+     * @return 入库单据流水集合
     */
    public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory);

    /**
-     * 新增入库单据历史
+     * 新增入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory);

    /**
-     * 修改入库单据历史
+     * 修改入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory);

    /**
-     * 删除入库单据历史
+     * 删除入库单据流水
     * 
-     * @param stockinGuid 入库单据历史主键
+     * @param stockinId 入库单据流水主键
     * @return 结果
     */
-    public int deleteViewStockinHistoryByStockinGuid(String stockinGuid);
+    public int deleteViewStockinHistoryByStockinId(String stockinId);

    /**
-     * 批量删除入库单据历史
+     * 批量删除入库单据流水
     * 
-     * @param stockinGuids 需要删除的数据主键集合
+     * @param stockinIds 需要删除的数据主键集合
     * @return 结果
     */
-    public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids);
+    public int deleteViewStockinHistoryByStockinIds(String[] stockinIds);
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java
@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;

 /**
- * 入库单据历史Service接口
+ * 入库单据流水Service接口
 * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
 */
 public interface IViewStockinHistoryService 
 {
    /**
-     * 查询入库单据历史
+     * 查询入库单据流水
     * 
-     * @param stockinGuid 入库单据历史主键
-     * @return 入库单据历史
+     * @param stockinId 入库单据流水主键
+     * @return 入库单据流水
     */
-    public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid);
+    public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId);

    /**
-     * 查询入库单据历史列表
+     * 查询入库单据流水列表
     * 
-     * @param viewStockinHistory 入库单据历史
-     * @return 入库单据历史集合
+     * @param viewStockinHistory 入库单据流水
+     * @return 入库单据流水集合
     */
    public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory);

    /**
-     * 新增入库单据历史
+     * 新增入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory);

    /**
-     * 修改入库单据历史
+     * 修改入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory);

    /**
-     * 批量删除入库单据历史
+     * 批量删除入库单据流水
     * 
-     * @param stockinGuids 需要删除的入库单据历史主键集合
+     * @param stockinIds 需要删除的入库单据流水主键集合
     * @return 结果
     */
-    public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids);
+    public int deleteViewStockinHistoryByStockinIds(String[] stockinIds);

    /**
-     * 删除入库单据历史信息
+     * 删除入库单据流水信息
     * 
-     * @param stockinGuid 入库单据历史主键
+     * @param stockinId 入库单据流水主键
     * @return 结果
     */
-    public int deleteViewStockinHistoryByStockinGuid(String stockinGuid);
+    public int deleteViewStockinHistoryByStockinId(String stockinId);
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java
@@ -8,10 +8,10 @@ import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;

 /**
- * 入库单据历史Service业务层处理
+ * 入库单据流水Service业务层处理
 * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
 */
@Service
 public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService 
@@ -20,22 +20,22 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
    private ViewStockinHistoryMapper viewStockinHistoryMapper;

    /**
-     * 查询入库单据历史
+     * 查询入库单据流水
     * 
-     * @param stockinGuid 入库单据历史主键
-     * @return 入库单据历史
+     * @param stockinId 入库单据流水主键
+     * @return 入库单据流水
     */
    @Override
-    public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid)
+    public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId)
    {
-        return viewStockinHistoryMapper.selectViewStockinHistoryByStockinGuid(stockinGuid);
+        return viewStockinHistoryMapper.selectViewStockinHistoryByStockinId(stockinId);
    }

    /**
-     * 查询入库单据历史列表
+     * 查询入库单据流水列表
     * 
-     * @param viewStockinHistory 入库单据历史
-     * @return 入库单据历史
+     * @param viewStockinHistory 入库单据流水
+     * @return 入库单据流水
     */
    @Override
    public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
@@ -44,9 +44,9 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
    }

    /**
-     * 新增入库单据历史
+     * 新增入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    @Override
@@ -56,9 +56,9 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
    }

    /**
-     * 修改入库单据历史
+     * 修改入库单据流水
     * 
-     * @param viewStockinHistory 入库单据历史
+     * @param viewStockinHistory 入库单据流水
     * @return 结果
     */
    @Override
@@ -68,26 +68,26 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
    }

    /**
-     * 批量删除入库单据历史
+     * 批量删除入库单据流水
     * 
-     * @param stockinGuids 需要删除的入库单据历史主键
+     * @param stockinIds 需要删除的入库单据流水主键
     * @return 结果
     */
    @Override
-    public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids)
+    public int deleteViewStockinHistoryByStockinIds(String[] stockinIds)
    {
-        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuids(stockinGuids);
+        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinIds(stockinIds);
    }

    /**
-     * 删除入库单据历史信息
+     * 删除入库单据流水信息
     * 
-     * @param stockinGuid 入库单据历史主键
+     * @param stockinId 入库单据流水主键
     * @return 结果
     */
    @Override
-    public int deleteViewStockinHistoryByStockinGuid(String stockinGuid)
+    public int deleteViewStockinHistoryByStockinId(String stockinId)
    {
-        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuid(stockinGuid);
+        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinId(stockinId);
    }
 }