diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java
index 5b70e1f..7fd107b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 入库作业流水Controller
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 @RestController
 @RequestMapping("/search/ViewInJobFlow")
@@ -63,42 +63,10 @@ public class ViewInJobFlowController extends BaseController
      * 获取入库作业流水详细信息
      */
     @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:query')")
-    @GetMapping(value = "/{jobDetailId}")
-    public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId)
+    @GetMapping(value = "/{jobId}")
+    public AjaxResult getInfo(@PathVariable("jobId") String jobId)
     {
-        return success(viewInJobFlowService.selectViewInJobFlowByJobDetailId(jobDetailId));
+        return success(viewInJobFlowService.selectViewInJobFlowByJobId(jobId));
     }
 
-    /**
-     * 新增入库作业流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:add')")
-    @Log(title = "入库作业流水", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ViewInJobFlow viewInJobFlow)
-    {
-        return toAjax(viewInJobFlowService.insertViewInJobFlow(viewInJobFlow));
-    }
-
-    /**
-     * 修改入库作业流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:edit')")
-    @Log(title = "入库作业流水", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ViewInJobFlow viewInJobFlow)
-    {
-        return toAjax(viewInJobFlowService.updateViewInJobFlow(viewInJobFlow));
-    }
-
-    /**
-     * 删除入库作业流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:remove')")
-    @Log(title = "入库作业流水", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{jobDetailIds}")
-    public AjaxResult remove(@PathVariable String[] jobDetailIds)
-    {
-        return toAjax(viewInJobFlowService.deleteViewInJobFlowByJobDetailIds(jobDetailIds));
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
index ea4aa97..537479b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
@@ -1,5 +1,9 @@
 package com.ruoyi.search.ViewInJobFlow.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;
@@ -7,53 +11,37 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 入库作业流水对象 view_in_job_flow
- *
+ * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class ViewInJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 子任务编码 */
-    @Excel(name = "子任务编码")
-    private String jobDetailId;
-
-    /** 任务编码 */
-    @Excel(name = "任务编码")
+    /** 任务ID */
+    @Excel(name = "作业ID")
     private String jobId;
 
+    /** 子任务ID */
+    @Excel(name = "子作业ID")
+    private String jobDetailId;
+
     /** 任务号 */
     @Excel(name = "任务号")
     private String taskNo;
 
-    /** 状态 */
-    @Excel(name = "状态",dictType = "mydo_job_status")
-    private String status;
+    /** 单据ID */
+    @Excel(name = "单据ID")
+    private String inOrOutId;
 
-    /** 任务类型 */
-    @Excel(name = "任务类型",dictType = "in_job_type")
-    private Long inOrOut;
-
-    /** 托盘条码 */
-    @Excel(name = "托盘条码")
-    private String trayCode;
-
-    /** 开始时间 */
-    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-    @Excel(name = "结束时间")
-    private String finishTime;
-
-    /** 入口 */
-    @Excel(name = "入口")
-    private String entranceId;
-
-    /** 仓库编码 */
-    @Excel(name = "仓库编码")
-    private String warehouseId;
+    /** 子单据ID */
+    @Excel(name = "子单据ID")
+    private String inOrOutDId;
 
     /** 物料编码 */
     @Excel(name = "物料编码")
@@ -63,533 +51,116 @@ public class ViewInJobFlow extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
-    /** 常用码 */
-    @Excel(name = "常用码")
-    private String parentId;
+    /** unitPrices */
+    @Excel(name = "unitPrices")
+    private String spare5;
 
-    /** 单价 */
-    @Excel(name = "单价")
-    private String price;
+    /** units */
+    @Excel(name = "units")
+    private String spare6;
 
-    /** 图号 */
-    @Excel(name = "图号")
-    private String cargoNo;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型",dictType = "product_type")
-    private String productType;
-
-    /** 是否系统项 */
-    @Excel(name = "是否系统项",dictType = "sys_yes_no")
-    private String systemItem;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String productCtm;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String productCtu;
-
-    /** 库存上限 */
-    @Excel(name = "库存上限")
-    private String upperNum;
-
-    /** 库存下限 */
-    @Excel(name = "库存下限")
-    private String limitNum;
-
-    /** 是否启用 */
-    @Excel(name = "是否启用",dictType = "sys_yes_no")
-    private String enableFlag;
+    /** 托盘码 */
+    @Excel(name = "托盘码")
+    private String trayCode;
 
     /** 入库数量 */
     @Excel(name = "入库数量")
     private String inQuantity;
 
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String stockQuantity;
+
+    /** 供应商id */
+    @Excel(name = "供应商id")
+    private String supplierNo;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private String customerNo;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /** 任务状态 */
+    @Excel(name = "任务状态",dictType = "sys_job_status")
+    private String status;
+
+    /** 货位ID */
+    @Excel(name = "货位ID")
+    private String cargoSpaceId;
+
+    /** 目标巷道ID */
+    @Excel(name = "目标巷道ID")
+    private String targetCargoSpaceId;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+
+    /** 执行阶段 */
+    @Excel(name = "执行阶段",dictType = "execution_phase_type")
+    private String executionPhase;
+
+    /** 库存ID */
+    @Excel(name = "库存ID")
+    private String stockId;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String lotNo;
 
-    /** 入库单 */
-    @Excel(name = "入库单")
-    private String inOrOutId;
+    /** 库存状态 */
+    @Excel(name = "库存状态",dictType = "stock_status")
+    private String stockStatus;
 
-    /** 入库子单 */
-    @Excel(name = "入库子单")
-    private String inOrOutDId;
+    /** 出库数量 */
+//    @Excel(name = "出库数量")
+    private String outQuantity;
 
-    /** 入库金额 */
-    @Excel(name = "入库金额")
-    private String priceTotal;
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
 
-    /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
-    private String origin;
+    /** 价格 */
+    @Excel(name = "价格")
+    private String price;
 
-    /** 周转类型 */
-    @Excel(name = "周转类型",dictType = "turnover_type")
-    private String turnovertype;
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    private String cargoNo;
 
-    /** 套账 */
-    @Excel(name = "套账",dictType = "account_type")
-    private String account;
+    /** 单位id */
+    @Excel(name = "单位id")
+    private String unit;
 
-    /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
-    private String purpose;
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spec;
 
-    /** 台次 */
-    @Excel(name = "台次")
-    private String units;
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String spare1;
 
-    /** 合同号 */
-    @Excel(name = "合同号")
-    private String contract;
+    /** url */
+    @Excel(name = "url")
+    private String spare3;
 
-    /** 件次 */
-    @Excel(name = "件次")
-    private String cases;
+    /** btnurl */
+    @Excel(name = "btnurl")
+    private String spare4;
 
-    /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
-    private String quality;
+    /** unitjb */
+    @Excel(name = "unitjb")
+    private String spare7;
 
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String managementNo;
-
-    public void setJobDetailId(String jobDetailId)
-    {
-        this.jobDetailId = jobDetailId;
-    }
-
-    public String getJobDetailId()
-    {
-        return jobDetailId;
-    }
-
-    public void setJobId(String jobId)
-    {
-        this.jobId = jobId;
-    }
-
-    public String getJobId()
-    {
-        return jobId;
-    }
-
-    public void setTaskNo(String taskNo)
-    {
-        this.taskNo = taskNo;
-    }
-
-    public String getTaskNo()
-    {
-        return taskNo;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setInOrOut(Long inOrOut)
-    {
-        this.inOrOut = inOrOut;
-    }
-
-    public Long getInOrOut()
-    {
-        return inOrOut;
-    }
-
-    public void setTrayCode(String trayCode)
-    {
-        this.trayCode = trayCode;
-    }
-
-    public String getTrayCode()
-    {
-        return trayCode;
-    }
-
-    public void setStartTime(String startTime)
-    {
-        this.startTime = startTime;
-    }
-
-    public String getStartTime()
-    {
-        return startTime;
-    }
-
-    public void setFinishTime(String finishTime)
-    {
-        this.finishTime = finishTime;
-    }
-
-    public String getFinishTime()
-    {
-        return finishTime;
-    }
-
-    public void setEntranceId(String entranceId)
-    {
-        this.entranceId = entranceId;
-    }
-
-    public String getEntranceId()
-    {
-        return entranceId;
-    }
-
-    public void setWarehouseId(String warehouseId)
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId()
-    {
-        return warehouseId;
-    }
-
-    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 setParentId(String parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public String getParentId()
-    {
-        return parentId;
-    }
-
-    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 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 setProductType(String productType)
-    {
-        this.productType = productType;
-    }
-
-    public String getProductType()
-    {
-        return productType;
-    }
-
-    public void setSystemItem(String systemItem)
-    {
-        this.systemItem = systemItem;
-    }
-
-    public String getSystemItem()
-    {
-        return systemItem;
-    }
-
-    public void setProductCtm(String productCtm)
-    {
-        this.productCtm = productCtm;
-    }
-
-    public String getProductCtm()
-    {
-        return productCtm;
-    }
-
-    public void setProductCtu(String productCtu)
-    {
-        this.productCtu = productCtu;
-    }
-
-    public String getProductCtu()
-    {
-        return productCtu;
-    }
-
-    public void setUpperNum(String upperNum)
-    {
-        this.upperNum = upperNum;
-    }
-
-    public String getUpperNum()
-    {
-        return upperNum;
-    }
-
-    public void setLimitNum(String limitNum)
-    {
-        this.limitNum = limitNum;
-    }
-
-    public String getLimitNum()
-    {
-        return limitNum;
-    }
-
-    public void setEnableFlag(String enableFlag)
-    {
-        this.enableFlag = enableFlag;
-    }
-
-    public String getEnableFlag()
-    {
-        return enableFlag;
-    }
-
-    public void setInQuantity(String inQuantity)
-    {
-        this.inQuantity = inQuantity;
-    }
-
-    public String getInQuantity()
-    {
-        return inQuantity;
-    }
-
-    public void setLotNo(String lotNo)
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo()
-    {
-        return lotNo;
-    }
-
-    public void setInOrOutId(String inOrOutId)
-    {
-        this.inOrOutId = inOrOutId;
-    }
-
-    public String getInOrOutId()
-    {
-        return inOrOutId;
-    }
-
-    public void setInOrOutDId(String inOrOutDId)
-    {
-        this.inOrOutDId = inOrOutDId;
-    }
-
-    public String getInOrOutDId()
-    {
-        return inOrOutDId;
-    }
-
-    public void setPriceTotal(String priceTotal)
-    {
-        this.priceTotal = priceTotal;
-    }
-
-    public String getPriceTotal()
-    {
-        return priceTotal;
-    }
-
-    public void setOrigin(String origin)
-    {
-        this.origin = origin;
-    }
-
-    public String getOrigin()
-    {
-        return origin;
-    }
-
-    public void setTurnovertype(String turnovertype)
-    {
-        this.turnovertype = turnovertype;
-    }
-
-    public String getTurnovertype()
-    {
-        return turnovertype;
-    }
-
-    public void setAccount(String account)
-    {
-        this.account = account;
-    }
-
-    public String getAccount()
-    {
-        return account;
-    }
-
-    public void setPurpose(String purpose)
-    {
-        this.purpose = purpose;
-    }
-
-    public String getPurpose()
-    {
-        return purpose;
-    }
-
-    public void setUnits(String units)
-    {
-        this.units = units;
-    }
-
-    public String getUnits()
-    {
-        return units;
-    }
-
-    public void setContract(String contract)
-    {
-        this.contract = contract;
-    }
-
-    public String getContract()
-    {
-        return contract;
-    }
-
-    public void setCases(String cases)
-    {
-        this.cases = cases;
-    }
-
-    public String getCases()
-    {
-        return cases;
-    }
-
-    public void setQuality(String quality)
-    {
-        this.quality = quality;
-    }
-
-    public String getQuality()
-    {
-        return quality;
-    }
-
-    public void setManagementNo(String managementNo)
-    {
-        this.managementNo = managementNo;
-    }
-
-    public String getManagementNo()
-    {
-        return managementNo;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobDetailId", getJobDetailId())
-            .append("jobId", getJobId())
-            .append("taskNo", getTaskNo())
-            .append("status", getStatus())
-            .append("inOrOut", getInOrOut())
-            .append("trayCode", getTrayCode())
-            .append("createTime", getCreateTime())
-            .append("startTime", getStartTime())
-            .append("finishTime", getFinishTime())
-            .append("entranceId", getEntranceId())
-            .append("warehouseId", getWarehouseId())
-            .append("productId", getProductId())
-            .append("productName", getProductName())
-            .append("parentId", getParentId())
-            .append("price", getPrice())
-            .append("cargoNo", getCargoNo())
-            .append("unit", getUnit())
-            .append("spec", getSpec())
-            .append("remark", getRemark())
-            .append("productType", getProductType())
-            .append("systemItem", getSystemItem())
-            .append("productCtm", getProductCtm())
-            .append("productCtu", getProductCtu())
-            .append("upperNum", getUpperNum())
-            .append("limitNum", getLimitNum())
-            .append("enableFlag", getEnableFlag())
-            .append("inQuantity", getInQuantity())
-            .append("lotNo", getLotNo())
-            .append("inOrOutId", getInOrOutId())
-            .append("inOrOutDId", getInOrOutDId())
-            .append("priceTotal", getPriceTotal())
-            .append("origin", getOrigin())
-            .append("turnovertype", getTurnovertype())
-            .append("account", getAccount())
-            .append("purpose", getPurpose())
-            .append("units", getUnits())
-            .append("contract", getContract())
-            .append("cases", getCases())
-            .append("quality", getQuality())
-            .append("managementNo", getManagementNo())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java
index fad0be4..74e19fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java
@@ -7,17 +7,17 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
  * 入库作业流水Mapper接口
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 public interface ViewInJobFlowMapper 
 {
     /**
      * 查询入库作业流水
      * 
-     * @param jobDetailId 入库作业流水主键
+     * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
-    public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId);
+    public ViewInJobFlow selectViewInJobFlowByJobId(String jobId);
 
     /**
      * 查询入库作业流水列表
@@ -46,16 +46,16 @@ public interface ViewInJobFlowMapper
     /**
      * 删除入库作业流水
      * 
-     * @param jobDetailId 入库作业流水主键
+     * @param jobId 入库作业流水主键
      * @return 结果
      */
-    public int deleteViewInJobFlowByJobDetailId(String jobDetailId);
+    public int deleteViewInJobFlowByJobId(String jobId);
 
     /**
      * 批量删除入库作业流水
      * 
-     * @param jobDetailIds 需要删除的数据主键集合
+     * @param jobIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds);
+    public int deleteViewInJobFlowByJobIds(String[] jobIds);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java
index 7b1d01c..7cd0284 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java
@@ -7,17 +7,17 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
  * 入库作业流水Service接口
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 public interface IViewInJobFlowService 
 {
     /**
      * 查询入库作业流水
      * 
-     * @param jobDetailId 入库作业流水主键
+     * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
-    public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId);
+    public ViewInJobFlow selectViewInJobFlowByJobId(String jobId);
 
     /**
      * 查询入库作业流水列表
@@ -27,35 +27,4 @@ public interface IViewInJobFlowService
      */
     public List<ViewInJobFlow> selectViewInJobFlowList(ViewInJobFlow viewInJobFlow);
 
-    /**
-     * 新增入库作业流水
-     * 
-     * @param viewInJobFlow 入库作业流水
-     * @return 结果
-     */
-    public int insertViewInJobFlow(ViewInJobFlow viewInJobFlow);
-
-    /**
-     * 修改入库作业流水
-     * 
-     * @param viewInJobFlow 入库作业流水
-     * @return 结果
-     */
-    public int updateViewInJobFlow(ViewInJobFlow viewInJobFlow);
-
-    /**
-     * 批量删除入库作业流水
-     * 
-     * @param jobDetailIds 需要删除的入库作业流水主键集合
-     * @return 结果
-     */
-    public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds);
-
-    /**
-     * 删除入库作业流水信息
-     * 
-     * @param jobDetailId 入库作业流水主键
-     * @return 结果
-     */
-    public int deleteViewInJobFlowByJobDetailId(String jobDetailId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
index 7e9dd46..9183985 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
  * 入库作业流水Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 @Service
 public class ViewInJobFlowServiceImpl implements IViewInJobFlowService 
@@ -23,13 +23,13 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
     /**
      * 查询入库作业流水
      * 
-     * @param jobDetailId 入库作业流水主键
+     * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
     @Override
-    public ViewInJobFlow selectViewInJobFlowByJobDetailId(String jobDetailId)
+    public ViewInJobFlow selectViewInJobFlowByJobId(String jobId)
     {
-        return viewInJobFlowMapper.selectViewInJobFlowByJobDetailId(jobDetailId);
+        return viewInJobFlowMapper.selectViewInJobFlowByJobId(jobId);
     }
 
     /**
@@ -44,52 +44,4 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
         return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow);
     }
 
-    /**
-     * 新增入库作业流水
-     * 
-     * @param viewInJobFlow 入库作业流水
-     * @return 结果
-     */
-    @Override
-    public int insertViewInJobFlow(ViewInJobFlow viewInJobFlow)
-    {
-        viewInJobFlow.setCreateTime(DateUtils.getNowDate());
-        return viewInJobFlowMapper.insertViewInJobFlow(viewInJobFlow);
-    }
-
-    /**
-     * 修改入库作业流水
-     * 
-     * @param viewInJobFlow 入库作业流水
-     * @return 结果
-     */
-    @Override
-    public int updateViewInJobFlow(ViewInJobFlow viewInJobFlow)
-    {
-        return viewInJobFlowMapper.updateViewInJobFlow(viewInJobFlow);
-    }
-
-    /**
-     * 批量删除入库作业流水
-     * 
-     * @param jobDetailIds 需要删除的入库作业流水主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewInJobFlowByJobDetailIds(String[] jobDetailIds)
-    {
-        return viewInJobFlowMapper.deleteViewInJobFlowByJobDetailIds(jobDetailIds);
-    }
-
-    /**
-     * 删除入库作业流水信息
-     * 
-     * @param jobDetailId 入库作业流水主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewInJobFlowByJobDetailId(String jobDetailId)
-    {
-        return viewInJobFlowMapper.deleteViewInJobFlowByJobDetailId(jobDetailId);
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java
index fc0e022..7b2e0f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java
@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 出库作业流水ControllerController
+ * 出库作业流水Controller
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 @RestController
 @RequestMapping("/search/ViewOutJobFlow")
@@ -35,7 +35,7 @@ public class ViewOutJobFlowController extends BaseController
     private IViewOutJobFlowService viewOutJobFlowService;
 
     /**
-     * 查询出库作业流水Controller列表
+     * 查询出库作业流水列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:list')")
     @GetMapping("/list")
@@ -47,33 +47,33 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 导出出库作业流水Controller列表
+     * 导出出库作业流水列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:export')")
-    @Log(title = "出库作业流水Controller", businessType = BusinessType.EXPORT)
+    @Log(title = "出库作业流水", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ViewOutJobFlow viewOutJobFlow)
     {
         List<ViewOutJobFlow> list = viewOutJobFlowService.selectViewOutJobFlowList(viewOutJobFlow);
         ExcelUtil<ViewOutJobFlow> util = new ExcelUtil<ViewOutJobFlow>(ViewOutJobFlow.class);
-        util.exportExcel(response, list, "出库作业流水Controller数据");
+        util.exportExcel(response, list, "出库作业流水数据");
     }
 
     /**
-     * 获取出库作业流水Controller详细信息
+     * 获取出库作业流水详细信息
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:query')")
-    @GetMapping(value = "/{jobDetailId}")
-    public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId)
+    @GetMapping(value = "/{jobId}")
+    public AjaxResult getInfo(@PathVariable("jobId") String jobId)
     {
-        return success(viewOutJobFlowService.selectViewOutJobFlowByJobDetailId(jobDetailId));
+        return success(viewOutJobFlowService.selectViewOutJobFlowByJobId(jobId));
     }
 
     /**
-     * 新增出库作业流水Controller
+     * 新增出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:add')")
-    @Log(title = "出库作业流水Controller", businessType = BusinessType.INSERT)
+    @Log(title = "出库作业流水", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ViewOutJobFlow viewOutJobFlow)
     {
@@ -81,10 +81,10 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 修改出库作业流水Controller
+     * 修改出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:edit')")
-    @Log(title = "出库作业流水Controller", businessType = BusinessType.UPDATE)
+    @Log(title = "出库作业流水", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ViewOutJobFlow viewOutJobFlow)
     {
@@ -92,13 +92,13 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 删除出库作业流水Controller
+     * 删除出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:remove')")
-    @Log(title = "出库作业流水Controller", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{jobDetailIds}")
-    public AjaxResult remove(@PathVariable String[] jobDetailIds)
+    @Log(title = "出库作业流水", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{jobIds}")
+    public AjaxResult remove(@PathVariable String[] jobIds)
     {
-        return toAjax(viewOutJobFlowService.deleteViewOutJobFlowByJobDetailIds(jobDetailIds));
+        return toAjax(viewOutJobFlowService.deleteViewOutJobFlowByJobIds(jobIds));
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
index 5ca1115..49415e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
@@ -6,54 +6,34 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 出库作业流水Controller对象 view_out_job_flow
- *
+ * 出库作业流水对象 view_out_job_flow
+ * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 public class ViewOutJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 子任务 */
-    @Excel(name = "子任务")
-    private String jobDetailId;
-
-    /** 任务编码 */
-    @Excel(name = "任务编码")
+    /** 作业ID */
+    @Excel(name = "作业ID")
     private String jobId;
 
+    /** 子作业ID */
+    @Excel(name = "子作业ID")
+    private String jobDetailId;
+
     /** 任务号 */
     @Excel(name = "任务号")
     private String taskNo;
 
-    /** 状态 */
-    @Excel(name = "状态",dictType = "mydo_job_status")
-    private String status;
+    /** 单据ID */
+    @Excel(name = "单据ID")
+    private String inOrOutId;
 
-    /** 任务类型 */
-    @Excel(name = "任务类型",dictType = "out_job_type")
-    private Long inOrOut;
-
-    /** 托盘码 */
-    @Excel(name = "托盘码")
-    private String trayCode;
-
-    /** 开始时间 */
-    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-    @Excel(name = "结束时间")
-    private String finishTime;
-
-    /** 出口 */
-    @Excel(name = "出口")
-    private String exitId;
-
-    /** 仓库编码 */
-    @Excel(name = "仓库编码")
-    private String warehouseId;
+    /** 子单据ID */
+    @Excel(name = "子单据ID")
+    private String inOrOutDId;
 
     /** 物料编码 */
     @Excel(name = "物料编码")
@@ -63,504 +43,494 @@ public class ViewOutJobFlow extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
-    /** 常用编码 */
-    @Excel(name = "常用编码")
-    private String parentId;
+    /** unitPrices */
+    @Excel(name = "unitPrices")
+    private String spare5;
 
-    /** 单价 */
-    @Excel(name = "单价")
-    private String price;
+    /** units */
+    @Excel(name = "units")
+    private String spare6;
 
-    /** 图号 */
-    @Excel(name = "图号")
-    private String cargoNo;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型",dictType = "product_type")
-    private String productType;
-
-    /** 是否系统项 */
-    @Excel(name = "是否系统项",dictType = "sys_yes_no")
-    private String systemItem;
-
-    /** 物料创建时间 */
-    @Excel(name = "物料创建时间")
-    private String productCtm;
-
-    /** 物料创建人 */
-    @Excel(name = "物料创建人")
-    private String productCtu;
-
-    /** 库存上限 */
-    @Excel(name = "库存上限")
-    private String upperNum;
-
-    /** 库存下限 */
-    @Excel(name = "库存下限")
-    private String limitNum;
-
-    /** 是否可用 */
-    @Excel(name = "是否可用",dictType = "sys_yes_no")
-    private String enableFlag;
+    /** 托盘码 */
+    @Excel(name = "托盘码")
+    private String trayCode;
 
     /** 出库数量 */
     @Excel(name = "出库数量")
     private String outQuantity;
 
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String stockQuantity;
+
+    /** 供应商id */
+    @Excel(name = "供应商id")
+    private String supplierNo;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private String customerNo;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /** 任务状态 */
+    @Excel(name = "任务状态",dictType = "sys_job_status")
+    private String status;
+
+    /** 货位ID */
+    @Excel(name = "货位ID")
+    private String cargoSpaceId;
+
+    /** 目标巷道ID */
+    @Excel(name = "目标巷道ID")
+    private String targetCargoSpaceId;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+
+    /** 执行阶段 */
+    @Excel(name = "执行阶段",dictType = "execution_phase_type")
+    private String executionPhase;
+
+    /** 库存ID */
+    @Excel(name = "库存ID")
+    private String stockId;
+
     /** 批次号 */
     @Excel(name = "批次号")
     private String lotNo;
 
-    /** 单据编码 */
-    @Excel(name = "单据编码")
-    private String inOrOutId;
+    /** 库存状态 */
+    @Excel(name = "库存状态",dictType = "stock_status")
+    private String stockStatus;
 
-    /** 子单据编码 */
-    @Excel(name = "子单据编码")
-    private String inOrOutDId;
+    /** 入库数量 */
+//    @Excel(name = "入库数量")
+    private String inQuantity;
 
-    /** 金额 */
-    @Excel(name = "金额")
-    private String priceTotal;
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
 
-    /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
-    private String origin;
+    /** 价格 */
+    @Excel(name = "价格")
+    private String price;
 
-    /** 周转类型 */
-    @Excel(name = "周转类型",dictType = "turnover_type")
-    private String turnovertype;
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    private String cargoNo;
 
-    /** 套账 */
-    @Excel(name = "套账",dictType = "account_type")
-    private String account;
+    /** 单位id */
+    @Excel(name = "单位id")
+    private String unit;
 
-    /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
-    private String purpose;
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spec;
 
-    /** 台次 */
-    @Excel(name = "台次")
-    private String units;
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String spare1;
 
-    /** 合同 */
-    @Excel(name = "合同")
-    private String contract;
+    /** url */
+    @Excel(name = "url")
+    private String spare3;
 
-    /** 件次 */
-    @Excel(name = "件次")
-    private String cases;
+    /** btnurl */
+    @Excel(name = "btnurl")
+    private String spare4;
 
-    /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
-    private String quality;
+    /** unitjb */
+    @Excel(name = "unitjb")
+    private String spare7;
 
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String managementNo;
-
-    public void setJobDetailId(String jobDetailId)
-    {
-        this.jobDetailId = jobDetailId;
-    }
-
-    public String getJobDetailId()
-    {
-        return jobDetailId;
-    }
-
-    public void setJobId(String jobId)
+    public void setJobId(String jobId) 
     {
         this.jobId = jobId;
     }
 
-    public String getJobId()
+    public String getJobId() 
     {
         return jobId;
     }
 
-    public void setTaskNo(String taskNo)
-    {
-        this.taskNo = taskNo;
-    }
-
-    public String getTaskNo()
-    {
-        return taskNo;
-    }
-
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setInOrOut(Long inOrOut)
+    public void setTaskNo(String taskNo) 
     {
-        this.inOrOut = inOrOut;
+        this.taskNo = taskNo;
     }
 
-    public Long getInOrOut()
+    public String getTaskNo() 
     {
-        return inOrOut;
+        return taskNo;
     }
 
-    public void setTrayCode(String trayCode)
+    public void setTrayCode(String trayCode) 
     {
         this.trayCode = trayCode;
     }
 
-    public String getTrayCode()
+    public String getTrayCode() 
     {
         return trayCode;
     }
 
-    public void setStartTime(String startTime)
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
+    }
+
+    public void setTargetCargoSpaceId(String targetCargoSpaceId) 
+    {
+        this.targetCargoSpaceId = targetCargoSpaceId;
+    }
+
+    public String getTargetCargoSpaceId() 
+    {
+        return targetCargoSpaceId;
+    }
+
+    public void setStartTime(String startTime) 
     {
         this.startTime = startTime;
     }
 
-    public String getStartTime()
+    public String getStartTime() 
     {
         return startTime;
     }
 
-    public void setFinishTime(String finishTime)
+    public void setFinishTime(String finishTime) 
     {
         this.finishTime = finishTime;
     }
 
-    public String getFinishTime()
+    public String getFinishTime() 
     {
         return finishTime;
     }
 
-    public void setExitId(String exitId)
+    public void setExecutionPhase(String executionPhase) 
     {
-        this.exitId = exitId;
+        this.executionPhase = executionPhase;
     }
 
-    public String getExitId()
+    public String getExecutionPhase() 
     {
-        return exitId;
+        return executionPhase;
     }
 
-    public void setWarehouseId(String warehouseId)
+    public void setJobDetailId(String jobDetailId) 
     {
-        this.warehouseId = warehouseId;
+        this.jobDetailId = jobDetailId;
     }
 
-    public String getWarehouseId()
+    public String getJobDetailId() 
     {
-        return warehouseId;
+        return jobDetailId;
     }
 
-    public void setProductId(String productId)
+    public void setStockId(String stockId) 
     {
-        this.productId = productId;
+        this.stockId = stockId;
     }
 
-    public String getProductId()
+    public String getStockId() 
     {
-        return productId;
+        return stockId;
     }
 
-    public void setProductName(String productName)
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName()
-    {
-        return productName;
-    }
-
-    public void setParentId(String parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public String getParentId()
-    {
-        return parentId;
-    }
-
-    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 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 setProductType(String productType)
-    {
-        this.productType = productType;
-    }
-
-    public String getProductType()
-    {
-        return productType;
-    }
-
-    public void setSystemItem(String systemItem)
-    {
-        this.systemItem = systemItem;
-    }
-
-    public String getSystemItem()
-    {
-        return systemItem;
-    }
-
-    public void setProductCtm(String productCtm)
-    {
-        this.productCtm = productCtm;
-    }
-
-    public String getProductCtm()
-    {
-        return productCtm;
-    }
-
-    public void setProductCtu(String productCtu)
-    {
-        this.productCtu = productCtu;
-    }
-
-    public String getProductCtu()
-    {
-        return productCtu;
-    }
-
-    public void setUpperNum(String upperNum)
-    {
-        this.upperNum = upperNum;
-    }
-
-    public String getUpperNum()
-    {
-        return upperNum;
-    }
-
-    public void setLimitNum(String limitNum)
-    {
-        this.limitNum = limitNum;
-    }
-
-    public String getLimitNum()
-    {
-        return limitNum;
-    }
-
-    public void setEnableFlag(String enableFlag)
-    {
-        this.enableFlag = enableFlag;
-    }
-
-    public String getEnableFlag()
-    {
-        return enableFlag;
-    }
-
-    public void setOutQuantity(String outQuantity)
-    {
-        this.outQuantity = outQuantity;
-    }
-
-    public String getOutQuantity()
-    {
-        return outQuantity;
-    }
-
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setInOrOutId(String inOrOutId)
+    public void setInOrOutId(String inOrOutId) 
     {
         this.inOrOutId = inOrOutId;
     }
 
-    public String getInOrOutId()
+    public String getInOrOutId() 
     {
         return inOrOutId;
     }
 
-    public void setInOrOutDId(String inOrOutDId)
+    public void setInOrOutDId(String inOrOutDId) 
     {
         this.inOrOutDId = inOrOutDId;
     }
 
-    public String getInOrOutDId()
+    public String getInOrOutDId() 
     {
         return inOrOutDId;
     }
 
-    public void setPriceTotal(String priceTotal)
+    public void setStockStatus(String stockStatus) 
     {
-        this.priceTotal = priceTotal;
+        this.stockStatus = stockStatus;
     }
 
-    public String getPriceTotal()
+    public String getStockStatus() 
     {
-        return priceTotal;
+        return stockStatus;
     }
 
-    public void setOrigin(String origin)
+    public void setInQuantity(String inQuantity) 
     {
-        this.origin = origin;
+        this.inQuantity = inQuantity;
     }
 
-    public String getOrigin()
+    public String getInQuantity() 
     {
-        return origin;
+        return inQuantity;
     }
 
-    public void setTurnovertype(String turnovertype)
+    public void setStockQuantity(String stockQuantity) 
     {
-        this.turnovertype = turnovertype;
+        this.stockQuantity = stockQuantity;
     }
 
-    public String getTurnovertype()
+    public String getStockQuantity() 
     {
-        return turnovertype;
+        return stockQuantity;
     }
 
-    public void setAccount(String account)
+    public void setOutQuantity(String outQuantity) 
     {
-        this.account = account;
+        this.outQuantity = outQuantity;
     }
 
-    public String getAccount()
+    public String getOutQuantity() 
     {
-        return account;
+        return outQuantity;
     }
 
-    public void setPurpose(String purpose)
+    public void setSupplierNo(String supplierNo) 
     {
-        this.purpose = purpose;
+        this.supplierNo = supplierNo;
     }
 
-    public String getPurpose()
+    public String getSupplierNo() 
     {
-        return purpose;
+        return supplierNo;
     }
 
-    public void setUnits(String units)
+    public void setSupplierName(String supplierName) 
     {
-        this.units = units;
+        this.supplierName = supplierName;
     }
 
-    public String getUnits()
+    public String getSupplierName() 
     {
-        return units;
+        return supplierName;
     }
 
-    public void setContract(String contract)
+    public void setCustomerNo(String customerNo) 
     {
-        this.contract = contract;
+        this.customerNo = customerNo;
     }
 
-    public String getContract()
+    public String getCustomerNo() 
     {
-        return contract;
+        return customerNo;
     }
 
-    public void setCases(String cases)
+    public void setCustomerName(String customerName) 
     {
-        this.cases = cases;
+        this.customerName = customerName;
     }
 
-    public String getCases()
+    public String getCustomerName() 
     {
-        return cases;
+        return customerName;
     }
 
-    public void setQuality(String quality)
+    public void setProductId(String productId) 
     {
-        this.quality = quality;
+        this.productId = productId;
     }
 
-    public String getQuality()
+    public String getProductId() 
     {
-        return quality;
+        return productId;
     }
 
-    public void setManagementNo(String managementNo)
+    public void setProductName(String productName) 
     {
-        this.managementNo = managementNo;
+        this.productName = productName;
     }
 
-    public String getManagementNo()
+    public String getProductName() 
     {
-        return managementNo;
+        return productName;
+    }
+
+    public void setParentId(String parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId() 
+    {
+        return parentId;
+    }
+
+    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 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 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 setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobDetailId", getJobDetailId())
             .append("jobId", getJobId())
-            .append("taskNo", getTaskNo())
             .append("status", getStatus())
-            .append("inOrOut", getInOrOut())
+            .append("taskNo", getTaskNo())
             .append("trayCode", getTrayCode())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("targetCargoSpaceId", getTargetCargoSpaceId())
             .append("createTime", getCreateTime())
             .append("startTime", getStartTime())
             .append("finishTime", getFinishTime())
-            .append("exitId", getExitId())
-            .append("warehouseId", getWarehouseId())
+            .append("executionPhase", getExecutionPhase())
+            .append("jobDetailId", getJobDetailId())
+            .append("stockId", getStockId())
+            .append("lotNo", getLotNo())
+            .append("inOrOutId", getInOrOutId())
+            .append("inOrOutDId", getInOrOutDId())
+            .append("stockStatus", getStockStatus())
+            .append("inQuantity", getInQuantity())
+            .append("stockQuantity", getStockQuantity())
+            .append("outQuantity", getOutQuantity())
+            .append("supplierNo", getSupplierNo())
+            .append("supplierName", getSupplierName())
+            .append("customerNo", getCustomerNo())
+            .append("customerName", getCustomerName())
             .append("productId", getProductId())
             .append("productName", getProductName())
             .append("parentId", getParentId())
@@ -569,27 +539,12 @@ public class ViewOutJobFlow extends BaseEntity
             .append("unit", getUnit())
             .append("spec", getSpec())
             .append("remark", getRemark())
-            .append("productType", getProductType())
-            .append("systemItem", getSystemItem())
-            .append("productCtm", getProductCtm())
-            .append("productCtu", getProductCtu())
-            .append("upperNum", getUpperNum())
-            .append("limitNum", getLimitNum())
-            .append("enableFlag", getEnableFlag())
-            .append("outQuantity", getOutQuantity())
-            .append("lotNo", getLotNo())
-            .append("inOrOutId", getInOrOutId())
-            .append("inOrOutDId", getInOrOutDId())
-            .append("priceTotal", getPriceTotal())
-            .append("origin", getOrigin())
-            .append("turnovertype", getTurnovertype())
-            .append("account", getAccount())
-            .append("purpose", getPurpose())
-            .append("units", getUnits())
-            .append("contract", getContract())
-            .append("cases", getCases())
-            .append("quality", getQuality())
-            .append("managementNo", getManagementNo())
+            .append("spare1", getSpare1())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spare7", getSpare7())
             .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java
index 89bbda6..1982441 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java
@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 
 /**
- * 出库作业流水ControllerMapper接口
+ * 出库作业流水Mapper接口
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 public interface ViewOutJobFlowMapper 
 {
     /**
-     * 查询出库作业流水Controller
+     * 查询出库作业流水
      * 
-     * @param jobDetailId 出库作业流水Controller主键
-     * @return 出库作业流水Controller
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
-    public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId);
+    public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 查询出库作业流水Controller列表
+     * 查询出库作业流水列表
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
-     * @return 出库作业流水Controller集合
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水集合
      */
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 新增出库作业流水Controller
+     * 新增出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 修改出库作业流水Controller
+     * 修改出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 删除出库作业流水Controller
+     * 删除出库作业流水
      * 
-     * @param jobDetailId 出库作业流水Controller主键
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
-    public int deleteViewOutJobFlowByJobDetailId(String jobDetailId);
+    public int deleteViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 批量删除出库作业流水Controller
+     * 批量删除出库作业流水
      * 
-     * @param jobDetailIds 需要删除的数据主键集合
+     * @param jobIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds);
+    public int deleteViewOutJobFlowByJobIds(String[] jobIds);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java
index f135d8f..29b4b8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java
@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 
 /**
- * 出库作业流水ControllerService接口
+ * 出库作业流水Service接口
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 public interface IViewOutJobFlowService 
 {
     /**
-     * 查询出库作业流水Controller
+     * 查询出库作业流水
      * 
-     * @param jobDetailId 出库作业流水Controller主键
-     * @return 出库作业流水Controller
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
-    public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId);
+    public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 查询出库作业流水Controller列表
+     * 查询出库作业流水列表
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
-     * @return 出库作业流水Controller集合
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水集合
      */
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 新增出库作业流水Controller
+     * 新增出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 修改出库作业流水Controller
+     * 修改出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 批量删除出库作业流水Controller
+     * 批量删除出库作业流水
      * 
-     * @param jobDetailIds 需要删除的出库作业流水Controller主键集合
+     * @param jobIds 需要删除的出库作业流水主键集合
      * @return 结果
      */
-    public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds);
+    public int deleteViewOutJobFlowByJobIds(String[] jobIds);
 
     /**
-     * 删除出库作业流水Controller信息
+     * 删除出库作业流水信息
      * 
-     * @param jobDetailId 出库作业流水Controller主键
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
-    public int deleteViewOutJobFlowByJobDetailId(String jobDetailId);
+    public int deleteViewOutJobFlowByJobId(String jobId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
index 62302e5..4fa5d42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
@@ -9,10 +9,10 @@ import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
 
 /**
- * 出库作业流水ControllerService业务层处理
+ * 出库作业流水Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-10-28
+ * @date 2025-12-09
  */
 @Service
 public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService 
@@ -21,22 +21,22 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     private ViewOutJobFlowMapper viewOutJobFlowMapper;
 
     /**
-     * 查询出库作业流水Controller
+     * 查询出库作业流水
      * 
-     * @param jobDetailId 出库作业流水Controller主键
-     * @return 出库作业流水Controller
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
     @Override
-    public ViewOutJobFlow selectViewOutJobFlowByJobDetailId(String jobDetailId)
+    public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId)
     {
-        return viewOutJobFlowMapper.selectViewOutJobFlowByJobDetailId(jobDetailId);
+        return viewOutJobFlowMapper.selectViewOutJobFlowByJobId(jobId);
     }
 
     /**
-     * 查询出库作业流水Controller列表
+     * 查询出库作业流水列表
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
-     * @return 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水
      */
     @Override
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow)
@@ -45,9 +45,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 新增出库作业流水Controller
+     * 新增出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     @Override
@@ -58,9 +58,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 修改出库作业流水Controller
+     * 修改出库作业流水
      * 
-     * @param viewOutJobFlow 出库作业流水Controller
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     @Override
@@ -70,26 +70,26 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 批量删除出库作业流水Controller
+     * 批量删除出库作业流水
      * 
-     * @param jobDetailIds 需要删除的出库作业流水Controller主键
+     * @param jobIds 需要删除的出库作业流水主键
      * @return 结果
      */
     @Override
-    public int deleteViewOutJobFlowByJobDetailIds(String[] jobDetailIds)
+    public int deleteViewOutJobFlowByJobIds(String[] jobIds)
     {
-        return viewOutJobFlowMapper.deleteViewOutJobFlowByJobDetailIds(jobDetailIds);
+        return viewOutJobFlowMapper.deleteViewOutJobFlowByJobIds(jobIds);
     }
 
     /**
-     * 删除出库作业流水Controller信息
+     * 删除出库作业流水信息
      * 
-     * @param jobDetailId 出库作业流水Controller主键
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
     @Override
-    public int deleteViewOutJobFlowByJobDetailId(String jobDetailId)
+    public int deleteViewOutJobFlowByJobId(String jobId)
     {
-        return viewOutJobFlowMapper.deleteViewOutJobFlowByJobDetailId(jobDetailId);
+        return viewOutJobFlowMapper.deleteViewOutJobFlowByJobId(jobId);
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
index 0602669..4524267 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockDetail.controller;
 
+import java.util.List;
+import jakarta.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.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 库存明细查询Controller
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-09
  */
 @RestController
 @RequestMapping("/search/ViewStockDetail")
@@ -63,36 +69,6 @@ public class ViewStockDetailController extends BaseController
         return success(viewStockDetailService.selectViewStockDetailByOnlyIdentity(onlyIdentity));
     }
 
-    /**
-     * 新增库存明细查询
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockDetail:add')")
-    @Log(title = "库存明细查询", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ViewStockDetail viewStockDetail)
-    {
-        return toAjax(viewStockDetailService.insertViewStockDetail(viewStockDetail));
-    }
 
-    /**
-     * 修改库存明细查询
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockDetail:edit')")
-    @Log(title = "库存明细查询", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ViewStockDetail viewStockDetail)
-    {
-        return toAjax(viewStockDetailService.updateViewStockDetail(viewStockDetail));
-    }
 
-    /**
-     * 删除库存明细查询
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockDetail:remove')")
-    @Log(title = "库存明细查询", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{onlyIdentitys}")
-    public AjaxResult remove(@PathVariable Long[] onlyIdentitys)
-    {
-        return toAjax(viewStockDetailService.deleteViewStockDetailByOnlyIdentitys(onlyIdentitys));
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
index 024e41d..5d6d029 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -1,22 +1,19 @@
 package com.ruoyi.search.ViewStockDetail.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
+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_stock_detail
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-09
  */
 @Data
 @AllArgsConstructor
@@ -26,116 +23,349 @@ public class ViewStockDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    @Excel(name = "库存编码")
-    private String stockId;          // 库存编码
+    /** id */
+//    @Excel(name = "id")
+    private Long onlyIdentity;
 
-    @Excel(name = "账套",dictType = "account_type")
-    private String spare3;           // 账套
+    /** 库存id */
+    @Excel(name = "库存id")
+    private String stockId;
 
-    @Excel(name = "库位编码")
-    private String cargoSpaceId;     // 库位编码
+    /** 货位id */
+    @Excel(name = "货位id")
+    private String cargoSpaceId;
 
-    @Excel(name = "托盘")
-    private String trayCode;         // 托盘
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
 
-    @Excel(name = "产品编码")
-    private String productId;        // 产品编码
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
 
-    @Excel(name = "产品名称")
-    private String productName;      // 产品名称
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String quantity;
 
-    @Excel(name = "规格")
-    private String spec;             // 规格
+    /** unitPrices */
+    @Excel(name = "unitPrices")
+    private String spare5;
 
-    @Excel(name = "数量")
-    private BigDecimal quantity;     // 数量
+    /** units */
+    @Excel(name = "units")
+    private String spare6;
 
-    @Excel(name = "金额")
-    private String spare6;           // 金额
+    /** 库存状态 */
+    @Excel(name = "库存状态",dictType = "stock_status")
+    private String stockStatus;
 
-    @Excel(name = "单价")
-    private BigDecimal price;        // 单价
+    /** 物料状态 */
+    @Excel(name = "物料状态",dictType = "product_status")
+    private String productStatus;
 
-    @Excel(name = "产品状态",dictType = "turnover_type")
-    private String spare1;           // 产品状态
+    /** 批号 */
+    @Excel(name = "批号")
+    private String lotNo;
 
-    @Excel(name = "单位")
-    private String unit;             // 单位
+    /** 作业ID */
+    @Excel(name = "作业ID")
+    private String jobId;
 
-    @Excel(name = "图号")
-    private String cargoNo;          // 图号
+    /** 物料GUID */
+//    @Excel(name = "物料GUID")
+    private String productGuid;
 
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
+
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
+
+    /** 入库子单id */
+    @Excel(name = "入库子单id")
+    private String stockinDetailId;
+
+    /** 入库主单 */
+    @Excel(name = "入库主单")
+    private String stockinId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型",dictType = "in_bill_type")
+    private String inType;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String inClassId;
+
+    /** 仓库 */
+//    @Excel(name = "仓库")
+    private String warehouseId;
+
+    /** 合同号 */
     @Excel(name = "合同号")
-    private String orderId;          // 合同号
+    private String orderId;
 
-    @Excel(name = "台次")
-    private String spare5;           // 台次
-
-    @Excel(name = "件次")
-    private String power;            // 件次
-
-    @Excel(name = "质量",dictType = "quality_type")
-    private String spare8;           // 质量
-
-    @Excel(name = "常用编码")
-    private String parentId;         // 常用编码
-
-    @Excel(name = "入库单号")
-    private String stockinId;        // 入库单号
-
-    @Excel(name = "供应商名称")
-    private String supplierName;     // 供应商名称
-
-    @Excel(name = "供应商编号")
-    private String supplierNo;       // 供应商编号
-
-    @Excel(name = "仓库编码")
-    private String warehouseId;      // 仓库编码
-
-    @Excel(name = "仓库名称")
-    private String warehouseName;    // 仓库名称
 
+    /** 首次入库时间 */
     @Excel(name = "首次入库时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date inDate;             // 入库时间
+    private String inDate;
 
+    /** 最后出库时间 */
     @Excel(name = "最后出库时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date backDate;           // 出库时间
+    private String backDate;
 
-    @Excel(name = "盘点标识",dictType = "check_flag")
-    private String spare7;           // 盘点标识
+    /** 集合数据 */
+//    @Excel(name = "集合数据")
+    private String Rows;
 
-    @Excel(name = "出库时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date stackingId;       // 盘点时间
+    /** 入库主题 */
+//    @Excel(name = "入库主题")
+    private String Title;
 
-    @Excel(name = "备注")
-    private String remark;           // 备注
+    /** 入库id */
+//    @Excel(name = "入库id")
+    private String Kuin;
 
-    @Excel(name = "库存状态")
-    private String stockStatus;      // 库存状态
+    /** 入库状态 */
+//    @Excel(name = "入库状态")
+    private String Complete1;
 
-    @Excel(name = "批次号")
-    private String lotNo;            // 批次号
+    /** 申请人 */
+//    @Excel(name = "申请人")
+    private String Cateid;
 
-    private BigDecimal outQuantity;  // 出库数量
+    /** 申请日期 */
+//    @Excel(name = "申请日期")
+    private String Date3;
 
-    private String roadwayId;
-    private String theFloor;
-    private String thePlatoon;
-    private String theColumn;
-    private String supplierId;
-    private String inDateStart;
-    private String inDateEnd;
-    private String voltage;
-    private String productType;
-    private String outside;
+    /** 确认日期 */
+//    @Excel(name = "确认日期")
+    private String Date5;
+
+    /** 审批人 */
+//    @Excel(name = "审批人")
+    private String Catein;
+
+    /** 审批意见 */
+//    @Excel(name = "审批意见")
+    private String Intro2;
+
+    /** 入库备注 */
+//    @Excel(name = "入库备注")
+    private String Intro;
+
+    /** 关联其他单据id */
+//    @Excel(name = "关联其他单据id")
+    private String Caigou;
+
+    /** 添加时间 */
+//    @Excel(name = "添加时间")
+    private String Date7;
+
+    /** 库管id */
+//    @Excel(name = "库管id")
+    private String Kg;
+
+    /** 入库类别 */
+//    @Excel(name = "入库类别")
+    private String Sort1;
+
+    /** 入库编号 */
+//    @Excel(name = "入库编号")
+    private String Rkbh;
+
+    /** 审批状态 */
+//    @Excel(name = "审批状态")
+    private String Status;
+
+    /** 产品明细 */
+//    @Excel(name = "产品明细")
+    private String KuinList;
+
+    /** 客户名称 */
+//    @Excel(name = "客户名称")
+    private String sysIcusIInheritIdIidI413;
+
+    /** 磅单编号 */
+//    @Excel(name = "磅单编号")
+    private String sysIcusIInheritIdIidI414;
+
+    /** 入库车号 */
+//    @Excel(name = "入库车号")
+    private String sysIcusIInheritIdIidI415;
+
+    /** 入库明细ID */
+//    @Excel(name = "入库明细ID")
+    private Long pdDetailId;
+
+    /** 产品名称 */
+//    @Excel(name = "产品名称")
+    private String pdProductName;
+
+    /** 型号 */
+//    @Excel(name = "型号")
+    private String pdModel;
+
+    /** 单位 */
+//    @Excel(name = "单位")
+    private String pdUnit;
+
+    /** 单价 */
+//    @Excel(name = "单价")
+    private String pdUnitPrice;
+
+    /** 辅助单位 */
+//    @Excel(name = "辅助单位")
+    private String pdAuxUnit;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAttr1;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAttr2;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdQuantity;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdInQty;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAuxQuantity;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdTotalPrice;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCostUnitPrice;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdTotalPrice2;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAccountCostTotal;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAccountQuantity;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdAccountStatus;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdBatchNo;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdSerialNo;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdProdDate;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdValidDate;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdArrivalDate;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdRemark;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom1;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom2;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom3;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom4;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom5;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String pdCustom6;
+
+    /** 装卸工 */
+//    @Excel(name = "装卸工")
+    private String pdLoader;
+
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
+    /** 货位状态 */
+    @Excel(name = "货位状态",dictType = "cargo_space_status")
+    private String cargoSpaceStatus;
+
+    /** 是否锁定 */
+    @Excel(name = "是否锁定",dictType = "cargo_space_lock_status")
+    private String locked;
+
+    /** 产品分类 */
+    @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;
+
+    /** url  */
+    @Excel(name = "url ")
+    private String spare3;
+
+    /** btnurl */
+    @Excel(name = "btnurl")
     private String spare4;
 
+    /** unitjb */
+    @Excel(name = "unitjb")
+    private String spare7;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
index 69dcf19..7602eea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockDetail.mapper;
 
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 
 /**
  * 库存明细查询Mapper接口
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-09
  */
-public interface ViewStockDetailMapper
+public interface ViewStockDetailMapper 
 {
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -22,41 +21,10 @@ public interface ViewStockDetailMapper
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询集合
      */
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail);
 
-    /**
-     * 新增库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    public int insertViewStockDetail(ViewStockDetail viewStockDetail);
-
-    /**
-     * 修改库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    public int updateViewStockDetail(ViewStockDetail viewStockDetail);
-
-    /**
-     * 删除库存明细查询
-     *
-     * @param onlyIdentity 库存明细查询主键
-     * @return 结果
-     */
-    public int deleteViewStockDetailByOnlyIdentity(Long onlyIdentity);
-
-    /**
-     * 批量删除库存明细查询
-     *
-     * @param onlyIdentitys 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteViewStockDetailByOnlyIdentitys(Long[] onlyIdentitys);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
index abe24ab..32554f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockDetail.service;
 
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 
 /**
  * 库存明细查询Service接口
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-09
  */
-public interface IViewStockDetailService
+public interface IViewStockDetailService 
 {
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -22,41 +21,11 @@ public interface IViewStockDetailService
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询集合
      */
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail);
 
-    /**
-     * 新增库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    public int insertViewStockDetail(ViewStockDetail viewStockDetail);
 
-    /**
-     * 修改库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    public int updateViewStockDetail(ViewStockDetail viewStockDetail);
-
-    /**
-     * 批量删除库存明细查询
-     *
-     * @param onlyIdentitys 需要删除的库存明细查询主键集合
-     * @return 结果
-     */
-    public int deleteViewStockDetailByOnlyIdentitys(Long[] onlyIdentitys);
-
-    /**
-     * 删除库存明细查询信息
-     *
-     * @param onlyIdentity 库存明细查询主键
-     * @return 结果
-     */
-    public int deleteViewStockDetailByOnlyIdentity(Long onlyIdentity);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
index a375705..872711c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
@@ -1,29 +1,27 @@
 package com.ruoyi.search.ViewStockDetail.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper;
-import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
+import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
 
 /**
  * 库存明细查询Service业务层处理
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-09
  */
 @Service
-public class ViewStockDetailServiceImpl implements IViewStockDetailService
+public class ViewStockDetailServiceImpl implements IViewStockDetailService 
 {
     @Autowired
     private ViewStockDetailMapper viewStockDetailMapper;
 
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -35,62 +33,15 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询
      */
     @Override
-    //@DataScope(warehouseAlias = "vsd")
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail)
     {
         return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail);
     }
 
-    /**
-     * 新增库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    @Override
-    public int insertViewStockDetail(ViewStockDetail viewStockDetail)
-    {
-        return viewStockDetailMapper.insertViewStockDetail(viewStockDetail);
-    }
 
-    /**
-     * 修改库存明细查询
-     *
-     * @param viewStockDetail 库存明细查询
-     * @return 结果
-     */
-    @Override
-    public int updateViewStockDetail(ViewStockDetail viewStockDetail)
-    {
-        return viewStockDetailMapper.updateViewStockDetail(viewStockDetail);
-    }
-
-    /**
-     * 批量删除库存明细查询
-     *
-     * @param onlyIdentitys 需要删除的库存明细查询主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockDetailByOnlyIdentitys(Long[] onlyIdentitys)
-    {
-        return viewStockDetailMapper.deleteViewStockDetailByOnlyIdentitys(onlyIdentitys);
-    }
-
-    /**
-     * 删除库存明细查询信息
-     *
-     * @param onlyIdentity 库存明细查询主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockDetailByOnlyIdentity(Long onlyIdentity)
-    {
-        return viewStockDetailMapper.deleteViewStockDetailByOnlyIdentity(onlyIdentity);
-    }
 }
diff --git 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
index 41771d5..01f312a 100644
--- 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 ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 @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,20 +47,20 @@ 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 = "/{stockinId}")
@@ -69,36 +69,5 @@ public class ViewStockinHistoryController extends BaseController
         return success(viewStockinHistoryService.selectViewStockinHistoryByStockinId(stockinId));
     }
 
-    /**
-     * 新增入库单据流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:add')")
-    @Log(title = "入库单据流水", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ViewStockinHistory viewStockinHistory)
-    {
-        return toAjax(viewStockinHistoryService.insertViewStockinHistory(viewStockinHistory));
-    }
 
-    /**
-     * 修改入库单据流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:edit')")
-    @Log(title = "入库单据流水", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ViewStockinHistory viewStockinHistory)
-    {
-        return toAjax(viewStockinHistoryService.updateViewStockinHistory(viewStockinHistory));
-    }
-
-    /**
-     * 删除入库单据流水
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:remove')")
-    @Log(title = "入库单据流水", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockinIds}")
-    public AjaxResult remove(@PathVariable String[] stockinIds)
-    {
-        return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinIds(stockinIds));
-    }
 }
diff --git 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
index 12385f7..93043b6 100644
--- 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
@@ -6,23 +6,27 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 入库单据流水对象 view_stockin_history
- *
+ * 入库单据历史对象 view_stockin_history
+ * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public class ViewStockinHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 入库单号 */
-    @Excel(name = "入库单号")
+    /** 入库主单ID */
+    @Excel(name = "入库主单ID")
     private String stockinId;
 
-    /** 入库子单号 */
-    @Excel(name = "入库子单号")
+    /** 子单ID */
+    @Excel(name = "子单ID")
     private String stockinDetailId;
 
+    /** 单据状态 */
+    @Excel(name = "单据状态",dictType = "in_bill_status")
+    private String status;
+
     /** 物料编码 */
     @Excel(name = "物料编码")
     private String productId;
@@ -31,22 +35,102 @@ public class ViewStockinHistory extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String spec;
-
-    /** 生产图号 */
-    @Excel(name = "生产图号")
-    private String cargoNo;
-
-    /** 产品状态 */
-    @Excel(name = "产品状态",dictType = "product_type")
-    private String productType;
-
     /** 计划数量 */
     @Excel(name = "计划数量")
     private String quantity;
 
+    /** unitPrices */
+    @Excel(name = "unitPrices")
+    private String spare5;
+
+    /** units */
+    @Excel(name = "units")
+    private String spare6;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierNo;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型",dictType = "in_bill_type")
+    private String inType;
+
+    /** 建立时间 */
+    @Excel(name = "建立时间")
+    private String createDate;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createManId;
+
+    /** 仓库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 classNo;
+
+    /** 客户编码 */
+//    @Excel(name = "客户编码")
+    private String customerNo;
+
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 价格 */
+//    @Excel(name = "价格")
+    private String price;
+
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    private String cargoNo;
+
+    /** 单位id */
+    @Excel(name = "单位id")
+    private String unit;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spec;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String spare1;
+
+    /** url */
+    @Excel(name = "url")
+    private String spare3;
+
+    /** btnurl */
+    @Excel(name = "btnurl")
+    private String spare4;
+
+    /** unitjb */
+    @Excel(name = "unitjb")
+    private String spare7;
+
     /** 扫码数量 */
     @Excel(name = "扫码数量")
     private String scanNum;
@@ -55,360 +139,353 @@ public class ViewStockinHistory extends BaseEntity
     @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 = "账套",dictType = "account_type")
-    private String spare3;
-
-    /** 创建用户 */
-    @Excel(name = "创建用户")
-    private String createManId;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String createDate;
-
-    /** 单据状态 */
-    @Excel(name = "单据状态",dictType = "in_bill_status")
-    private String status;
-
-    /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
-    private String spare8;
-
-    /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
-    private String spare1;
-
-    /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
-    private String spare4;
-
-    /** 状态 */
-    @Excel(name = "状态",dictType = "turnover_type")
-    private String spare2;
-
-    public void setStockinId(String stockinId)
+    public void setStockinId(String stockinId) 
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId()
+    public String getStockinId() 
     {
         return stockinId;
     }
 
-    public void setStockinDetailId(String stockinDetailId)
+    public void setInType(String inType) 
     {
-        this.stockinDetailId = stockinDetailId;
+        this.inType = inType;
     }
 
-    public String getStockinDetailId()
+    public String getInType() 
     {
-        return stockinDetailId;
+        return inType;
     }
 
-    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 setSpec(String spec)
-    {
-        this.spec = spec;
-    }
-
-    public String getSpec()
-    {
-        return spec;
-    }
-
-    public void setCargoNo(String cargoNo)
-    {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getCargoNo()
-    {
-        return cargoNo;
-    }
-
-    public void setProductType(String productType)
-    {
-        this.productType = productType;
-    }
-
-    public String getProductType()
-    {
-        return productType;
-    }
-
-    public void setQuantity(String quantity)
-    {
-        this.quantity = quantity;
-    }
-
-    public String getQuantity()
-    {
-        return quantity;
-    }
-
-    public void setScanNum(String scanNum)
-    {
-        this.scanNum = scanNum;
-    }
-
-    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)
+    public void setCreateDate(String createDate) 
     {
         this.createDate = createDate;
     }
 
-    public String getCreateDate()
+    public String getCreateDate() 
     {
         return createDate;
     }
 
-    public void setStatus(String status)
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setSpare8(String spare8)
+    public void setWarehouseId(String warehouseId) 
     {
-        this.spare8 = spare8;
+        this.warehouseId = warehouseId;
     }
 
-    public String getSpare8()
+    public String getWarehouseId() 
     {
-        return spare8;
+        return warehouseId;
     }
 
-    public void setSpare1(String spare1)
+    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 setClassNo(String classNo) 
+    {
+        this.classNo = classNo;
+    }
+
+    public String getClassNo() 
+    {
+        return classNo;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSupplierNo() 
+    {
+        return supplierNo;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    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 setParentId(String parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId() 
+    {
+        return parentId;
+    }
+
+    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 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()
+    public String getSpare1() 
     {
         return spare1;
     }
 
-    public void setSpare4(String spare4)
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
     {
         this.spare4 = spare4;
     }
 
-    public String getSpare4()
+    public String getSpare4() 
     {
         return spare4;
     }
 
-    public void setSpare2(String spare2)
+    public void setSpare5(String spare5) 
     {
-        this.spare2 = spare2;
+        this.spare5 = spare5;
     }
 
-    public String getSpare2()
+    public String getSpare5() 
     {
-        return spare2;
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNum() 
+    {
+        return scanNum;
+    }
+
+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .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("classNo", getClassNo())
+            .append("customerNo", getCustomerNo())
+            .append("supplierNo", getSupplierNo())
             .append("stockinDetailId", getStockinDetailId())
             .append("productId", getProductId())
             .append("productName", getProductName())
-            .append("spec", getSpec())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
             .append("cargoNo", getCargoNo())
-            .append("productType", getProductType())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spare7", getSpare7())
             .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();
     }
 }
diff --git 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
index 3bcb7f1..8f5cf5b 100644
--- 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,55 +4,55 @@ import java.util.List;
 import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 
 /**
- * 入库单据流水Mapper接口
+ * 入库单据历史Mapper接口
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public interface ViewStockinHistoryMapper 
 {
     /**
-     * 查询入库单据流水
+     * 查询入库单据历史
      * 
-     * @param stockinId 入库单据流水主键
-     * @return 入库单据流水
+     * @param stockinId 入库单据历史主键
+     * @return 入库单据历史
      */
     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 stockinId 入库单据流水主键
+     * @param stockinId 入库单据历史主键
      * @return 结果
      */
     public int deleteViewStockinHistoryByStockinId(String stockinId);
 
     /**
-     * 批量删除入库单据流水
+     * 批量删除入库单据历史
      * 
      * @param stockinIds 需要删除的数据主键集合
      * @return 结果
diff --git 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
index 884f20f..e7339ce 100644
--- 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,27 @@ import java.util.List;
 import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 
 /**
- * 入库单据流水Service接口
+ * 入库单据历史Service接口
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public interface IViewStockinHistoryService 
 {
     /**
-     * 查询入库单据流水
+     * 查询入库单据历史
      * 
-     * @param stockinId 入库单据流水主键
-     * @return 入库单据流水
+     * @param stockinId 入库单据历史主键
+     * @return 入库单据历史
      */
     public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId);
 
     /**
-     * 查询入库单据流水列表
+     * 查询入库单据历史列表
      * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 入库单据流水集合
+     * @param viewStockinHistory 入库单据历史
+     * @return 入库单据历史集合
      */
     public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory);
 
-    /**
-     * 新增入库单据流水
-     * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 结果
-     */
-    public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory);
-
-    /**
-     * 修改入库单据流水
-     * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 结果
-     */
-    public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory);
-
-    /**
-     * 批量删除入库单据流水
-     * 
-     * @param stockinIds 需要删除的入库单据流水主键集合
-     * @return 结果
-     */
-    public int deleteViewStockinHistoryByStockinIds(String[] stockinIds);
-
-    /**
-     * 删除入库单据流水信息
-     * 
-     * @param stockinId 入库单据流水主键
-     * @return 结果
-     */
-    public int deleteViewStockinHistoryByStockinId(String stockinId);
 }
diff --git 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
index 37e63cb..f5d1f10 100644
--- 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 ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 @Service
 public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService 
@@ -20,10 +20,10 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
     private ViewStockinHistoryMapper viewStockinHistoryMapper;
 
     /**
-     * 查询入库单据流水
+     * 查询入库单据历史
      * 
-     * @param stockinId 入库单据流水主键
-     * @return 入库单据流水
+     * @param stockinId 入库单据历史主键
+     * @return 入库单据历史
      */
     @Override
     public ViewStockinHistory selectViewStockinHistoryByStockinId(String stockinId)
@@ -32,10 +32,10 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
     }
 
     /**
-     * 查询入库单据流水列表
+     * 查询入库单据历史列表
      * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 入库单据流水
+     * @param viewStockinHistory 入库单据历史
+     * @return 入库单据历史
      */
     @Override
     public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
@@ -43,51 +43,5 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
         return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory);
     }
 
-    /**
-     * 新增入库单据流水
-     * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 结果
-     */
-    @Override
-    public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory)
-    {
-        return viewStockinHistoryMapper.insertViewStockinHistory(viewStockinHistory);
-    }
 
-    /**
-     * 修改入库单据流水
-     * 
-     * @param viewStockinHistory 入库单据流水
-     * @return 结果
-     */
-    @Override
-    public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory)
-    {
-        return viewStockinHistoryMapper.updateViewStockinHistory(viewStockinHistory);
-    }
-
-    /**
-     * 批量删除入库单据流水
-     * 
-     * @param stockinIds 需要删除的入库单据流水主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockinHistoryByStockinIds(String[] stockinIds)
-    {
-        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinIds(stockinIds);
-    }
-
-    /**
-     * 删除入库单据流水信息
-     * 
-     * @param stockinId 入库单据流水主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockinHistoryByStockinId(String stockinId)
-    {
-        return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinId(stockinId);
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java
index 0548b22..6f09d0e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 出库单据历史Controller
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 @RestController
 @RequestMapping("/search/ViewStockoutHistory")
@@ -69,36 +69,4 @@ public class ViewStockoutHistoryController extends BaseController
         return success(viewStockoutHistoryService.selectViewStockoutHistoryByStockoutId(stockoutId));
     }
 
-    /**
-     * 新增出库单据历史
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:add')")
-    @Log(title = "出库单据历史", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ViewStockoutHistory viewStockoutHistory)
-    {
-        return toAjax(viewStockoutHistoryService.insertViewStockoutHistory(viewStockoutHistory));
-    }
-
-    /**
-     * 修改出库单据历史
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:edit')")
-    @Log(title = "出库单据历史", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ViewStockoutHistory viewStockoutHistory)
-    {
-        return toAjax(viewStockoutHistoryService.updateViewStockoutHistory(viewStockoutHistory));
-    }
-
-    /**
-     * 删除出库单据历史
-     */
-    @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:remove')")
-    @Log(title = "出库单据历史", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockoutIds}")
-    public AjaxResult remove(@PathVariable String[] stockoutIds)
-    {
-        return toAjax(viewStockoutHistoryService.deleteViewStockoutHistoryByStockoutIds(stockoutIds));
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
index 4f5289a..fcb228f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
@@ -8,20 +8,20 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 出库单据历史对象 view_stockout_history
- *
+ * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public class ViewStockoutHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 出库单号 */
-    @Excel(name = "出库单号")
+    /** 出库订单ID */
+    @Excel(name = "出库订单ID")
     private String stockoutId;
 
-    /** 出库子单号 */
-    @Excel(name = "出库子单号")
+    /** 子单id */
+    @Excel(name = "子单id")
     private String stockoutDetailId;
 
     /** 物料编码 */
@@ -32,444 +32,461 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String cargoNo;
-
-    /** 物料状态 */
-    @Excel(name = "物料状态",dictType = "product_type")
-    private String productType;
-
-    /** 出库数量 */
-    @Excel(name = "出库数量")
+    /** 数量 */
+    @Excel(name = "数量")
     private BigDecimal quantity;
 
-    /** 分配数量 */
-    @Excel(name = "分配数量")
-    private BigDecimal allotQuantity;
+    /** unitPrices */
+    @Excel(name = "unitPrices")
+    private String spare5;
 
-    /** 实际数量 */
-    @Excel(name = "实际数量")
-    private BigDecimal assignNum;
+    /** units */
+    @Excel(name = "units")
+    private String spare6;
 
-    /** 合同号 */
-    @Excel(name = "合同号")
-    private String contract;
+    /** 出库类型 */
+    @Excel(name = "出库类型",dictType = "out_bill_type")
+    private String outType;
 
-    /** 台次 */
-    @Excel(name = "台次")
-    private String power;
-
-    /** 件次 */
-    @Excel(name = "件次")
-    private String phase;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private String price;
-
-    /** 出库金额 */
-    @Excel(name = "出库金额")
-    private String priceTotal;
-
-    /** 客户编码 */
-    @Excel(name = "客户编码")
-    private String customerNo;
-
-    /** 客户名称 */
-    @Excel(name = "客户名称")
-    private String customerName;
-
-    /** 单据状态 */
-    @Excel(name = "单据状态",dictType = "out_bill_status")
-    private String status;
+    /** 建立时间 */
+    @Excel(name = "建立时间")
+    private String createDate;
 
     /** 创建人 */
     @Excel(name = "创建人")
     private String createManId;
 
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String createDate;
+    /** 单据状态 */
+    @Excel(name = "单据状态",dictType = "out_bill_status")
+    private String status;
 
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
+    /** 供应商编号 */
+    @Excel(name = "供应商编号")
+    private String supplierNo;
 
-    /** 套账 */
-    @Excel(name = "套账",dictType = "account_type")
-    private String account;
-
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String managementNo;
-
-    /** 供应商编码 */
-    @Excel(name = "供应商编码")
-    private String supplierId;
-
-    /** 供应商 */
-    @Excel(name = "供应商")
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
     private String supplierName;
 
-    /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
-    private String purpose;
+    /** 客户编号 */
+    @Excel(name = "客户编号")
+    private String customerNo;
 
-    /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
-    private String quality;
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String contactName;
 
-    /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
-    private String source;
+    /** 单据来源 */
+    @Excel(name = "单据来源")
+    private String stockoutSource;
 
-    /** 状态 */
-    @Excel(name = "状态",dictType = "turnover_type")
-    private String turnoverStatus;
+    /** 出口 */
+    @Excel(name = "出口")
+    private String exitId;
 
-    /** 用途2 */
-    @Excel(name = "用途2")
-    private String purpose2;
+    /** 单据主题 */
+    @Excel(name = "单据主题")
+    private String FID;
 
-    public void setStockoutId(String stockoutId)
+    /** erp出库id */
+    @Excel(name = "erp出库id")
+    private String erpStockoutId;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String lotNo;
+
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private BigDecimal assignNum;
+
+    /** 分配数量 */
+    @Excel(name = "分配数量")
+    private BigDecimal allotQuantity;
+
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 价格 */
+    @Excel(name = "价格")
+    private String price;
+
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    private String cargoNo;
+
+    /** 单位id */
+    @Excel(name = "单位id")
+    private String unit;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spec;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String spare1;
+
+    /** url */
+    @Excel(name = "url")
+    private String spare3;
+
+    /** btnurl */
+    @Excel(name = "btnurl")
+    private String spare4;
+
+    /** unitjb */
+    @Excel(name = "unitjb")
+    private String spare7;
+
+
+
+    public void setStockoutId(String stockoutId) 
     {
         this.stockoutId = stockoutId;
     }
 
-    public String getStockoutId()
+    public String getStockoutId() 
     {
         return stockoutId;
     }
 
-    public void setStockoutDetailId(String stockoutDetailId)
+    public void setOutType(String outType) 
     {
-        this.stockoutDetailId = stockoutDetailId;
+        this.outType = outType;
     }
 
-    public String getStockoutDetailId()
+    public String getOutType() 
     {
-        return stockoutDetailId;
+        return outType;
     }
 
-    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 setSpec(String spec)
-    {
-        this.spec = spec;
-    }
-
-    public String getSpec()
-    {
-        return spec;
-    }
-
-    public void setCargoNo(String cargoNo)
-    {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getCargoNo()
-    {
-        return cargoNo;
-    }
-
-    public void setProductType(String productType)
-    {
-        this.productType = productType;
-    }
-
-    public String getProductType()
-    {
-        return productType;
-    }
-
-    public void setQuantity(BigDecimal quantity)
-    {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getQuantity()
-    {
-        return quantity;
-    }
-
-    public void setAllotQuantity(BigDecimal allotQuantity)
-    {
-        this.allotQuantity = allotQuantity;
-    }
-
-    public BigDecimal getAllotQuantity()
-    {
-        return allotQuantity;
-    }
-
-    public void setAssignNum(BigDecimal assignNum)
-    {
-        this.assignNum = assignNum;
-    }
-
-    public BigDecimal getAssignNum()
-    {
-        return assignNum;
-    }
-
-    public void setContract(String contract)
-    {
-        this.contract = contract;
-    }
-
-    public String getContract()
-    {
-        return contract;
-    }
-
-    public void setPower(String power)
-    {
-        this.power = power;
-    }
-
-    public String getPower()
-    {
-        return power;
-    }
-
-    public void setPhase(String phase)
-    {
-        this.phase = phase;
-    }
-
-    public String getPhase()
-    {
-        return phase;
-    }
-
-    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 setCustomerNo(String customerNo)
-    {
-        this.customerNo = customerNo;
-    }
-
-    public String getCustomerNo()
-    {
-        return customerNo;
-    }
-
-    public void setCustomerName(String customerName)
-    {
-        this.customerName = customerName;
-    }
-
-    public String getCustomerName()
-    {
-        return customerName;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setCreateManId(String createManId)
-    {
-        this.createManId = createManId;
-    }
-
-    public String getCreateManId()
-    {
-        return createManId;
-    }
-
-    public void setCreateDate(String createDate)
+    public void setCreateDate(String createDate) 
     {
         this.createDate = createDate;
     }
 
-    public String getCreateDate()
+    public String getCreateDate() 
     {
         return createDate;
     }
 
-    public void setUnit(String unit)
+    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 setStockoutSource(String stockoutSource) 
+    {
+        this.stockoutSource = stockoutSource;
+    }
+
+    public String getStockoutSource() 
+    {
+        return stockoutSource;
+    }
+
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
+    }
+
+    public String getExitId() 
+    {
+        return exitId;
+    }
+
+    public void setFID(String FID) 
+    {
+        this.FID = FID;
+    }
+
+    public String getFID() 
+    {
+        return FID;
+    }
+
+    public void setErpStockoutId(String erpStockoutId) 
+    {
+        this.erpStockoutId = erpStockoutId;
+    }
+
+    public String getErpStockoutId() 
+    {
+        return erpStockoutId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) 
+    {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    public String getStockoutDetailId() 
+    {
+        return stockoutDetailId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setQuantity(BigDecimal quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setAssignNum(BigDecimal assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public BigDecimal getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAllotQuantity(BigDecimal allotQuantity) 
+    {
+        this.allotQuantity = allotQuantity;
+    }
+
+    public BigDecimal getAllotQuantity() 
+    {
+        return allotQuantity;
+    }
+
+    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 setParentId(String parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId() 
+    {
+        return parentId;
+    }
+
+    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 setUnit(String unit) 
     {
         this.unit = unit;
     }
 
-    public String getUnit()
+    public String getUnit() 
     {
         return unit;
     }
 
-    public void setAccount(String account)
+    public void setSpec(String spec) 
     {
-        this.account = account;
+        this.spec = spec;
     }
 
-    public String getAccount()
+    public String getSpec() 
     {
-        return account;
+        return spec;
     }
 
-    public void setManagementNo(String managementNo)
+    public void setSpare1(String spare1) 
     {
-        this.managementNo = managementNo;
+        this.spare1 = spare1;
     }
 
-    public String getManagementNo()
+    public String getSpare1() 
     {
-        return managementNo;
+        return spare1;
     }
 
-    public void setSupplierId(String supplierId)
+    public void setSpare3(String spare3) 
     {
-        this.supplierId = supplierId;
+        this.spare3 = spare3;
     }
 
-    public String getSupplierId()
+    public String getSpare3() 
     {
-        return supplierId;
+        return spare3;
     }
 
-    public void setSupplierName(String supplierName)
+    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 setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSupplierNo() 
+    {
+        return supplierNo;
+    }
+
+    public void setSupplierName(String supplierName) 
     {
         this.supplierName = supplierName;
     }
 
-    public String getSupplierName()
+    public String getSupplierName() 
     {
         return supplierName;
     }
 
-    public void setPurpose(String purpose)
+    public void setCustomerNo(String customerNo) 
     {
-        this.purpose = purpose;
+        this.customerNo = customerNo;
     }
 
-    public String getPurpose()
+    public String getCustomerNo() 
     {
-        return purpose;
+        return customerNo;
     }
 
-    public void setQuality(String quality)
+    public void setContactName(String contactName) 
     {
-        this.quality = quality;
+        this.contactName = contactName;
     }
 
-    public String getQuality()
+    public String getContactName() 
     {
-        return quality;
-    }
-
-    public void setSource(String source)
-    {
-        this.source = source;
-    }
-
-    public String getSource()
-    {
-        return source;
-    }
-
-    public void setTurnoverStatus(String turnoverStatus)
-    {
-        this.turnoverStatus = turnoverStatus;
-    }
-
-    public String getTurnoverStatus()
-    {
-        return turnoverStatus;
-    }
-
-    public void setPurpose2(String purpose2)
-    {
-        this.purpose2 = purpose2;
-    }
-
-    public String getPurpose2()
-    {
-        return purpose2;
+        return contactName;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("stockoutId", getStockoutId())
+            .append("outType", getOutType())
+            .append("createDate", getCreateDate())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("stockoutSource", getStockoutSource())
+            .append("exitId", getExitId())
+            .append("FID", getFID())
+            .append("erpStockoutId", getErpStockoutId())
             .append("stockoutDetailId", getStockoutDetailId())
+            .append("lotNo", getLotNo())
+            .append("quantity", getQuantity())
+            .append("assignNum", getAssignNum())
+            .append("allotQuantity", getAllotQuantity())
             .append("productId", getProductId())
             .append("productName", getProductName())
-            .append("spec", getSpec())
-            .append("cargoNo", getCargoNo())
-            .append("productType", getProductType())
-            .append("quantity", getQuantity())
-            .append("allotQuantity", getAllotQuantity())
-            .append("assignNum", getAssignNum())
-            .append("contract", getContract())
-            .append("power", getPower())
-            .append("phase", getPhase())
+            .append("parentId", getParentId())
             .append("price", getPrice())
-            .append("priceTotal", getPriceTotal())
-            .append("customerNo", getCustomerNo())
-            .append("customerName", getCustomerName())
-            .append("status", getStatus())
-            .append("createManId", getCreateManId())
-            .append("createDate", getCreateDate())
+            .append("cargoNo", getCargoNo())
             .append("unit", getUnit())
-            .append("account", getAccount())
-            .append("managementNo", getManagementNo())
-            .append("supplierId", getSupplierId())
-            .append("supplierName", getSupplierName())
+            .append("spec", getSpec())
             .append("remark", getRemark())
-            .append("purpose", getPurpose())
-            .append("quality", getQuality())
-            .append("source", getSource())
-            .append("turnoverStatus", getTurnoverStatus())
-            .append("purpose2", getPurpose2())
+            .append("spare1", getSpare1())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spare7", getSpare7())
+            .append("supplierNo", getSupplierNo())
+            .append("supplierName", getSupplierName())
+            .append("customerNo", getCustomerNo())
+            .append("contactName", getContactName())
             .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java
index 7bfc061..71b9612 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
  * 出库单据历史Mapper接口
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public interface ViewStockoutHistoryMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
index 6cd553c..cb884a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
@@ -7,7 +7,7 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
  * 出库单据历史Service接口
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 public interface IViewStockoutHistoryService 
 {
@@ -26,36 +26,4 @@ public interface IViewStockoutHistoryService
      * @return 出库单据历史集合
      */
     public List<ViewStockoutHistory> selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory);
-
-    /**
-     * 新增出库单据历史
-     * 
-     * @param viewStockoutHistory 出库单据历史
-     * @return 结果
-     */
-    public int insertViewStockoutHistory(ViewStockoutHistory viewStockoutHistory);
-
-    /**
-     * 修改出库单据历史
-     * 
-     * @param viewStockoutHistory 出库单据历史
-     * @return 结果
-     */
-    public int updateViewStockoutHistory(ViewStockoutHistory viewStockoutHistory);
-
-    /**
-     * 批量删除出库单据历史
-     * 
-     * @param stockoutIds 需要删除的出库单据历史主键集合
-     * @return 结果
-     */
-    public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds);
-
-    /**
-     * 删除出库单据历史信息
-     * 
-     * @param stockoutId 出库单据历史主键
-     * @return 结果
-     */
-    public int deleteViewStockoutHistoryByStockoutId(String stockoutId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java
index bb73de4..25f6031 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java
@@ -11,7 +11,7 @@ import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
  * 出库单据历史Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-10-27
+ * @date 2025-12-09
  */
 @Service
 public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService 
@@ -43,51 +43,4 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
         return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory);
     }
 
-    /**
-     * 新增出库单据历史
-     * 
-     * @param viewStockoutHistory 出库单据历史
-     * @return 结果
-     */
-    @Override
-    public int insertViewStockoutHistory(ViewStockoutHistory viewStockoutHistory)
-    {
-        return viewStockoutHistoryMapper.insertViewStockoutHistory(viewStockoutHistory);
-    }
-
-    /**
-     * 修改出库单据历史
-     * 
-     * @param viewStockoutHistory 出库单据历史
-     * @return 结果
-     */
-    @Override
-    public int updateViewStockoutHistory(ViewStockoutHistory viewStockoutHistory)
-    {
-        return viewStockoutHistoryMapper.updateViewStockoutHistory(viewStockoutHistory);
-    }
-
-    /**
-     * 批量删除出库单据历史
-     * 
-     * @param stockoutIds 需要删除的出库单据历史主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds)
-    {
-        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutIds(stockoutIds);
-    }
-
-    /**
-     * 删除出库单据历史信息
-     * 
-     * @param stockoutId 出库单据历史主键
-     * @return 结果
-     */
-    @Override
-    public int deleteViewStockoutHistoryByStockoutId(String stockoutId)
-    {
-        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutId(stockoutId);
-    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index ce8f54d..29569f2 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -5,17 +5,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
     
     <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
-        <result property="jobDetailId"    column="job_detail_id"    />
         <result property="jobId"    column="job_id"    />
-        <result property="taskNo"    column="task_no"    />
         <result property="status"    column="status"    />
-        <result property="inOrOut"    column="in_or_out"    />
+        <result property="taskNo"    column="task_no"    />
         <result property="trayCode"    column="tray_code"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="customerName"    column="customer_name"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
         <result property="parentId"    column="parent_id"    />
@@ -24,224 +36,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="spec"    column="spec"    />
         <result property="remark"    column="remark"    />
-        <result property="productType"    column="productType"    />
-        <result property="systemItem"    column="systemItem"    />
-        <result property="productCtm"    column="productCtm"    />
-        <result property="productCtu"    column="productCtu"    />
-        <result property="upperNum"    column="upperNum"    />
-        <result property="limitNum"    column="limitNum"    />
-        <result property="enableFlag"    column="enableFlag"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="priceTotal"    column="priceTotal"    />
-        <result property="origin"    column="origin"    />
-        <result property="turnovertype"    column="turnovertype"    />
-        <result property="account"    column="account"    />
-        <result property="purpose"    column="purpose"    />
-        <result property="units"    column="units"    />
-        <result property="contract"    column="contract"    />
-        <result property="cases"    column="cases"    />
-        <result property="quality"    column="quality"    />
-        <result property="managementNo"    column="managementNo"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, in_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_in_job_flow
+        select job_id, status, tray_code, cargo_space_id, target_cargo_space_id, create_time, start_time, finish_time, execution_phase, job_detail_id, stock_id, lot_no, in_or_out_id, in_or_out_d_id, stock_status, in_quantity, stock_quantity, out_quantity, supplier_no, supplier_name, customer_no, customer_name, parent_id, price, cargo_no, unit, spec, remark, spare1, spare3, spare4, spare5, spare6, spare7, product_id, product_name,task_no from view_in_job_flow
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
         <where>  
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</if>
             <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
             <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</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="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
             <if test="price != null  and price != ''"> and price = #{price}</if>
             <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="productType != null  and productType != ''"> and productType = #{productType}</if>
-            <if test="systemItem != null  and systemItem != ''"> and systemItem = #{systemItem}</if>
-            <if test="productCtm != null  and productCtm != ''"> and productCtm = #{productCtm}</if>
-            <if test="productCtu != null  and productCtu != ''"> and productCtu = #{productCtu}</if>
-            <if test="upperNum != null  and upperNum != ''"> and upperNum = #{upperNum}</if>
-            <if test="limitNum != null  and limitNum != ''"> and limitNum = #{limitNum}</if>
-            <if test="enableFlag != null  and enableFlag != ''"> and enableFlag = #{enableFlag}</if>
-            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="priceTotal != null  and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
-            <if test="origin != null  and origin != ''"> and origin = #{origin}</if>
-            <if test="turnovertype != null  and turnovertype != ''"> and turnovertype = #{turnovertype}</if>
-            <if test="account != null  and account != ''"> and account = #{account}</if>
-            <if test="purpose != null  and purpose != ''"> and purpose = #{purpose}</if>
-            <if test="units != null  and units != ''"> and units = #{units}</if>
-            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
-            <if test="cases != null  and cases != ''"> and cases = #{cases}</if>
-            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
-            <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</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="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
         </where>
     </select>
     
-    <select id="selectViewInJobFlowByJobDetailId" parameterType="String" resultMap="ViewInJobFlowResult">
+    <select id="selectViewInJobFlowByJobId" parameterType="String" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
-        where job_detail_id = #{jobDetailId}
+        where job_id = #{jobId}
     </select>
 
-    <insert id="insertViewInJobFlow" parameterType="ViewInJobFlow">
-        insert into view_in_job_flow
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null">job_detail_id,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="inOrOut != null">in_or_out,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="entranceId != null">entrance_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
-            <if test="remark != null">remark,</if>
-            <if test="productType != null">productType,</if>
-            <if test="systemItem != null">systemItem,</if>
-            <if test="productCtm != null">productCtm,</if>
-            <if test="productCtu != null">productCtu,</if>
-            <if test="upperNum != null">upperNum,</if>
-            <if test="limitNum != null">limitNum,</if>
-            <if test="enableFlag != null">enableFlag,</if>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="priceTotal != null">priceTotal,</if>
-            <if test="origin != null">origin,</if>
-            <if test="turnovertype != null">turnovertype,</if>
-            <if test="account != null">account,</if>
-            <if test="purpose != null">purpose,</if>
-            <if test="units != null">units,</if>
-            <if test="contract != null">contract,</if>
-            <if test="cases != null">cases,</if>
-            <if test="quality != null">quality,</if>
-            <if test="managementNo != null">managementNo,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null">#{jobDetailId},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="entranceId != null">#{entranceId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="productType != null">#{productType},</if>
-            <if test="systemItem != null">#{systemItem},</if>
-            <if test="productCtm != null">#{productCtm},</if>
-            <if test="productCtu != null">#{productCtu},</if>
-            <if test="upperNum != null">#{upperNum},</if>
-            <if test="limitNum != null">#{limitNum},</if>
-            <if test="enableFlag != null">#{enableFlag},</if>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="priceTotal != null">#{priceTotal},</if>
-            <if test="origin != null">#{origin},</if>
-            <if test="turnovertype != null">#{turnovertype},</if>
-            <if test="account != null">#{account},</if>
-            <if test="purpose != null">#{purpose},</if>
-            <if test="units != null">#{units},</if>
-            <if test="contract != null">#{contract},</if>
-            <if test="cases != null">#{cases},</if>
-            <if test="quality != null">#{quality},</if>
-            <if test="managementNo != null">#{managementNo},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewInJobFlow" parameterType="ViewInJobFlow">
-        update view_in_job_flow
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="productType != null">productType = #{productType},</if>
-            <if test="systemItem != null">systemItem = #{systemItem},</if>
-            <if test="productCtm != null">productCtm = #{productCtm},</if>
-            <if test="productCtu != null">productCtu = #{productCtu},</if>
-            <if test="upperNum != null">upperNum = #{upperNum},</if>
-            <if test="limitNum != null">limitNum = #{limitNum},</if>
-            <if test="enableFlag != null">enableFlag = #{enableFlag},</if>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="priceTotal != null">priceTotal = #{priceTotal},</if>
-            <if test="origin != null">origin = #{origin},</if>
-            <if test="turnovertype != null">turnovertype = #{turnovertype},</if>
-            <if test="account != null">account = #{account},</if>
-            <if test="purpose != null">purpose = #{purpose},</if>
-            <if test="units != null">units = #{units},</if>
-            <if test="contract != null">contract = #{contract},</if>
-            <if test="cases != null">cases = #{cases},</if>
-            <if test="quality != null">quality = #{quality},</if>
-            <if test="managementNo != null">managementNo = #{managementNo},</if>
-        </trim>
-        where job_detail_id = #{jobDetailId}
-    </update>
-
-    <delete id="deleteViewInJobFlowByJobDetailId" parameterType="String">
-        delete from view_in_job_flow where job_detail_id = #{jobDetailId}
-    </delete>
-
-    <delete id="deleteViewInJobFlowByJobDetailIds" parameterType="String">
-        delete from view_in_job_flow where job_detail_id in 
-        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
-            #{jobDetailId}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
index 711ba77..db5f111 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -5,17 +5,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
     
     <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
-        <result property="jobDetailId"    column="job_detail_id"    />
         <result property="jobId"    column="job_id"    />
-        <result property="taskNo"    column="task_no"    />
         <result property="status"    column="status"    />
-        <result property="inOrOut"    column="in_or_out"    />
+        <result property="taskNo"    column="task_no"    />
         <result property="trayCode"    column="tray_code"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="customerName"    column="customer_name"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
         <result property="parentId"    column="parent_id"    />
@@ -24,96 +36,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="spec"    column="spec"    />
         <result property="remark"    column="remark"    />
-        <result property="productType"    column="productType"    />
-        <result property="systemItem"    column="systemItem"    />
-        <result property="productCtm"    column="productCtm"    />
-        <result property="productCtu"    column="productCtu"    />
-        <result property="upperNum"    column="upperNum"    />
-        <result property="limitNum"    column="limitNum"    />
-        <result property="enableFlag"    column="enableFlag"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
-        <result property="priceTotal"    column="priceTotal"    />
-        <result property="origin"    column="origin"    />
-        <result property="turnovertype"    column="turnovertype"    />
-        <result property="account"    column="account"    />
-        <result property="purpose"    column="purpose"    />
-        <result property="units"    column="units"    />
-        <result property="contract"    column="contract"    />
-        <result property="cases"    column="cases"    />
-        <result property="quality"    column="quality"    />
-        <result property="managementNo"    column="managementNo"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_out_job_flow
+        select job_id, status, task_no, tray_code, cargo_space_id, target_cargo_space_id, create_time, start_time, finish_time, execution_phase, job_detail_id, stock_id, lot_no, in_or_out_id, in_or_out_d_id, stock_status, in_quantity, stock_quantity, out_quantity, supplier_no, supplier_name, customer_no, customer_name, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, spare1, spare3, spare4, spare5, spare6, spare7 from view_out_job_flow
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
         <where>  
-            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</if>
             <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
             <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
             <if test="price != null  and price != ''"> and price = #{price}</if>
             <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="productType != null  and productType != ''"> and productType = #{productType}</if>
-            <if test="systemItem != null  and systemItem != ''"> and systemItem = #{systemItem}</if>
-            <if test="productCtm != null  and productCtm != ''"> and productCtm = #{productCtm}</if>
-            <if test="productCtu != null  and productCtu != ''"> and productCtu = #{productCtu}</if>
-            <if test="upperNum != null  and upperNum != ''"> and upperNum = #{upperNum}</if>
-            <if test="limitNum != null  and limitNum != ''"> and limitNum = #{limitNum}</if>
-            <if test="enableFlag != null  and enableFlag != ''"> and enableFlag = #{enableFlag}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
-            <if test="priceTotal != null  and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
-            <if test="origin != null  and origin != ''"> and origin = #{origin}</if>
-            <if test="turnovertype != null  and turnovertype != ''"> and turnovertype = #{turnovertype}</if>
-            <if test="account != null  and account != ''"> and account = #{account}</if>
-            <if test="purpose != null  and purpose != ''"> and purpose = #{purpose}</if>
-            <if test="units != null  and units != ''"> and units = #{units}</if>
-            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
-            <if test="cases != null  and cases != ''"> and cases = #{cases}</if>
-            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
-            <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</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="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
         </where>
     </select>
     
-    <select id="selectViewOutJobFlowByJobDetailId" parameterType="String" resultMap="ViewOutJobFlowResult">
+    <select id="selectViewOutJobFlowByJobId" parameterType="String" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
-        where job_detail_id = #{jobDetailId}
+        where job_id = #{jobId}
     </select>
 
     <insert id="insertViewOutJobFlow" parameterType="ViewOutJobFlow">
         insert into view_out_job_flow
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null">job_detail_id,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="jobId != null and jobId != ''">job_id,</if>
             <if test="status != null and status != ''">status,</if>
-            <if test="inOrOut != null">in_or_out,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
             <if test="trayCode != null">tray_code,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="startTime != null">start_time,</if>
             <if test="finishTime != null">finish_time,</if>
-            <if test="exitId != null">exit_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="executionPhase != null">execution_phase,</if>
+            <if test="jobDetailId != null">job_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="customerName != null">customer_name,</if>
             <if test="productId != null">product_id,</if>
             <if test="productName != null">product_name,</if>
             <if test="parentId != null">parent_id,</if>
@@ -122,40 +128,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit,</if>
             <if test="spec != null">spec,</if>
             <if test="remark != null">remark,</if>
-            <if test="productType != null">productType,</if>
-            <if test="systemItem != null">systemItem,</if>
-            <if test="productCtm != null">productCtm,</if>
-            <if test="productCtu != null">productCtu,</if>
-            <if test="upperNum != null">upperNum,</if>
-            <if test="limitNum != null">limitNum,</if>
-            <if test="enableFlag != null">enableFlag,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
-            <if test="priceTotal != null">priceTotal,</if>
-            <if test="origin != null">origin,</if>
-            <if test="turnovertype != null">turnovertype,</if>
-            <if test="account != null">account,</if>
-            <if test="purpose != null">purpose,</if>
-            <if test="units != null">units,</if>
-            <if test="contract != null">contract,</if>
-            <if test="cases != null">cases,</if>
-            <if test="quality != null">quality,</if>
-            <if test="managementNo != null">managementNo,</if>
+            <if test="spare1 != null">spare1,</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="spare7 != null">spare7,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jobDetailId != null">#{jobDetailId},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
             <if test="status != null and status != ''">#{status},</if>
-            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
             <if test="trayCode != null">#{trayCode},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="finishTime != null">#{finishTime},</if>
-            <if test="exitId != null">#{exitId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="executionPhase != null">#{executionPhase},</if>
+            <if test="jobDetailId != null">#{jobDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="customerName != null">#{customerName},</if>
             <if test="productId != null">#{productId},</if>
             <if test="productName != null">#{productName},</if>
             <if test="parentId != null">#{parentId},</if>
@@ -164,43 +167,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">#{unit},</if>
             <if test="spec != null">#{spec},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="productType != null">#{productType},</if>
-            <if test="systemItem != null">#{systemItem},</if>
-            <if test="productCtm != null">#{productCtm},</if>
-            <if test="productCtu != null">#{productCtu},</if>
-            <if test="upperNum != null">#{upperNum},</if>
-            <if test="limitNum != null">#{limitNum},</if>
-            <if test="enableFlag != null">#{enableFlag},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
-            <if test="priceTotal != null">#{priceTotal},</if>
-            <if test="origin != null">#{origin},</if>
-            <if test="turnovertype != null">#{turnovertype},</if>
-            <if test="account != null">#{account},</if>
-            <if test="purpose != null">#{purpose},</if>
-            <if test="units != null">#{units},</if>
-            <if test="contract != null">#{contract},</if>
-            <if test="cases != null">#{cases},</if>
-            <if test="quality != null">#{quality},</if>
-            <if test="managementNo != null">#{managementNo},</if>
+            <if test="spare1 != null">#{spare1},</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="spare7 != null">#{spare7},</if>
          </trim>
     </insert>
 
     <update id="updateViewOutJobFlow" parameterType="ViewOutJobFlow">
         update view_out_job_flow
         <trim prefix="SET" suffixOverrides=",">
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
             <if test="status != null and status != ''">status = #{status},</if>
-            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
+            <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
             <if test="productId != null">product_id = #{productId},</if>
             <if test="productName != null">product_name = #{productName},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
@@ -209,39 +209,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit = #{unit},</if>
             <if test="spec != null">spec = #{spec},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="productType != null">productType = #{productType},</if>
-            <if test="systemItem != null">systemItem = #{systemItem},</if>
-            <if test="productCtm != null">productCtm = #{productCtm},</if>
-            <if test="productCtu != null">productCtu = #{productCtu},</if>
-            <if test="upperNum != null">upperNum = #{upperNum},</if>
-            <if test="limitNum != null">limitNum = #{limitNum},</if>
-            <if test="enableFlag != null">enableFlag = #{enableFlag},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
-            <if test="priceTotal != null">priceTotal = #{priceTotal},</if>
-            <if test="origin != null">origin = #{origin},</if>
-            <if test="turnovertype != null">turnovertype = #{turnovertype},</if>
-            <if test="account != null">account = #{account},</if>
-            <if test="purpose != null">purpose = #{purpose},</if>
-            <if test="units != null">units = #{units},</if>
-            <if test="contract != null">contract = #{contract},</if>
-            <if test="cases != null">cases = #{cases},</if>
-            <if test="quality != null">quality = #{quality},</if>
-            <if test="managementNo != null">managementNo = #{managementNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</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="spare7 != null">spare7 = #{spare7},</if>
         </trim>
-        where job_detail_id = #{jobDetailId}
+        where job_id = #{jobId}
     </update>
 
-    <delete id="deleteViewOutJobFlowByJobDetailId" parameterType="String">
-        delete from view_out_job_flow where job_detail_id = #{jobDetailId}
+    <delete id="deleteViewOutJobFlowByJobId" parameterType="String">
+        delete from view_out_job_flow where job_id = #{jobId}
     </delete>
 
-    <delete id="deleteViewOutJobFlowByJobDetailIds" parameterType="String">
-        delete from view_out_job_flow where job_detail_id in 
-        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
-            #{jobDetailId}
+    <delete id="deleteViewOutJobFlowByJobIds" parameterType="String">
+        delete from view_out_job_flow where job_id in 
+        <foreach item="jobId" collection="array" open="(" separator="," close=")">
+            #{jobId}
         </foreach>
     </delete>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
index 5694d7a..5bde707 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -3,263 +3,195 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
-
+    
     <resultMap type="ViewStockDetail" id="ViewStockDetailResult">
-        <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" />
-        <!-- 与 BasStock 不符的字段已注释 -->
-        <!-- <result property="spec" column="spec" /> -->
-        <result property="quantity" column="quantity" />
-        <!-- <result property="price" column="price" /> -->
-        <!-- <result property="unit" column="unit" /> -->
-        <!-- <result property="cargoNo" column="cargo_no" /> -->
-        <result property="orderId" column="order_id" />
-        <!-- bs.power 字段与 BasStock 不一致，已注释 -->
-        <!-- <result property="power" column="power_col" /> -->
-        <!-- <result property="parentId" column="parent_id" /> -->
-        <result property="stockinId" column="stockin_id" />
-        <!-- 供应商相关字段与 BasStock 不符，已注释 -->
-        <!-- <result property="supplierName" column="supplier_name" /> -->
-        <!-- <result property="supplierNo" column="supplier_no" /> -->
-        <result property="warehouseId" column="warehouse_id" />
-        <result property="warehouseName" column="warehouse_name" />
-        <result property="inDate" column="in_date" />
-        <!-- stackingId 非 BasStock 字段，已注释 -->
-        <!-- <result property="stackingId" column="stacking_id" /> -->
-        <result property="backDate" column="back_date" />
-        <!-- 备注字段使用 pd_remark（明细）或保留在 BasStock 中，基于适配需求先注释 remark -->
-        <!-- <result property="remark" column="remark" /> -->
-        <result property="stockId" column="stock_id" />
-        <result property="stockStatus" column="stock_status" />
-        <result property="lotNo" column="lot_no" />
-        <result property="outQuantity" column="out_quantity" />
-        
-        <!-- productType 来自 bas_product(bp)，BasStock 未将其作为主表字段，已注释 -->
-        <!-- <result property="productType" column="productType" /> -->
-
-        <!-- 添加 BasStock 的 pd_ 明细映射 -->
-        <result property="pdDetailId" column="pd_detail_id" />
-        <result property="pdProductName" column="pd_product_name" />
-        <result property="pdModel" column="pd_model" />
-        <result property="pdUnit" column="pd_unit" />
-        <result property="pdUnitPrice" column="pd_unit_price" />
-        <result property="pdAuxUnit" column="pd_aux_unit" />
-        <result property="pdAttr1" column="pd_attr1" />
-        <result property="pdAttr2" column="pd_attr2" />
-        <result property="pdQuantity" column="pd_quantity" />
-        <result property="pdInQty" column="pd_in_qty" />
-        <result property="pdAuxQuantity" column="pd_aux_quantity" />
-        <result property="pdTotalPrice" column="pd_total_price" />
-        <result property="pdCostUnitPrice" column="pd_cost_unit_price" />
-        <result property="pdTotalPrice2" column="pd_total_price_2" />
-        <result property="pdAccountCostTotal" column="pd_account_cost_total" />
-        <result property="pdAccountQuantity" column="pd_account_quantity" />
-        <result property="pdAccountStatus" column="pd_account_status" />
-        <result property="pdBatchNo" column="pd_batch_no" />
-        <result property="pdSerialNo" column="pd_serial_no" />
-        <result property="pdProdDate" column="pd_prod_date" />
-        <result property="pdValidDate" column="pd_valid_date" />
-        <result property="pdArrivalDate" column="pd_arrival_date" />
-        <result property="pdRemark" column="pd_remark" />
-        <result property="pdCustom1" column="pd_custom1" />
-        <result property="pdCustom2" column="pd_custom2" />
-        <result property="pdCustom3" column="pd_custom3" />
-        <result property="pdCustom4" column="pd_custom4" />
-        <result property="pdCustom5" column="pd_custom5" />
-        <result property="pdCustom6" column="pd_custom6" />
-        <result property="pdLoader" column="pd_loader" />
+        <result property="onlyIdentity"    column="only_identity"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="Rows"    column="Rows"    />
+        <result property="Title"    column="Title"    />
+        <result property="Kuin"    column="Kuin"    />
+        <result property="Complete1"    column="Complete1"    />
+        <result property="Cateid"    column="Cateid"    />
+        <result property="Date3"    column="Date3"    />
+        <result property="Date5"    column="Date5"    />
+        <result property="Catein"    column="Catein"    />
+        <result property="Intro2"    column="Intro2"    />
+        <result property="Intro"    column="Intro"    />
+        <result property="Caigou"    column="Caigou"    />
+        <result property="Date7"    column="Date7"    />
+        <result property="Kg"    column="Kg"    />
+        <result property="Sort1"    column="Sort1"    />
+        <result property="Rkbh"    column="Rkbh"    />
+        <result property="Status"    column="Status"    />
+        <result property="KuinList"    column="KuinList"    />
+        <result property="sysIcusIInheritIdIidI413"    column="sysIcusIInheritIdIidI413"    />
+        <result property="sysIcusIInheritIdIidI414"    column="sysIcusIInheritIdIidI414"    />
+        <result property="sysIcusIInheritIdIidI415"    column="sysIcusIInheritIdIidI415"    />
+        <result property="pdDetailId"    column="pd_detail_id"    />
+        <result property="pdProductName"    column="pd_product_name"    />
+        <result property="pdModel"    column="pd_model"    />
+        <result property="pdUnit"    column="pd_unit"    />
+        <result property="pdUnitPrice"    column="pd_unit_price"    />
+        <result property="pdAuxUnit"    column="pd_aux_unit"    />
+        <result property="pdAttr1"    column="pd_attr1"    />
+        <result property="pdAttr2"    column="pd_attr2"    />
+        <result property="pdQuantity"    column="pd_quantity"    />
+        <result property="pdInQty"    column="pd_in_qty"    />
+        <result property="pdAuxQuantity"    column="pd_aux_quantity"    />
+        <result property="pdTotalPrice"    column="pd_total_price"    />
+        <result property="pdCostUnitPrice"    column="pd_cost_unit_price"    />
+        <result property="pdTotalPrice2"    column="pd_total_price_2"    />
+        <result property="pdAccountCostTotal"    column="pd_account_cost_total"    />
+        <result property="pdAccountQuantity"    column="pd_account_quantity"    />
+        <result property="pdAccountStatus"    column="pd_account_status"    />
+        <result property="pdBatchNo"    column="pd_batch_no"    />
+        <result property="pdSerialNo"    column="pd_serial_no"    />
+        <result property="pdProdDate"    column="pd_prod_date"    />
+        <result property="pdValidDate"    column="pd_valid_date"    />
+        <result property="pdArrivalDate"    column="pd_arrival_date"    />
+        <result property="pdRemark"    column="pd_remark"    />
+        <result property="pdCustom1"    column="pd_custom1"    />
+        <result property="pdCustom2"    column="pd_custom2"    />
+        <result property="pdCustom3"    column="pd_custom3"    />
+        <result property="pdCustom4"    column="pd_custom4"    />
+        <result property="pdCustom5"    column="pd_custom5"    />
+        <result property="pdCustom6"    column="pd_custom6"    />
+        <result property="pdLoader"    column="pd_loader"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="cargoSpaceStatus"    column="cargo_space_status"    />
+        <result property="locked"    column="locked"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
-                 select bs.cargo_space_id, --库位编码
-                             bs.tray_code,      --托盘
-                             bs.product_id,     --产品编码
-                             bs.product_name,--产品名称
-                             bs.quantity,       -- 数量
-
-                             bs.order_id,       --合同号
-
-                             bs.stockin_id,     --入库单号
-
-                             bw.warehouse_id,   --仓库编码
-                             bw.warehouse_name, --仓库名称
-                             bs.in_date,        --入库时间
-
-                             bs.back_date,      --盘点时间
-
-                             -- bas_stock 的 pd_ 明细字段
-                             bs.pd_product_name, -- 明细产品名称
-                             bs.pd_batch_no,     -- 明细批次号
-                             bs.pd_serial_no,    -- 明细序列号
-                             bs.pd_model,        -- 明细型号
-                             bs.pd_unit,         -- 明细单位
-                             bs.pd_unit_price,   -- 明细单价
-                             bs.pd_quantity,     -- 明细数量
-                             bs.pd_total_price,  -- 明细金额
-                             bs.pd_cost_unit_price,
-                             bs.pd_prod_date,    -- 明细生产日期
-                             bs.pd_valid_date,   -- 明细有效日期
-                             bs.pd_arrival_date, -- 明细到货日期
-                             bs.pd_remark,       -- 明细备注
-
-                             bs.stock_id,       --库存编码
-                             bs.stock_status,   --库存状态
-                         bs.lot_no,          --批次号
-                         bs.out_quantity
-
-         from bas_stock bs
-                 left join bas_product bp on bs.product_id = bp.product_id
-                 left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
-                 left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
-                
+        select only_identity, stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, product_id, product_name, order_id, Rows, Title, Kuin, Complete1, Cateid, Date3, Date5, Catein, Intro2, Intro, Caigou, Date7, Kg, Sort1, Rkbh, Status, KuinList, sysIcusIInheritIdIidI413, sysIcusIInheritIdIidI414, sysIcusIInheritIdIidI415, pd_detail_id, pd_product_name, pd_model, pd_unit, pd_unit_price, pd_aux_unit, pd_attr1, pd_attr2, pd_quantity, pd_in_qty, pd_aux_quantity, pd_total_price, pd_cost_unit_price, pd_total_price_2, pd_account_cost_total, pd_account_quantity, pd_account_status, pd_batch_no, pd_serial_no, pd_prod_date, pd_valid_date, pd_arrival_date, pd_remark, pd_custom1, pd_custom2, pd_custom3, pd_custom4, pd_custom5, pd_custom6, pd_loader, cargo_space_name, cargo_space_status, locked, parent_id, price, cargo_no, unit, spec, remark, spare1, spare3, spare4, spare5, spare6, spare7 from view_stock_detail
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
-        <where>
-            <if test="stockId != null  and stockId != ''"> and bs.stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
-            <if test="backDate != null  and backDate != ''"> and bs.back_date = #{backDate}</if>
-            <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
-            <if test="quantity != null  and quantity != ''"> and bs.quantity = #{quantity}</if>
-            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
-            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
-            
-            <if test="voltage != null  and voltage != ''"> and bs.voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and bs.power = #{power}</if>
-            <if test="orderId != null  and orderId != ''"> and bs.order_id = #{orderId}</if>
-            <if test="productId != null  and productId != ''"> and bs.product_id = #{productId}</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
-            <if test="theFloor != null  and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>
-            <if test="thePlatoon != null  and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null  and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
-            <if test="spec != null  and spec != ''"> and bp.spec = #{spec}</if>
-            <if test="parentId != null  and parentId != ''"> and bp.parent_id = #{parentId}</if>
-            
-            <if test="price != null  and price != ''"> and bp.price = #{price}</if>
-            <if test="inDateStart != null  and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
-            <if test="inDateEnd != null  and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>
-            <if test="productType != null  and productType != ''"> and bp.spare1 = #{productType}</if>
+        <where>  
+            <if test="onlyIdentity != null "> and only_identity like concat('%', #{onlyIdentity}, '%')</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status like concat('%', #{productStatus}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat('%', #{inType}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="Rows != null  and Rows != ''"> and Rows = #{Rows}</if>
+            <if test="Title != null  and Title != ''"> and Title = #{Title}</if>
+            <if test="Kuin != null  and Kuin != ''"> and Kuin = #{Kuin}</if>
+            <if test="Complete1 != null  and Complete1 != ''"> and Complete1 = #{Complete1}</if>
+            <if test="Cateid != null  and Cateid != ''"> and Cateid = #{Cateid}</if>
+            <if test="Date3 != null  and Date3 != ''"> and Date3 = #{Date3}</if>
+            <if test="Date5 != null  and Date5 != ''"> and Date5 = #{Date5}</if>
+            <if test="Catein != null  and Catein != ''"> and Catein = #{Catein}</if>
+            <if test="Intro2 != null  and Intro2 != ''"> and Intro2 = #{Intro2}</if>
+            <if test="Intro != null  and Intro != ''"> and Intro = #{Intro}</if>
+            <if test="Caigou != null  and Caigou != ''"> and Caigou = #{Caigou}</if>
+            <if test="Date7 != null  and Date7 != ''"> and Date7 = #{Date7}</if>
+            <if test="Kg != null  and Kg != ''"> and Kg = #{Kg}</if>
+            <if test="Sort1 != null  and Sort1 != ''"> and Sort1 = #{Sort1}</if>
+            <if test="Rkbh != null  and Rkbh != ''"> and Rkbh = #{Rkbh}</if>
+            <if test="Status != null  and Status != ''"> and Status = #{Status}</if>
+            <if test="KuinList != null  and KuinList != ''"> and KuinList = #{KuinList}</if>
+            <if test="sysIcusIInheritIdIidI413 != null  and sysIcusIInheritIdIidI413 != ''"> and sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413}</if>
+            <if test="sysIcusIInheritIdIidI414 != null  and sysIcusIInheritIdIidI414 != ''"> and sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414}</if>
+            <if test="sysIcusIInheritIdIidI415 != null  and sysIcusIInheritIdIidI415 != ''"> and sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415}</if>
+            <if test="pdDetailId != null "> and pd_detail_id = #{pdDetailId}</if>
+            <if test="pdProductName != null  and pdProductName != ''"> and pd_product_name like concat('%', #{pdProductName}, '%')</if>
+            <if test="pdModel != null  and pdModel != ''"> and pd_model = #{pdModel}</if>
+            <if test="pdUnit != null  and pdUnit != ''"> and pd_unit = #{pdUnit}</if>
+            <if test="pdUnitPrice != null  and pdUnitPrice != ''"> and pd_unit_price = #{pdUnitPrice}</if>
+            <if test="pdAuxUnit != null  and pdAuxUnit != ''"> and pd_aux_unit = #{pdAuxUnit}</if>
+            <if test="pdAttr1 != null  and pdAttr1 != ''"> and pd_attr1 = #{pdAttr1}</if>
+            <if test="pdAttr2 != null  and pdAttr2 != ''"> and pd_attr2 = #{pdAttr2}</if>
+            <if test="pdQuantity != null  and pdQuantity != ''"> and pd_quantity = #{pdQuantity}</if>
+            <if test="pdInQty != null  and pdInQty != ''"> and pd_in_qty = #{pdInQty}</if>
+            <if test="pdAuxQuantity != null  and pdAuxQuantity != ''"> and pd_aux_quantity = #{pdAuxQuantity}</if>
+            <if test="pdTotalPrice != null  and pdTotalPrice != ''"> and pd_total_price = #{pdTotalPrice}</if>
+            <if test="pdCostUnitPrice != null  and pdCostUnitPrice != ''"> and pd_cost_unit_price = #{pdCostUnitPrice}</if>
+            <if test="pdTotalPrice2 != null  and pdTotalPrice2 != ''"> and pd_total_price_2 = #{pdTotalPrice2}</if>
+            <if test="pdAccountCostTotal != null  and pdAccountCostTotal != ''"> and pd_account_cost_total = #{pdAccountCostTotal}</if>
+            <if test="pdAccountQuantity != null  and pdAccountQuantity != ''"> and pd_account_quantity = #{pdAccountQuantity}</if>
+            <if test="pdAccountStatus != null  and pdAccountStatus != ''"> and pd_account_status = #{pdAccountStatus}</if>
+            <if test="pdBatchNo != null  and pdBatchNo != ''"> and pd_batch_no = #{pdBatchNo}</if>
+            <if test="pdSerialNo != null  and pdSerialNo != ''"> and pd_serial_no = #{pdSerialNo}</if>
+            <if test="pdProdDate != null  and pdProdDate != ''"> and pd_prod_date = #{pdProdDate}</if>
+            <if test="pdValidDate != null  and pdValidDate != ''"> and pd_valid_date = #{pdValidDate}</if>
+            <if test="pdArrivalDate != null  and pdArrivalDate != ''"> and pd_arrival_date = #{pdArrivalDate}</if>
+            <if test="pdRemark != null  and pdRemark != ''"> and pd_remark = #{pdRemark}</if>
+            <if test="pdCustom1 != null  and pdCustom1 != ''"> and pd_custom1 = #{pdCustom1}</if>
+            <if test="pdCustom2 != null  and pdCustom2 != ''"> and pd_custom2 = #{pdCustom2}</if>
+            <if test="pdCustom3 != null  and pdCustom3 != ''"> and pd_custom3 = #{pdCustom3}</if>
+            <if test="pdCustom4 != null  and pdCustom4 != ''"> and pd_custom4 = #{pdCustom4}</if>
+            <if test="pdCustom5 != null  and pdCustom5 != ''"> and pd_custom5 = #{pdCustom5}</if>
+            <if test="pdCustom6 != null  and pdCustom6 != ''"> and pd_custom6 = #{pdCustom6}</if>
+            <if test="pdLoader != null  and pdLoader != ''"> and pd_loader = #{pdLoader}</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cargo_space_status = #{cargoSpaceStatus}</if>
+            <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</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="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="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
         </where>
-
     </select>
-
+    
     <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
         where only_identity = #{onlyIdentity}
     </select>
 
-    <insert id="insertViewStockDetail" parameterType="ViewStockDetail">
-        insert into view_stock_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">only_identity,</if>
-            <if test="stockId != null and stockId != ''">stock_id,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status,</if>
-            <if test="locked != null">locked,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="onlyIdentity != null">#{onlyIdentity},</if>
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
-            <if test="locked != null">#{locked},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-         </trim>
-    </insert>
 
-    <update id="updateViewStockDetail" parameterType="ViewStockDetail">
-        update view_stock_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id = #{stockId},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
-            <if test="locked != null">locked = #{locked},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-        </trim>
-        where only_identity = #{onlyIdentity}
-    </update>
-
-    <delete id="deleteViewStockDetailByOnlyIdentity" parameterType="Long">
-        delete from view_stock_detail where only_identity = #{onlyIdentity}
-    </delete>
-
-    <delete id="deleteViewStockDetailByOnlyIdentitys" parameterType="String">
-        delete from view_stock_detail where only_identity in
-        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
-            #{onlyIdentity}
-        </foreach>
-    </delete>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
index d5d1ba5..cf7fffd 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
@@ -6,67 +6,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewStockinHistory" id="ViewStockinHistoryResult">
         <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="classNo"    column="class_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
         <result property="stockinDetailId"    column="stockin_detail_id"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
         <result property="cargoNo"    column="cargo_no"    />
-        <result property="productType"    column="productType"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
         <result property="quantity"    column="quantity"    />
         <result property="scanNum"    column="scan_num"    />
         <result property="assignNum"    column="assign_num"    />
-        <result property="unit"    column="unit"    />
-        <result property="price"    column="price"    />
-        <result property="priceTotal"    column="priceTotal"    />
-        <result property="supplierNo"    column="supplier_no"    />
         <result property="supplierName"    column="supplier_name"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="status"    column="status"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare2"    column="spare2"    />
     </resultMap>
 
     <sql id="selectViewStockinHistoryVo">
-        select stockin_id, stockin_detail_id, product_id, product_name, spec, cargo_no, productType, quantity, scan_num, assign_num, unit, price, priceTotal, supplier_no, supplier_name, spare6, spare5, spare7, spare3, create_man_id, create_date, status, spare8, remark, spare1, spare4, spare2 from view_stockin_history
+        select stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, customer_no, supplier_no, stockin_detail_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, spare1, spare3, spare4, spare5, spare6, spare7, quantity, scan_num, assign_num, supplier_name from view_stockin_history
     </sql>
 
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
         <include refid="selectViewStockinHistoryVo"/>
         <where>  
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{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 like concat('%', #{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="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
             <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
             <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="productType != null  and productType != ''"> and productType = #{productType}</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="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="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
             <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
             <if test="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
             <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="priceTotal != null  and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
         </where>
     </select>
     
@@ -75,109 +85,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where stockin_id = #{stockinId}
     </select>
 
-    <insert id="insertViewStockinHistory" parameterType="ViewStockinHistory">
-        insert into view_stockin_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="productType != null">productType,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="priceTotal != null">priceTotal,</if>
-            <if test="supplierNo != null">supplier_no,</if>
-            <if test="supplierName != null">supplier_name,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare2 != null">spare2,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="productType != null">#{productType},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="priceTotal != null">#{priceTotal},</if>
-            <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="supplierName != null">#{supplierName},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare2 != null">#{spare2},</if>
-         </trim>
-    </insert>
 
-    <update id="updateViewStockinHistory" parameterType="ViewStockinHistory">
-        update view_stockin_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="productType != null">productType = #{productType},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="priceTotal != null">priceTotal = #{priceTotal},</if>
-            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-        </trim>
-        where stockin_id = #{stockinId}
-    </update>
-
-    <delete id="deleteViewStockinHistoryByStockinId" parameterType="String">
-        delete from view_stockin_history where stockin_id = #{stockinId}
-    </delete>
-
-    <delete id="deleteViewStockinHistoryByStockinIds" parameterType="String">
-        delete from view_stockin_history where stockin_id in 
-        <foreach item="stockinId" collection="array" open="(" separator="," close=")">
-            #{stockinId}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
index 5b5448e..b517e07 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
@@ -6,75 +6,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
         <result property="stockoutId"    column="stockout_id"    />
+        <result property="outType"    column="out_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="stockoutSource"    column="stockout_source"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="FID"    column="FID"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
         <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="productType"    column="productType"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="contract"    column="contract"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
+        <result property="parentId"    column="parent_id"    />
         <result property="price"    column="price"    />
-        <result property="priceTotal"    column="priceTotal"    />
-        <result property="customerNo"    column="customer_no"    />
-        <result property="customerName"    column="customer_name"    />
-        <result property="status"    column="status"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="createDate"    column="create_date"    />
+        <result property="cargoNo"    column="cargo_no"    />
         <result property="unit"    column="unit"    />
-        <result property="account"    column="account"    />
-        <result property="managementNo"    column="managementNo"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="supplierName"    column="supplier_name"    />
+        <result property="spec"    column="spec"    />
         <result property="remark"    column="remark"    />
-        <result property="purpose"    column="purpose"    />
-        <result property="quality"    column="quality"    />
-        <result property="source"    column="source"    />
-        <result property="turnoverStatus"    column="turnoverStatus"    />
-        <result property="purpose2"    column="purpose2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="contactName"    column="contact_name"    />
     </resultMap>
 
     <sql id="selectViewStockoutHistoryVo">
-        select stockout_id, stockout_detail_id, product_id, product_name, spec, cargo_no, productType, quantity, allot_quantity, assign_num, contract, power, phase, price, priceTotal, customer_no, customer_name, status, create_man_id, create_date, unit, account, managementNo, supplier_id, supplier_name, remark, purpose, quality, source, turnoverStatus, purpose2 from view_stockout_history
+        select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, FID, erp_stockout_id, stockout_detail_id, lot_no, quantity, assign_num, allot_quantity, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, spare1, spare3, spare4, spare5, spare6, spare7, supplier_no, supplier_name, customer_no, contact_name from view_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         <where>  
-            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</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="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
-            <if test="productType != null  and productType != ''"> and productType = #{productType}</if>
-            <if test="quantity != null "> and quantity = #{quantity}</if>
-            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
-            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
-            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
-            <if test="power != null  and power != ''"> and power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="priceTotal != null  and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
+            <if test="outType != null  and outType != ''"> and out_type = #{outType}</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="stockoutSource != null  and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
+            <if test="FID != null  and FID != ''"> and FID = #{FID}</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
+            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="account != null  and account != ''"> and account = #{account}</if>
-            <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</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="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="purpose != null  and purpose != ''"> and purpose = #{purpose}</if>
-            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
-            <if test="source != null  and source != ''"> and source = #{source}</if>
-            <if test="turnoverStatus != null  and turnoverStatus != ''"> and turnoverStatus = #{turnoverStatus}</if>
-            <if test="purpose2 != null  and purpose2 != ''"> and purpose2 = #{purpose2}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
         </where>
     </select>
     
@@ -83,121 +85,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where stockout_id = #{stockoutId}
     </select>
 
-    <insert id="insertViewStockoutHistory" parameterType="ViewStockoutHistory">
-        insert into view_stockout_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="productType != null">productType,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="allotQuantity != null">allot_quantity,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="contract != null">contract,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="price != null">price,</if>
-            <if test="priceTotal != null">priceTotal,</if>
-            <if test="customerNo != null">customer_no,</if>
-            <if test="customerName != null">customer_name,</if>
-            <if test="status != null and status != ''">status,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="unit != null">unit,</if>
-            <if test="account != null">account,</if>
-            <if test="managementNo != null">managementNo,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="supplierName != null">supplier_name,</if>
-            <if test="remark != null">remark,</if>
-            <if test="purpose != null">purpose,</if>
-            <if test="quality != null">quality,</if>
-            <if test="source != null">source,</if>
-            <if test="turnoverStatus != null">turnoverStatus,</if>
-            <if test="purpose2 != null">purpose2,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="productType != null">#{productType},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="contract != null">#{contract},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="price != null">#{price},</if>
-            <if test="priceTotal != null">#{priceTotal},</if>
-            <if test="customerNo != null">#{customerNo},</if>
-            <if test="customerName != null">#{customerName},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="account != null">#{account},</if>
-            <if test="managementNo != null">#{managementNo},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="supplierName != null">#{supplierName},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="purpose != null">#{purpose},</if>
-            <if test="quality != null">#{quality},</if>
-            <if test="source != null">#{source},</if>
-            <if test="turnoverStatus != null">#{turnoverStatus},</if>
-            <if test="purpose2 != null">#{purpose2},</if>
-         </trim>
-    </insert>
-
-    <update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
-        update view_stockout_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="productType != null">productType = #{productType},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="contract != null">contract = #{contract},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="priceTotal != null">priceTotal = #{priceTotal},</if>
-            <if test="customerNo != null">customer_no = #{customerNo},</if>
-            <if test="customerName != null">customer_name = #{customerName},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="account != null">account = #{account},</if>
-            <if test="managementNo != null">managementNo = #{managementNo},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="purpose != null">purpose = #{purpose},</if>
-            <if test="quality != null">quality = #{quality},</if>
-            <if test="source != null">source = #{source},</if>
-            <if test="turnoverStatus != null">turnoverStatus = #{turnoverStatus},</if>
-            <if test="purpose2 != null">purpose2 = #{purpose2},</if>
-        </trim>
-        where stockout_id = #{stockoutId}
-    </update>
-
-    <delete id="deleteViewStockoutHistoryByStockoutId" parameterType="String">
-        delete from view_stockout_history where stockout_id = #{stockoutId}
-    </delete>
-
-    <delete id="deleteViewStockoutHistoryByStockoutIds" parameterType="String">
-        delete from view_stockout_history where stockout_id in 
-        <foreach item="stockoutId" collection="array" open="(" separator="," close=")">
-            #{stockoutId}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/search/ViewInJobFlow.js b/ruoyi-ui/src/api/search/ViewInJobFlow.js
index 436ac90..5b5eeed 100644
--- a/ruoyi-ui/src/api/search/ViewInJobFlow.js
+++ b/ruoyi-ui/src/api/search/ViewInJobFlow.js
@@ -10,35 +10,11 @@ export function listViewInJobFlow(query) {
 }
 
 // 查询入库作业流水详细
-export function getViewInJobFlow(jobDetailId) {
+export function getViewInJobFlow(jobId) {
   return request({
-    url: '/search/ViewInJobFlow/' + jobDetailId,
+    url: '/search/ViewInJobFlow/' + jobId,
     method: 'get'
   })
 }
 
-// 新增入库作业流水
-export function addViewInJobFlow(data) {
-  return request({
-    url: '/search/ViewInJobFlow',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改入库作业流水
-export function updateViewInJobFlow(data) {
-  return request({
-    url: '/search/ViewInJobFlow',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除入库作业流水
-export function delViewInJobFlow(jobDetailId) {
-  return request({
-    url: '/search/ViewInJobFlow/' + jobDetailId,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/search/ViewOutJobFlow.js b/ruoyi-ui/src/api/search/ViewOutJobFlow.js
index 60ed5fb..3e72164 100644
--- a/ruoyi-ui/src/api/search/ViewOutJobFlow.js
+++ b/ruoyi-ui/src/api/search/ViewOutJobFlow.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询出库作业流水Controller列表
+// 查询出库作业流水列表
 export function listViewOutJobFlow(query) {
   return request({
     url: '/search/ViewOutJobFlow/list',
@@ -9,15 +9,15 @@ export function listViewOutJobFlow(query) {
   })
 }
 
-// 查询出库作业流水Controller详细
-export function getViewOutJobFlow(jobDetailId) {
+// 查询出库作业流水详细
+export function getViewOutJobFlow(jobId) {
   return request({
-    url: '/search/ViewOutJobFlow/' + jobDetailId,
+    url: '/search/ViewOutJobFlow/' + jobId,
     method: 'get'
   })
 }
 
-// 新增出库作业流水Controller
+// 新增出库作业流水
 export function addViewOutJobFlow(data) {
   return request({
     url: '/search/ViewOutJobFlow',
@@ -26,7 +26,7 @@ export function addViewOutJobFlow(data) {
   })
 }
 
-// 修改出库作业流水Controller
+// 修改出库作业流水
 export function updateViewOutJobFlow(data) {
   return request({
     url: '/search/ViewOutJobFlow',
@@ -35,10 +35,10 @@ export function updateViewOutJobFlow(data) {
   })
 }
 
-// 删除出库作业流水Controller
-export function delViewOutJobFlow(jobDetailId) {
+// 删除出库作业流水
+export function delViewOutJobFlow(jobId) {
   return request({
-    url: '/search/ViewOutJobFlow/' + jobDetailId,
+    url: '/search/ViewOutJobFlow/' + jobId,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/api/search/ViewStockDetail.js b/ruoyi-ui/src/api/search/ViewStockDetail.js
index 1b60efd..cc2ca8f 100644
--- a/ruoyi-ui/src/api/search/ViewStockDetail.js
+++ b/ruoyi-ui/src/api/search/ViewStockDetail.js
@@ -17,28 +17,5 @@ export function getViewStockDetail(onlyIdentity) {
   })
 }
 
-// 新增库存明细查询
-export function addViewStockDetail(data) {
-  return request({
-    url: '/search/ViewStockDetail',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改库存明细查询
-export function updateViewStockDetail(data) {
-  return request({
-    url: '/search/ViewStockDetail',
-    method: 'put',
-    data: data
-  })
-}
 
-// 删除库存明细查询
-export function delViewStockDetail(onlyIdentity) {
-  return request({
-    url: '/search/ViewStockDetail/' + onlyIdentity,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/search/ViewStockinHistory.js b/ruoyi-ui/src/api/search/ViewStockinHistory.js
index 6ec1127..cabadda 100644
--- a/ruoyi-ui/src/api/search/ViewStockinHistory.js
+++ b/ruoyi-ui/src/api/search/ViewStockinHistory.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询入库单据流水列表
+// 查询入库单据历史列表
 export function listViewStockinHistory(query) {
   return request({
     url: '/search/ViewStockinHistory/list',
@@ -9,7 +9,7 @@ export function listViewStockinHistory(query) {
   })
 }
 
-// 查询入库单据流水详细
+// 查询入库单据历史详细
 export function getViewStockinHistory(stockinId) {
   return request({
     url: '/search/ViewStockinHistory/' + stockinId,
@@ -17,28 +17,4 @@ export function getViewStockinHistory(stockinId) {
   })
 }
 
-// 新增入库单据流水
-export function addViewStockinHistory(data) {
-  return request({
-    url: '/search/ViewStockinHistory',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改入库单据流水
-export function updateViewStockinHistory(data) {
-  return request({
-    url: '/search/ViewStockinHistory',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除入库单据流水
-export function delViewStockinHistory(stockinId) {
-  return request({
-    url: '/search/ViewStockinHistory/' + stockinId,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/search/ViewStockoutHistory.js b/ruoyi-ui/src/api/search/ViewStockoutHistory.js
index 4754f95..d435a00 100644
--- a/ruoyi-ui/src/api/search/ViewStockoutHistory.js
+++ b/ruoyi-ui/src/api/search/ViewStockoutHistory.js
@@ -16,29 +16,3 @@ export function getViewStockoutHistory(stockoutId) {
     method: 'get'
   })
 }
-
-// 新增出库单据历史
-export function addViewStockoutHistory(data) {
-  return request({
-    url: '/search/ViewStockoutHistory',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改出库单据历史
-export function updateViewStockoutHistory(data) {
-  return request({
-    url: '/search/ViewStockoutHistory',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除出库单据历史
-export function delViewStockoutHistory(stockoutId) {
-  return request({
-    url: '/search/ViewStockoutHistory/' + stockoutId,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index bb319a8..97ee9b6 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -1,18 +1,34 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="子任务编码" prop="jobDetailId">
+      <el-form-item label="作业ID" prop="jobId">
         <el-input
-          v-model="queryParams.jobDetailId"
-          placeholder="请输入子任务编码"
+          v-model="queryParams.jobId"
+          placeholder="请输入作业ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
-      <el-form-item label="任务编码" prop="jobId">
+      </el-form-item>
+      <el-form-item label="子作业ID" prop="jobDetailId">
         <el-input
-          v-model="queryParams.jobId"
-          placeholder="请输入任务编码"
+          v-model="queryParams.jobDetailId"
+          placeholder="请输入子作业ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据ID" prop="inOrOutId">
+        <el-input
+          v-model="queryParams.inOrOutId"
+          placeholder="请输入单据ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子单据ID" prop="inOrOutDId">
+        <el-input
+          v-model="queryParams.inOrOutDId"
+          placeholder="请输入子单据ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -25,66 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--
-
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mydo_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
-        <el-input
-          v-model="queryParams.inOrOut"
-          placeholder="请输入任务类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘条码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-input
-          v-model="queryParams.startTime"
-          placeholder="请输入开始时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
-        <el-input
-          v-model="queryParams.finishTime"
-          placeholder="请输入结束时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入口" prop="entranceId">
-        <el-input
-          v-model="queryParams.entranceId"
-          placeholder="请输入入口"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -101,222 +57,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="常用码" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入常用码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图号" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择物料类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否系统项" prop="systemItem">
-        <el-select v-model="queryParams.systemItem" placeholder="请选择是否系统项" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="productCtm">
-        <el-input
-          v-model="queryParams.productCtm"
-          placeholder="请输入创建时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="productCtu">
-        <el-input
-          v-model="queryParams.productCtu"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存上限" prop="upperNum">
-        <el-input
-          v-model="queryParams.upperNum"
-          placeholder="请输入库存上限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存下限" prop="limitNum">
-        <el-input
-          v-model="queryParams.limitNum"
-          placeholder="请输入库存下限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否启用" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="请选择是否启用" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo" >
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库单" prop="inOrOutId">
-        <el-input
-          v-model="queryParams.inOrOutId"
-          placeholder="请输入入库单"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库子单" prop="inOrOutDId">
-        <el-input
-          v-model="queryParams.inOrOutDId"
-          placeholder="请输入入库子单"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库金额" prop="priceTotal">
-        <el-input
-          v-model="queryParams.priceTotal"
-          placeholder="请输入入库金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="来源" prop="origin">
-        <el-select v-model="queryParams.origin" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="周转类型" prop="turnovertype">
-        <el-select v-model="queryParams.turnovertype" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="account">
-        <el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用途" prop="purpose">
-        <el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="台次" prop="units">
-        <el-input
-          v-model="queryParams.units"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同号" prop="contract">
-        <el-input
-          v-model="queryParams.contract"
-          placeholder="请输入合同号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="cases">
-        <el-input
-          v-model="queryParams.cases"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量" prop="quality">
-        <el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
-          <el-option
-            v-for="dict in dict.type.quality_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="管理号" prop="managementNo">
-        <el-input
-          v-model="queryParams.managementNo"
-          placeholder="请输入管理号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -324,38 +64,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['search:ViewInJobFlow:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['search:ViewInJobFlow:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['search:ViewInJobFlow:remove']"
-        >删除</el-button>
-      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -370,104 +78,56 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="子任务编码" align="center" prop="jobDetailId" width="160"/>
-      <el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
-      <el-table-column label="任务号" align="center" prop="taskNo" width="160"/>
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="180" label="作业ID" align="center" prop="jobId" />
+      <el-table-column width="180" label="子作业ID" align="center" prop="jobDetailId" />
+      <el-table-column width="180" label="任务号" align="center" prop="taskNo" />
+      <el-table-column width="180" label="单据ID" align="center" prop="inOrOutId" />
+      <el-table-column width="180" label="子单据ID" align="center" prop="inOrOutDId" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="unitPrices" align="center" prop="spare5" />
+      <el-table-column width="180" label="units" align="center" prop="spare6" />
+      <el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
+      <el-table-column width="180" label="入库数量" align="center" prop="inQuantity" />
+      <el-table-column width="180" label="库存数量" align="center" prop="stockQuantity" />
+      <el-table-column width="180" label="供应商id" align="center" prop="supplierNo" />
+      <el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
+      <el-table-column width="180" label="客户id" align="center" prop="customerNo" />
+      <el-table-column width="180" label="客户名称" align="center" prop="customerName" />
+<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
+      <el-table-column width="120" label="任务状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务类型" align="center" prop="inOrOut">
+      <el-table-column width="180" label="货位ID" align="center" prop="cargoSpaceId" />
+      <el-table-column width="180" label="目标巷道ID" align="center" prop="targetCargoSpaceId" />
+      <el-table-column width="180" label="开始时间" align="center" prop="startTime" />
+      <el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
+      <el-table-column width="120" label="执行阶段" align="center" prop="executionPhase">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
         </template>
       </el-table-column>
-      <el-table-column label="托盘条码" align="center" prop="trayCode" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
-      <el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
-      <el-table-column label="入口" align="center" prop="entranceId" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseId" />
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
-      <el-table-column label="常用码" align="center" prop="parentId" width="160"/>
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="物料类型" align="center" prop="productType">
+      <el-table-column width="180" label="库存ID" align="center" prop="stockId" />
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="120" label="库存状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
+          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否系统项" align="center" prop="systemItem" width="120">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.systemItem"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="productCtm" width="160"/>
-      <el-table-column label="创建人" align="center" prop="productCtu" />
-      <el-table-column label="库存上限" align="center" prop="upperNum" />
-      <el-table-column label="库存下限" align="center" prop="limitNum" />
-      <el-table-column label="是否启用" align="center" prop="enableFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enableFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="入库数量" align="center" prop="inQuantity" />
-      <el-table-column label="批次号" align="center" prop="lotNo" width="160"/>
-      <el-table-column label="入库单" align="center" prop="inOrOutId" width="160"/>
-      <el-table-column label="入库子单" align="center" prop="inOrOutDId" width="160"/>
-      <el-table-column label="入库金额" align="center" prop="priceTotal" />
-      <el-table-column label="来源" align="center" prop="origin">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.origin"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="周转类型" align="center" prop="turnovertype">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.turnovertype"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="套账" align="center" prop="account">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="purpose">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="center" prop="units" />
-      <el-table-column label="合同号" align="center" prop="contract" />
-      <el-table-column label="件次" align="center" prop="cases" />
-      <el-table-column label="质量" align="center" prop="quality">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="管理号" align="center" prop="managementNo" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['search:ViewInJobFlow:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['search:ViewInJobFlow:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>-->
+      <el-table-column width="180" label="产品分类" align="center" prop="parentId" />
+      <el-table-column width="180" label="价格" align="center" prop="price" />
+      <el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
+      <el-table-column width="180" label="单位id" align="center" prop="unit" />
+      <el-table-column width="180" label="型号" align="center" prop="spec" />
+      <el-table-column width="180" label="单位名称" align="center" prop="spare1" />
+      <el-table-column width="180" label="url" align="center" prop="spare3" />
+      <el-table-column width="180" label="btnurl" align="center" prop="spare4" />
+      <el-table-column width="180" label="unitjb" align="center" prop="spare7" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
+
     </el-table>
 
     <pagination
@@ -478,201 +138,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改入库作业流水对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="子任务编码" prop="jobDetailId">
-          <el-input v-model="form.jobDetailId" placeholder="请输入子任务编码" />
-        </el-form-item>
-        <el-form-item label="任务编码" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入任务编码" />
-        </el-form-item>
-        <el-form-item label="任务号" prop="taskNo">
-          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.mydo_job_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="任务类型" prop="inOrOut">
-          <el-input v-model="form.inOrOut" placeholder="请输入任务类型" />
-        </el-form-item>
-        <el-form-item label="托盘条码" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
-        </el-form-item>
-        <el-form-item label="结束时间" prop="finishTime">
-          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
-        </el-form-item>
-        <el-form-item label="入口" prop="entranceId">
-          <el-input v-model="form.entranceId" placeholder="请输入入口" />
-        </el-form-item>
-        <el-form-item label="仓库编码" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库编码" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="常用码" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入常用码" />
-        </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
-        </el-form-item>
-        <el-form-item label="图号" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入图号" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-        <el-form-item label="物料类型" prop="productType">
-          <el-select v-model="form.productType" placeholder="请选择物料类型">
-            <el-option
-              v-for="dict in dict.type.product_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否系统项" prop="systemItem">
-          <el-select v-model="form.systemItem" placeholder="请选择是否系统项">
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="productCtm">
-          <el-input v-model="form.productCtm" placeholder="请输入创建时间" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="productCtu">
-          <el-input v-model="form.productCtu" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="库存上限" prop="upperNum">
-          <el-input v-model="form.upperNum" placeholder="请输入库存上限" />
-        </el-form-item>
-        <el-form-item label="库存下限" prop="limitNum">
-          <el-input v-model="form.limitNum" placeholder="请输入库存下限" />
-        </el-form-item>
-        <el-form-item label="是否启用" prop="enableFlag">
-          <el-select v-model="form.enableFlag" placeholder="请选择是否启用">
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
-        </el-form-item>
-        <el-form-item label="入库单" prop="inOrOutId">
-          <el-input v-model="form.inOrOutId" placeholder="请输入入库单" />
-        </el-form-item>
-        <el-form-item label="入库子单" prop="inOrOutDId">
-          <el-input v-model="form.inOrOutDId" placeholder="请输入入库子单" />
-        </el-form-item>
-        <el-form-item label="入库金额" prop="priceTotal">
-          <el-input v-model="form.priceTotal" placeholder="请输入入库金额" />
-        </el-form-item>
-        <el-form-item label="来源" prop="origin">
-          <el-select v-model="form.origin" placeholder="请选择来源">
-            <el-option
-              v-for="dict in dict.type.origin_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="周转类型" prop="turnovertype">
-          <el-select v-model="form.turnovertype" placeholder="请选择周转类型">
-            <el-option
-              v-for="dict in dict.type.turnover_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="套账" prop="account">
-          <el-select v-model="form.account" placeholder="请选择套账">
-            <el-option
-              v-for="dict in dict.type.account_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用途" prop="purpose">
-          <el-select v-model="form.purpose" placeholder="请选择用途">
-            <el-option
-              v-for="dict in dict.type.purpose_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="台次" prop="units">
-          <el-input v-model="form.units" placeholder="请输入台次" />
-        </el-form-item>
-        <el-form-item label="合同号" prop="contract">
-          <el-input v-model="form.contract" placeholder="请输入合同号" />
-        </el-form-item>
-        <el-form-item label="件次" prop="cases">
-          <el-input v-model="form.cases" placeholder="请输入件次" />
-        </el-form-item>
-        <el-form-item label="质量" prop="quality">
-          <el-select v-model="form.quality" placeholder="请选择质量">
-            <el-option
-              v-for="dict in dict.type.quality_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="管理号" prop="managementNo">
-          <el-input v-model="form.managementNo" placeholder="请输入管理号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
+import { listViewInJobFlow, getViewInJobFlow } from "@/api/search/ViewInJobFlow"
 
 export default {
   name: "ViewInJobFlow",
-  dicts: ['product_type', 'turnover_type', 'quality_type', 'purpose_type', 'origin_type', 'sys_yes_no',"in_job_type", 'account_type', 'mydo_job_status', 'sys_normal_disable'],
+  dicts: ['execution_phase_type', 'sys_job_status', 'stock_status'],
   data() {
     return {
       // 遮罩层
@@ -697,55 +172,43 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        jobDetailId: null,
         jobId: null,
-        taskNo: null,
         status: null,
-        inOrOut: null,
         trayCode: null,
+        cargoSpaceId: null,
+        targetCargoSpaceId: null,
         startTime: null,
         finishTime: null,
-        entranceId: null,
-        warehouseId: null,
-        productId: null,
-        productName: null,
+        executionPhase: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inOrOutId: null,
+        inOrOutDId: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        supplierNo: null,
+        supplierName: null,
+        customerNo: null,
+        customerName: null,
         parentId: null,
         price: null,
         cargoNo: null,
         unit: null,
         spec: null,
-        productType: null,
-        systemItem: null,
-        productCtm: null,
-        productCtu: null,
-        upperNum: null,
-        limitNum: null,
-        enableFlag: null,
-        inQuantity: null,
-        lotNo: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        priceTotal: null,
-        origin: null,
-        turnovertype: null,
-        account: null,
-        purpose: null,
-        units: null,
-        contract: null,
-        cases: null,
-        quality: null,
-        managementNo: null
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        taskNo: [
-          { required: true, message: "任务号不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "状态不能为空", trigger: "change" }
-        ],
       }
     }
   },
@@ -770,46 +233,40 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        jobDetailId: null,
         jobId: null,
-        taskNo: null,
         status: null,
-        inOrOut: null,
         trayCode: null,
+        cargoSpaceId: null,
+        targetCargoSpaceId: null,
         createTime: null,
         startTime: null,
         finishTime: null,
-        entranceId: null,
-        warehouseId: null,
-        productId: null,
-        productName: null,
+        executionPhase: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inOrOutId: null,
+        inOrOutDId: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        supplierNo: null,
+        supplierName: null,
+        customerNo: null,
+        customerName: null,
         parentId: null,
         price: null,
         cargoNo: null,
         unit: null,
         spec: null,
         remark: null,
-        productType: null,
-        systemItem: null,
-        productCtm: null,
-        productCtu: null,
-        upperNum: null,
-        limitNum: null,
-        enableFlag: null,
-        inQuantity: null,
-        lotNo: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        priceTotal: null,
-        origin: null,
-        turnovertype: null,
-        account: null,
-        purpose: null,
-        units: null,
-        contract: null,
-        cases: null,
-        quality: null,
-        managementNo: null
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       }
       this.resetForm("form")
     },
@@ -825,7 +282,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobDetailId)
+      this.ids = selection.map(item => item.jobId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -838,8 +295,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const jobDetailId = row.jobDetailId || this.ids
-      getViewInJobFlow(jobDetailId).then(response => {
+      const jobId = row.jobId || this.ids
+      getViewInJobFlow(jobId).then(response => {
         this.form = response.data
         this.open = true
         this.title = "修改入库作业流水"
@@ -849,7 +306,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.jobDetailId != null) {
+          if (this.form.jobId != null) {
             updateViewInJobFlow(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
@@ -867,9 +324,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const jobDetailIds = row.jobDetailId || this.ids
-      this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobDetailIds + '"的数据项？').then(function() {
-        return delViewInJobFlow(jobDetailIds)
+      const jobIds = row.jobId || this.ids
+      this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
+        return delViewInJobFlow(jobIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index d0d3b0d..a1a057a 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -1,18 +1,34 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="子任务" prop="jobDetailId">
+      <el-form-item label="作业ID" prop="jobId">
         <el-input
-          v-model="queryParams.jobDetailId"
-          placeholder="请输入子任务"
+          v-model="queryParams.jobId"
+          placeholder="请输入作业ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
-      <el-form-item label="任务编码" prop="jobId">
+      </el-form-item>
+      <el-form-item label="子作业ID" prop="jobDetailId">
         <el-input
-          v-model="queryParams.jobId"
-          placeholder="请输入任务编码"
+          v-model="queryParams.jobDetailId"
+          placeholder="请输入子作业ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据ID" prop="inOrOutId">
+        <el-input
+          v-model="queryParams.inOrOutId"
+          placeholder="请输入单据ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子单据ID" prop="inOrOutDId">
+        <el-input
+          v-model="queryParams.inOrOutDId"
+          placeholder="请输入子单据ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -25,66 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
-        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="托盘码" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-input
-          v-model="queryParams.startTime"
-          placeholder="请输入开始时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
-        <el-input
-          v-model="queryParams.finishTime"
-          placeholder="请输入结束时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出口" prop="exitId">
-        <el-input
-          v-model="queryParams.exitId"
-          placeholder="请输入出口"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -101,212 +57,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="常用编码" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入常用编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图号" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择物料类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否系统项" prop="systemItem">
-        <el-select v-model="queryParams.systemItem" placeholder="请选择是否系统项" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="物料创建时间" prop="productCtm">
-        <el-input
-          v-model="queryParams.productCtm"
-          placeholder="请输入物料创建时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料创建人" prop="productCtu">
-        <el-input
-          v-model="queryParams.productCtu"
-          placeholder="请输入物料创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存上限" prop="upperNum">
-        <el-input
-          v-model="queryParams.upperNum"
-          placeholder="请输入库存上限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存下限" prop="limitNum">
-        <el-input
-          v-model="queryParams.limitNum"
-          placeholder="请输入库存下限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否可用" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="请选择是否可用" clearable>
-          <el-option
-            v-for="dict in dict.type.product_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据编码" prop="inOrOutId">
-        <el-input
-          v-model="queryParams.inOrOutId"
-          placeholder="请输入单据编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="子单据编码" prop="inOrOutDId">
-        <el-input
-          v-model="queryParams.inOrOutDId"
-          placeholder="请输入子单据编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="金额" prop="priceTotal">
-        <el-input
-          v-model="queryParams.priceTotal"
-          placeholder="请输入金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="周转类型" prop="turnovertype">
-        <el-select v-model="queryParams.turnovertype" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="account">
-        <el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用途" prop="purpose">
-        <el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="台次" prop="units">
-        <el-input
-          v-model="queryParams.units"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同" prop="contract">
-        <el-input
-          v-model="queryParams.contract"
-          placeholder="请输入合同"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="cases">
-        <el-input
-          v-model="queryParams.cases"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量" prop="quality">
-        <el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
-          <el-option
-            v-for="dict in dict.type.quality_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="管理号" prop="managementNo">
-        <el-input
-          v-model="queryParams.managementNo"
-          placeholder="请输入管理号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -314,38 +64,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['search:ViewOutJobFlow:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['search:ViewOutJobFlow:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['search:ViewOutJobFlow:remove']"
-        >删除</el-button>
-      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -360,100 +78,56 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="子任务" align="center" prop="jobDetailId" width="160"/>
-      <el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
-      <el-table-column label="任务号" align="center" prop="taskNo" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="180" label="作业ID" align="center" prop="jobId" />
+      <el-table-column width="180" label="子作业ID" align="center" prop="jobDetailId" />
+      <el-table-column width="180" label="任务号" align="center" prop="taskNo" />
+      <el-table-column width="180" label="单据ID" align="center" prop="inOrOutId" />
+      <el-table-column width="180" label="子单据ID" align="center" prop="inOrOutDId" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="unitPrices" align="center" prop="spare5" />
+      <el-table-column width="180" label="units" align="center" prop="spare6" />
+      <el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
+<!--      <el-table-column width="180" label="入库数量" align="center" prop="inQuantity" />-->
+      <el-table-column width="180" label="出库数量" align="center" prop="outQuantity" />
+      <el-table-column width="180" label="库存数量" align="center" prop="stockQuantity" />
+      <el-table-column width="180" label="供应商id" align="center" prop="supplierNo" />
+      <el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
+      <el-table-column width="180" label="客户id" align="center" prop="customerNo" />
+      <el-table-column width="180" label="客户名称" align="center" prop="customerName" />
+      <el-table-column width="120" label="任务状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务类型" align="center" prop="inOrOut">
+      <el-table-column width="180" label="货位ID" align="center" prop="cargoSpaceId" />
+      <el-table-column width="180" label="目标巷道ID" align="center" prop="targetCargoSpaceId" />
+      <el-table-column width="180" label="开始时间" align="center" prop="startTime" />
+      <el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
+      <el-table-column width="120" label="执行阶段" align="center" prop="executionPhase">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
         </template>
       </el-table-column>
-      <el-table-column label="托盘码" align="center" prop="trayCode" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
-      <el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
-      <el-table-column label="出口" align="center" prop="exitId" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseId" />
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
-      <el-table-column label="常用编码" align="center" prop="parentId" />
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="物料类型" align="center" prop="productType">
+      <el-table-column width="180" label="库存ID" align="center" prop="stockId" />
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="120" label="库存状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否系统项" align="center" prop="systemItem">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.systemItem"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="物料创建时间" align="center" prop="productCtm" width="160" />
-      <el-table-column label="物料创建人" align="center" prop="productCtu" />
-      <el-table-column label="库存上限" align="center" prop="upperNum" />
-      <el-table-column label="库存下限" align="center" prop="limitNum" />
-      <el-table-column label="是否可用" align="center" prop="enableFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_status" :value="scope.row.enableFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="出库数量" align="center" prop="outQuantity" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="单据编码" align="center" prop="inOrOutId" width="160"/>
-      <el-table-column label="子单据编码" align="center" prop="inOrOutDId" width="160" />
-      <el-table-column label="金额" align="center" prop="priceTotal" />
-      <el-table-column label="来源" align="center" prop="origin" />
-      <el-table-column label="周转类型" align="center" prop="turnovertype">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.turnovertype"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="套账" align="center" prop="account">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="purpose">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="center" prop="units" />
-      <el-table-column label="合同" align="center" prop="contract" />
-      <el-table-column label="件次" align="center" prop="cases" />
-      <el-table-column label="质量" align="center" prop="quality">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="管理号" align="center" prop="managementNo" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['search:ViewOutJobFlow:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['search:ViewOutJobFlow:remove']"
-          >删除</el-button>
+          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
+      <el-table-column width="180" label="产品分类" align="center" prop="parentId" />
+      <el-table-column width="180" label="价格" align="center" prop="price" />
+      <el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
+      <el-table-column width="180" label="单位id" align="center" prop="unit" />
+      <el-table-column width="180" label="型号" align="center" prop="spec" />
+      <el-table-column width="180" label="单位名称" align="center" prop="spare1" />
+      <el-table-column width="180" label="url" align="center" prop="spare3" />
+      <el-table-column width="180" label="btnurl" align="center" prop="spare4" />
+      <el-table-column width="180" label="unitjb" align="center" prop="spare7" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
+
     </el-table>
 
     <pagination
@@ -463,190 +137,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改出库作业流水Controller对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="子任务" prop="jobDetailId">
-          <el-input v-model="form.jobDetailId" placeholder="请输入子任务" />
-        </el-form-item>
-        <el-form-item label="任务编码" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入任务编码" />
-        </el-form-item>
-        <el-form-item label="任务号" prop="taskNo">
-          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.sys_job_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="任务类型" prop="inOrOut">
-          <el-select v-model="form.inOrOut" placeholder="请选择任务类型">
-            <el-option
-              v-for="dict in dict.type.out_job_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="托盘码" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘码" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
-        </el-form-item>
-        <el-form-item label="结束时间" prop="finishTime">
-          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
-        </el-form-item>
-        <el-form-item label="出口" prop="exitId">
-          <el-input v-model="form.exitId" placeholder="请输入出口" />
-        </el-form-item>
-        <el-form-item label="仓库编码" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库编码" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="常用编码" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入常用编码" />
-        </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
-        </el-form-item>
-        <el-form-item label="图号" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入图号" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-        <el-form-item label="物料类型" prop="productType">
-          <el-select v-model="form.productType" placeholder="请选择物料类型">
-            <el-option
-              v-for="dict in dict.type.product_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否系统项" prop="systemItem">
-          <el-select v-model="form.systemItem" placeholder="请选择是否系统项">
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料创建时间" prop="productCtm">
-          <el-input v-model="form.productCtm" placeholder="请输入物料创建时间" />
-        </el-form-item>
-        <el-form-item label="物料创建人" prop="productCtu">
-          <el-input v-model="form.productCtu" placeholder="请输入物料创建人" />
-        </el-form-item>
-        <el-form-item label="库存上限" prop="upperNum">
-          <el-input v-model="form.upperNum" placeholder="请输入库存上限" />
-        </el-form-item>
-        <el-form-item label="库存下限" prop="limitNum">
-          <el-input v-model="form.limitNum" placeholder="请输入库存下限" />
-        </el-form-item>
-        <el-form-item label="是否可用" prop="enableFlag">
-          <el-select v-model="form.enableFlag" placeholder="请选择是否可用">
-            <el-option
-              v-for="dict in dict.type.product_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
-        </el-form-item>
-        <el-form-item label="单据编码" prop="inOrOutId">
-          <el-input v-model="form.inOrOutId" placeholder="请输入单据编码" />
-        </el-form-item>
-        <el-form-item label="子单据编码" prop="inOrOutDId">
-          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据编码" />
-        </el-form-item>
-        <el-form-item label="金额" prop="priceTotal">
-          <el-input v-model="form.priceTotal" placeholder="请输入金额" />
-        </el-form-item>
-        <el-form-item label="周转类型" prop="turnovertype">
-          <el-select v-model="form.turnovertype" placeholder="请选择周转类型">
-            <el-option
-              v-for="dict in dict.type.turnover_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="套账" prop="account">
-          <el-select v-model="form.account" placeholder="请选择套账">
-            <el-option
-              v-for="dict in dict.type.account_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用途" prop="purpose">
-          <el-select v-model="form.purpose" placeholder="请选择用途">
-            <el-option
-              v-for="dict in dict.type.purpose_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="台次" prop="units">
-          <el-input v-model="form.units" placeholder="请输入台次" />
-        </el-form-item>
-        <el-form-item label="合同" prop="contract">
-          <el-input v-model="form.contract" placeholder="请输入合同" />
-        </el-form-item>
-        <el-form-item label="件次" prop="cases">
-          <el-input v-model="form.cases" placeholder="请输入件次" />
-        </el-form-item>
-        <el-form-item label="质量" prop="quality">
-          <el-select v-model="form.quality" placeholder="请选择质量">
-            <el-option
-              v-for="dict in dict.type.quality_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="管理号" prop="managementNo">
-          <el-input v-model="form.managementNo" placeholder="请输入管理号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -655,7 +145,7 @@ import { listViewOutJobFlow, getViewOutJobFlow, delViewOutJobFlow, addViewOutJob
 
 export default {
   name: "ViewOutJobFlow",
-  dicts: ['product_type', 'turnover_type', 'quality_type', 'purpose_type', 'sys_job_status', 'product_status', 'sys_yes_no', 'account_type', 'out_job_type'],
+  dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'],
   data() {
     return {
       // 遮罩层
@@ -670,7 +160,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 出库作业流水Controller表格数据
+      // 出库作业流水表格数据
       ViewOutJobFlowList: [],
       // 弹出层标题
       title: "",
@@ -680,16 +170,28 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        jobDetailId: null,
         jobId: null,
-        taskNo: null,
         status: null,
-        inOrOut: null,
+        taskNo: null,
         trayCode: null,
+        cargoSpaceId: null,
+        targetCargoSpaceId: null,
         startTime: null,
         finishTime: null,
-        exitId: null,
-        warehouseId: null,
+        executionPhase: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inOrOutId: null,
+        inOrOutDId: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        supplierNo: null,
+        supplierName: null,
+        customerNo: null,
+        customerName: null,
         productId: null,
         productName: null,
         parentId: null,
@@ -697,37 +199,25 @@ export default {
         cargoNo: null,
         unit: null,
         spec: null,
-        productType: null,
-        systemItem: null,
-        productCtm: null,
-        productCtu: null,
-        upperNum: null,
-        limitNum: null,
-        enableFlag: null,
-        outQuantity: null,
-        lotNo: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        priceTotal: null,
-        origin: null,
-        turnovertype: null,
-        account: null,
-        purpose: null,
-        units: null,
-        contract: null,
-        cases: null,
-        quality: null,
-        managementNo: null
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        taskNo: [
-          { required: true, message: "任务号不能为空", trigger: "blur" }
+        jobId: [
+          { required: true, message: "作业ID不能为空", trigger: "blur" }
         ],
         status: [
-          { required: true, message: "状态不能为空", trigger: "change" }
+          { required: true, message: "任务状态不能为空", trigger: "change" }
+        ],
+        taskNo: [
+          { required: true, message: "任务号不能为空", trigger: "blur" }
         ],
       }
     }
@@ -736,7 +226,7 @@ export default {
     this.getList()
   },
   methods: {
-    /** 查询出库作业流水Controller列表 */
+    /** 查询出库作业流水列表 */
     getList() {
       this.loading = true
       listViewOutJobFlow(this.queryParams).then(response => {
@@ -753,17 +243,29 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        jobDetailId: null,
         jobId: null,
-        taskNo: null,
         status: null,
-        inOrOut: null,
+        taskNo: null,
         trayCode: null,
+        cargoSpaceId: null,
+        targetCargoSpaceId: null,
         createTime: null,
         startTime: null,
         finishTime: null,
-        exitId: null,
-        warehouseId: null,
+        executionPhase: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inOrOutId: null,
+        inOrOutDId: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        supplierNo: null,
+        supplierName: null,
+        customerNo: null,
+        customerName: null,
         productId: null,
         productName: null,
         parentId: null,
@@ -772,27 +274,12 @@ export default {
         unit: null,
         spec: null,
         remark: null,
-        productType: null,
-        systemItem: null,
-        productCtm: null,
-        productCtu: null,
-        upperNum: null,
-        limitNum: null,
-        enableFlag: null,
-        outQuantity: null,
-        lotNo: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        priceTotal: null,
-        origin: null,
-        turnovertype: null,
-        account: null,
-        purpose: null,
-        units: null,
-        contract: null,
-        cases: null,
-        quality: null,
-        managementNo: null
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       }
       this.resetForm("form")
     },
@@ -808,7 +295,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobDetailId)
+      this.ids = selection.map(item => item.jobId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -816,23 +303,23 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加出库作业流水Controller"
+      this.title = "添加出库作业流水"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const jobDetailId = row.jobDetailId || this.ids
-      getViewOutJobFlow(jobDetailId).then(response => {
+      const jobId = row.jobId || this.ids
+      getViewOutJobFlow(jobId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改出库作业流水Controller"
+        this.title = "修改出库作业流水"
       })
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.jobDetailId != null) {
+          if (this.form.jobId != null) {
             updateViewOutJobFlow(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
@@ -850,9 +337,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const jobDetailIds = row.jobDetailId || this.ids
-      this.$modal.confirm('是否确认删除出库作业流水Controller编号为"' + jobDetailIds + '"的数据项？').then(function() {
-        return delViewOutJobFlow(jobDetailIds)
+      const jobIds = row.jobId || this.ids
+      this.$modal.confirm('是否确认删除出库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
+        return delViewOutJobFlow(jobIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
index be37e36..390635f 100644
--- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
@@ -1,54 +1,35 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库" prop="warehouseId"><!--仓库-->
-        <el-select
-          v-model="queryParams.warehouseId"
-          placeholder="请选择仓库"
+      <el-form-item label="库存id" prop="stockId">
+        <el-input
+          v-model="queryParams.stockId"
+          placeholder="请输入库存id"
           clearable
-          @change="handleQuery"
-        >
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库存状态" prop="stockStatus">
+        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
           <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
+            v-for="dict in dict.type.stock_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货位状态" prop="cargoSpaceStatus">
+        <el-select v-model="queryParams.cargoSpaceStatus" placeholder="请选择物料状态" clearable>
+          <el-option
+            v-for="dict in dict.type.cargo_space_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
 
-      <el-form-item label="巷道" prop="roadwayId">
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="层" prop="theFloor">
-        <el-input
-          v-model="queryParams.theFloor"
-          placeholder="请输入层"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排" prop="thePlatoon">
-        <el-input
-          v-model="queryParams.thePlatoon"
-          placeholder="请输入排"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="列" prop="theColumn">
-        <el-input
-          v-model="queryParams.theColumn"
-          placeholder="请输入列"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -57,38 +38,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="常用编码" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入常用编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应代号" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商代号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应名称" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          placeholder="请输入供应商名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -97,170 +46,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入库单号" prop="stockinId">
-        <el-input
-          v-model="queryParams.stockinId"
-          placeholder="请输入入库单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="托盘号" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入合同号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用途" prop="spare4">
-        <el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="起始时间" prop="inDateStart">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateStart"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择起始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="截止日期" prop="inDateEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateEnd"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择截止时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="周转类型" prop="voltage">
-        <el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="来源" prop="spare1">
-        <el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="spare3">
-        <el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="形态类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="台次" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="power">
-        <el-input
-          v-model="queryParams.power"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库外" prop="outside">
-        <el-input
-          v-model="queryParams.outside"
-          placeholder="请输入库外"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!-- 重置 -->
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['search:ViewStockDetail:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['search:ViewStockDetail:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['search:ViewStockDetail:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -274,84 +67,120 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
-      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
-      <el-table-column label="库存状态" align="center" prop="stockStatus" >
+    <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="id" align="center" prop="onlyIdentity" />-->
+      <el-table-column width="180" label="库存id" align="center" prop="stockId" />
+      <el-table-column width="150" label="货位id" align="center" prop="cargoSpaceId" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="库存数量" align="center" prop="quantity" />
+      <el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
+      <el-table-column width="180" label="units" align="center" prop="spare6" />
+      <el-table-column label="库存状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="套账" align="center" prop="spare3">
+
+      <el-table-column label="物料状态" align="center" prop="productStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
+          <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
-      <el-table-column label="托盘" align="center" prop="trayCode"/>
-      <el-table-column label="物料编码" align="center" prop="productId"/>
-      <el-table-column label="物料名称" align="center" prop="productName" width="160" />
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
-      <el-table-column label="数量" align="center" prop="quantity"/>
-      <el-table-column label="单价" align="center" prop="price"/>
-      <el-table-column label="金额" align="center" prop="spare6"/>
-      <el-table-column label="物料状态" align="center" prop="productType">
+      <el-table-column width="150" label="批号" align="center" prop="lotNo" />
+
+<!--      <el-table-column width="180" label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="180" label="作业ID" align="center" prop="jobId" />
+      <el-table-column width="180" label="托盘条码" align="center" prop="trayCode" />
+      <el-table-column width="180" label="出库数量" align="center" prop="outQuantity" />
+      <el-table-column width="180" label="入库子单id" align="center" prop="stockinDetailId" />
+      <el-table-column width="180" label="入库主单" align="center" prop="stockinId" />
+      <el-table-column width="180" label="入库类型" align="center" prop="inType" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
+          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unit"/>
-      <el-table-column label="图号" align="center" prop="cargoNo"/>
-      <el-table-column label="合同号" align="center" prop="orderId"/>
-      <el-table-column label="台次" align="center" prop="spare5"/>
-      <el-table-column label="件次" align="center" prop="power"/>
-      <el-table-column label="质量" align="center" prop="spare8">
+
+      <el-table-column width="180" label="合同号" align="center" prop="orderId" />
+<!--      <el-table-column width="180" label="集合数据" align="center" prop="Rows" />-->
+<!--      <el-table-column width="180" label="入库主题" align="center" prop="Title" />-->
+      <el-table-column width="180" label="首次入库时间" align="center" prop="inDate" />
+      <el-table-column width="180" label="最后出库时间" align="center" prop="backDate" />
+      <el-table-column width="180" label="货位名称" align="center" prop="cargoSpaceName" />
+
+
+      <!--      <el-table-column label="${comment}" align="center" prop="inClassId" />-->
+      <!--      <el-table-column label="仓库" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="入库id" align="center" prop="Kuin" />-->
+<!--      <el-table-column label="入库状态" align="center" prop="Complete1" />-->
+<!--      <el-table-column label="申请人" align="center" prop="Cateid" />-->
+<!--      <el-table-column label="申请日期" align="center" prop="Date3" />-->
+<!--      <el-table-column label="确认日期" align="center" prop="Date5" />-->
+<!--      <el-table-column label="审批人" align="center" prop="Catein" />-->
+<!--      <el-table-column label="审批意见" align="center" prop="Intro2" />-->
+<!--      <el-table-column label="入库备注" align="center" prop="Intro" />-->
+<!--      <el-table-column label="关联其他单据id" align="center" prop="Caigou" />-->
+<!--      <el-table-column label="添加时间" align="center" prop="Date7" />-->
+<!--      <el-table-column label="库管id" align="center" prop="Kg" />-->
+<!--      <el-table-column label="入库类别" align="center" prop="Sort1" />-->
+<!--      <el-table-column label="入库编号" align="center" prop="Rkbh" />-->
+<!--      <el-table-column label="审批状态" align="center" prop="Status" />-->
+<!--      <el-table-column label="产品明细" align="center" prop="KuinList" />-->
+<!--      <el-table-column label="客户名称" align="center" prop="sysIcusIInheritIdIidI413" />-->
+<!--      <el-table-column label="磅单编号" align="center" prop="sysIcusIInheritIdIidI414" />-->
+<!--      <el-table-column label="入库车号" align="center" prop="sysIcusIInheritIdIidI415" />-->
+<!--      <el-table-column label="入库明细ID" align="center" prop="pdDetailId" />-->
+<!--      <el-table-column label="产品名称" align="center" prop="pdProductName" />-->
+<!--      <el-table-column label="型号" align="center" prop="pdModel" />-->
+<!--      <el-table-column label="单位" align="center" prop="pdUnit" />-->
+<!--      <el-table-column label="单价" align="center" prop="pdUnitPrice" />-->
+<!--      <el-table-column label="辅助单位" align="center" prop="pdAuxUnit" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAttr1" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAttr2" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdQuantity" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdInQty" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAuxQuantity" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdTotalPrice" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCostUnitPrice" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdTotalPrice2" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAccountCostTotal" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAccountQuantity" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdAccountStatus" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdBatchNo" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdSerialNo" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdProdDate" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdValidDate" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdArrivalDate" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdRemark" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom1" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom2" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom3" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom4" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom5" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="pdCustom6" />-->
+<!--      <el-table-column label="装卸工" align="center" prop="pdLoader" />-->
+      <el-table-column label="货位状态" align="center" prop="cargoSpaceStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
+          <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="常用编码" align="center" prop="parentId"/>
-      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierNo" width="160"/>
-      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
-      <el-table-column label="仓库编码" align="center" prop="warehouseId"/>
-      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
-      <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
-      <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
-      <el-table-column label="盘点标识" align="center" prop="spare7">
+      <el-table-column label="是否锁定" align="center" prop="locked" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
+          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
         </template>
       </el-table-column>
-      <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="来源" align="center" prop="spare4">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare4"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="spare1">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockDetail:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockDetail:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column width="180" label="产品分类" align="center" prop="parentId" />
+      <el-table-column width="180" label="价格" align="center" prop="price" />
+      <el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
+      <el-table-column width="180" label="单位" align="center" prop="unit" />
+      <el-table-column width="180" label="型号" align="center" prop="spec" />
+      <el-table-column width="180" label="单位名称" align="center" prop="spare1" />
+      <el-table-column width="180" label="url " align="center" prop="spare3" />
+      <el-table-column width="180" label="btnurl" align="center" prop="spare4" />
+      <el-table-column width="180" label="unitjb" align="center" prop="spare7" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
+
     </el-table>
 
     <pagination
@@ -361,132 +190,20 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改库存明细查询对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一标识" prop="onlyIdentity">
-          <el-input v-model="form.onlyIdentity" placeholder="请输入唯一标识" />
-        </el-form-item>
-        <el-form-item label="库存ID" prop="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
-        </el-form-item>
-        <el-form-item label="货位ID" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
-        </el-form-item>
-        <el-form-item label="托盘号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘号" />
-        </el-form-item>
-        <el-form-item label="数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入数量" />
-        </el-form-item>
-        <el-form-item label="作业ID" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
-        </el-form-item>
-        <el-form-item label="批号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批号" />
-        </el-form-item>
-        <el-form-item label="入库子单ID" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
-        </el-form-item>
-        <el-form-item label="入库时间" prop="inDate">
-          <el-input v-model="form.inDate" placeholder="请输入入库时间" />
-        </el-form-item>
-        <el-form-item label="仓库" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库" />
-        </el-form-item>
-        <el-form-item label="剁型ID" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入剁型ID" />
-        </el-form-item>
-        <el-form-item label="货位名称" prop="cargoSpaceName">
-          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
-        </el-form-item>
-        <el-form-item label="巷道ID" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
-        </el-form-item>
-        <el-form-item label="是否锁定" prop="locked">
-          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
-        </el-form-item>
-        <el-form-item label="物料ID" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料ID" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
-        </el-form-item>
-        <!-- 新增 pd_ 明细字段显示 -->
-        <el-form-item label="明细ID" prop="pdDetailId">
-          <el-input v-model="form.pdDetailId" placeholder="请输入明细ID" />
-        </el-form-item>
-        <el-form-item label="明细产品名" prop="pdProductName">
-          <el-input v-model="form.pdProductName" placeholder="请输入明细产品名称" />
-        </el-form-item>
-        <el-form-item label="明细型号" prop="pdModel">
-          <el-input v-model="form.pdModel" placeholder="请输入明细型号" />
-        </el-form-item>
-        <el-form-item label="明细单位" prop="pdUnit">
-          <el-input v-model="form.pdUnit" placeholder="请输入明细单位" />
-        </el-form-item>
-        <el-form-item label="明细单价" prop="pdUnitPrice">
-          <el-input v-model="form.pdUnitPrice" placeholder="请输入明细单价" />
-        </el-form-item>
-        <el-form-item label="明细数量" prop="pdQuantity">
-          <el-input v-model="form.pdQuantity" placeholder="请输入明细数量" />
-        </el-form-item>
-        <el-form-item label="明细总价" prop="pdTotalPrice">
-          <el-input v-model="form.pdTotalPrice" placeholder="请输入明细总价" />
-        </el-form-item>
-        <el-form-item label="明细批号" prop="pdBatchNo">
-          <el-input v-model="form.pdBatchNo" placeholder="请输入明细批号" />
-        </el-form-item>
-        <el-form-item label="明细序列号" prop="pdSerialNo">
-          <el-input v-model="form.pdSerialNo" placeholder="请输入明细序列号" />
-        </el-form-item>
-        <el-form-item label="生产日期" prop="pdProdDate">
-          <el-date-picker v-model="form.pdProdDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择生产日期" />
-        </el-form-item>
-        <el-form-item label="有效日期" prop="pdValidDate">
-          <el-date-picker v-model="form.pdValidDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择有效日期" />
-        </el-form-item>
-        <el-form-item label="到货日期" prop="pdArrivalDate">
-          <el-date-picker v-model="form.pdArrivalDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择到货日期" />
-        </el-form-item>
-        <el-form-item label="明细备注" prop="pdRemark">
-          <el-input v-model="form.pdRemark" placeholder="请输入明细备注" />
-        </el-form-item>
-        <el-form-item label="装卸工" prop="pdLoader">
-          <el-input v-model="form.pdLoader" placeholder="请输入装卸工" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确定</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
+
 <script>
-import { listViewStockDetail, getViewStockDetail, delViewStockDetail, addViewStockDetail, updateViewStockDetail } from "@/api/search/ViewStockDetail"
-import { listWarehouse } from "@/api/bas/warehouse"
+import { listViewStockDetail, getViewStockDetail } from "@/api/search/ViewStockDetail"
 
 export default {
   name: "ViewStockDetail",
-  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type','check_flag'],
+  dicts: ['product_status', 'cargo_space_status', 'stock_status','in_bill_type','cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -507,34 +224,102 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-
+        onlyIdentity: null,
+        stockId: null,
+        cargoSpaceId: null,
+        stockStatus: null,
+        productStatus: null,
+        lotNo: null,
+        inDate: null,
+        backDate: null,
+        productGuid: null,
+        quantity: null,
+        jobId: null,
+        trayCode: null,
+        outQuantity: null,
+        stockinDetailId: null,
+        stockinId: null,
+        inType: null,
+        inClassId: null,
+        warehouseId: null,
+        productId: null,
+        productName: null,
+        orderId: null,
+        Rows: null,
+        Title: null,
+        Kuin: null,
+        Complete1: null,
+        Cateid: null,
+        Date3: null,
+        Date5: null,
+        Catein: null,
+        Intro2: null,
+        Intro: null,
+        Caigou: null,
+        Date7: null,
+        Kg: null,
+        Sort1: null,
+        Rkbh: null,
+        Status: null,
+        KuinList: null,
+        sysIcusIInheritIdIidI413: null,
+        sysIcusIInheritIdIidI414: null,
+        sysIcusIInheritIdIidI415: null,
+        pdDetailId: null,
+        pdProductName: null,
+        pdModel: null,
+        pdUnit: null,
+        pdUnitPrice: null,
+        pdAuxUnit: null,
+        pdAttr1: null,
+        pdAttr2: null,
+        pdQuantity: null,
+        pdInQty: null,
+        pdAuxQuantity: null,
+        pdTotalPrice: null,
+        pdCostUnitPrice: null,
+        pdTotalPrice2: null,
+        pdAccountCostTotal: null,
+        pdAccountQuantity: null,
+        pdAccountStatus: null,
+        pdBatchNo: null,
+        pdSerialNo: null,
+        pdProdDate: null,
+        pdValidDate: null,
+        pdArrivalDate: null,
+        pdRemark: null,
+        pdCustom1: null,
+        pdCustom2: null,
+        pdCustom3: null,
+        pdCustom4: null,
+        pdCustom5: null,
+        pdCustom6: null,
+        pdLoader: null,
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        locked: null,
+        parentId: null,
+        price: null,
+        cargoNo: null,
+        unit: null,
+        spec: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        stockId: [
-          { required: true, message: "库存ID不能为空", trigger: "blur" }
-        ],
       }
     }
   },
   created() {
     this.getList()
-    this.getWarehouseList()
   },
   methods: {
-    /** 查询仓库列表 */
-    getWarehouseList() {
-      var quaryParam = {
-        pageNum:1,
-        pageSize:99
-      }
-      listWarehouse(quaryParam).then(response => {
-        this.warehouseOptions = response.rows;
-      });
-      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
-    },
     /** 查询库存明细查询列表 */
     getList() {
       this.loading = true
@@ -555,39 +340,88 @@ export default {
         onlyIdentity: null,
         stockId: null,
         cargoSpaceId: null,
-        trayCode: null,
+        stockStatus: null,
+        productStatus: null,
+        lotNo: null,
+        inDate: null,
+        backDate: null,
+        productGuid: null,
         quantity: null,
         jobId: null,
-        lotNo: null,
+        trayCode: null,
+        outQuantity: null,
         stockinDetailId: null,
-        inDate: null,
+        stockinId: null,
+        inType: null,
+        inClassId: null,
         warehouseId: null,
-        stackingId: null,
-        cargoSpaceName: null,
-        roadwayId: null,
-        cargoSpaceStatus: null,
-        locked: null,
         productId: null,
         productName: null,
-        spec: null,
-        unit: null,
-        price: null
-        ,
-        // pd_ 明细字段
+        orderId: null,
+        Rows: null,
+        Title: null,
+        Kuin: null,
+        Complete1: null,
+        Cateid: null,
+        Date3: null,
+        Date5: null,
+        Catein: null,
+        Intro2: null,
+        Intro: null,
+        Caigou: null,
+        Date7: null,
+        Kg: null,
+        Sort1: null,
+        Rkbh: null,
+        Status: null,
+        KuinList: null,
+        sysIcusIInheritIdIidI413: null,
+        sysIcusIInheritIdIidI414: null,
+        sysIcusIInheritIdIidI415: null,
         pdDetailId: null,
         pdProductName: null,
         pdModel: null,
         pdUnit: null,
         pdUnitPrice: null,
+        pdAuxUnit: null,
+        pdAttr1: null,
+        pdAttr2: null,
         pdQuantity: null,
+        pdInQty: null,
+        pdAuxQuantity: null,
         pdTotalPrice: null,
+        pdCostUnitPrice: null,
+        pdTotalPrice2: null,
+        pdAccountCostTotal: null,
+        pdAccountQuantity: null,
+        pdAccountStatus: null,
         pdBatchNo: null,
         pdSerialNo: null,
         pdProdDate: null,
         pdValidDate: null,
         pdArrivalDate: null,
         pdRemark: null,
-        pdLoader: null
+        pdCustom1: null,
+        pdCustom2: null,
+        pdCustom3: null,
+        pdCustom4: null,
+        pdCustom5: null,
+        pdCustom6: null,
+        pdLoader: null,
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        locked: null,
+        parentId: null,
+        price: null,
+        cargoNo: null,
+        unit: null,
+        spec: null,
+        remark: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null
       }
       this.resetForm("form")
     },
@@ -611,7 +445,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "新增库存详情"
+      this.title = "添加库存明细查询"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -620,7 +454,7 @@ export default {
       getViewStockDetail(onlyIdentity).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改库存详情"
+        this.title = "修改库存明细查询"
       })
     },
     /** 提交按钮 */
@@ -646,7 +480,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const onlyIdentitys = row.onlyIdentity || this.ids
-      this.$modal.confirm("是否确认删除库存详情编号为" + onlyIdentitys + "的数据项?").then(function() {
+      this.$modal.confirm('是否确认删除库存明细查询编号为"' + onlyIdentitys + '"的数据项？').then(function() {
         return delViewStockDetail(onlyIdentitys)
       }).then(() => {
         this.getList()
@@ -657,18 +491,9 @@ export default {
     handleExport() {
       this.download('search/ViewStockDetail/export', {
         ...this.queryParams
-      }, `库存明细_${new Date().getTime()}.xlsx`)
+      }, `ViewStockDetail_${new Date().getTime()}.xlsx`)
     }
   }
 }
 </script>
-<style scoped>
-.el-table >>> .current-row {
-  background-color: #f0f9eb;
-}
-.el-form-item >>> .el-form-item__label {
-  white-space: nowrap;
-  width: auto;
-  min-width: fit-content;
-}
-</style>
+
diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
index d21abb5..c2ed542 100644
--- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="入库单号" prop="stockinId">
+      <el-form-item label="入库单据ID" prop="stockinId">
         <el-input
           v-model="queryParams.stockinId"
-          placeholder="请输入入库单号"
+          placeholder="请输入入库主单ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入库子单号" prop="stockinDetailId">
+      <el-form-item label="入库子单ID" prop="stockinDetailId">
         <el-input
           v-model="queryParams.stockinDetailId"
-          placeholder="请输入入库子单号"
+          placeholder="请输入子单ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,122 +33,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="规格型号" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生产图号" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入生产图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品状态" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择产品状态" clearable>
+      <el-form-item label="入库类型" prop="inType">
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
           <el-option
-            v-for="dict in dict.type.product_type"
+            v-for="dict in dict.type.in_bill_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据金额" prop="priceTotal">
-        <el-input
-          v-model="queryParams.priceTotal"
-          placeholder="请输入单据金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商代号" prop="supplierNo">
-        <el-input
-          v-model="queryParams.supplierNo"
-          placeholder="请输入供应商代号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商名称" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          placeholder="请输入供应商名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同号" prop="spare6">
-        <el-input
-          v-model="queryParams.spare6"
-          placeholder="请输入合同号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="台次" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="spare7">
-        <el-input
-          v-model="queryParams.spare7"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="账套" prop="spare3">
-        <el-select v-model="queryParams.spare3" placeholder="请选择账套" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建用户" prop="createManId">
-        <el-input
-          v-model="queryParams.createManId"
-          placeholder="请输入创建用户"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
-        <el-input
-          v-model="queryParams.createDate"
-          placeholder="请输入创建时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="单据状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
           <el-option
@@ -156,49 +50,34 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
+            v-if="['4', '5'].includes(dict.value)"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="质量" prop="spare8">
-        <el-select v-model="queryParams.spare8" placeholder="请选择质量" clearable>
-          <el-option
-            v-for="dict in dict.type.quality_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="来源" prop="spare1">
-        <el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用途" prop="spare4">
-        <el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="spare2">
-        <el-select v-model="queryParams.spare2" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
+<!--      <el-form-item label="erp单号" prop="erpBill">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.erpBill"-->
+<!--          placeholder="请输入erp单号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供应商编码" prop="supplierNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierNo"-->
+<!--          placeholder="请输入供应商编码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供应商名称" prop="supplierName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierName"-->
+<!--          placeholder="请输入供应商名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -206,38 +85,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['search:ViewStockinHistory:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['search:ViewStockinHistory:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['search:ViewStockinHistory:remove']"
-        >删除</el-button>
-      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -252,80 +99,47 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
-      <el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
-      <el-table-column label="规格型号" align="center" prop="spec" width="160"/>
-      <el-table-column label="生产图号" align="center" prop="cargoNo" width="160"/>
-      <el-table-column label="产品状态" align="center" prop="productType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="计划数量" align="center" prop="quantity" />
-      <el-table-column label="扫码数量" align="center" prop="scanNum" />
-      <el-table-column label="实际数量" align="center" prop="assignNum" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="单据金额" align="center" prop="priceTotal" />
-      <el-table-column label="供应商代号" align="center" prop="supplierNo" width="120"/>
-      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
-      <el-table-column label="合同号" align="center" prop="spare6" />
-      <el-table-column label="台次" align="center" prop="spare5" />
-      <el-table-column label="件次" align="center" prop="spare7" />
-      <el-table-column label="账套" align="center" prop="spare3">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建用户" align="center" prop="createManId" />
-      <el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
-      <el-table-column label="单据状态" align="center" prop="status">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="180" label="入库主单ID" align="center" prop="stockinId" />
+      <el-table-column width="180" label="子单ID" align="center" prop="stockinDetailId" />
+      <el-table-column width="120" label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="质量" align="center" prop="spare8">
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="120" label="计划数量" align="center" prop="quantity" />
+      <el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
+      <el-table-column width="200" label="units" align="center" prop="spare6" />
+      <el-table-column width="180" label="供应商编码" align="center" prop="supplierNo" />
+      <el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
+      <el-table-column width="120" label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
+          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="来源" align="center" prop="spare1">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="spare4">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="spare2">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockinHistory:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockinHistory:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column width="180" label="建立时间" align="center" prop="createDate" />
+      <el-table-column width="120" label="创建人" align="center" prop="createManId" />
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+      <el-table-column width="180" label="完成日期" align="center" prop="finishDate" />
+      <el-table-column width="180" label="erp单号" align="center" prop="erpBill" />
+<!--      <el-table-column label="单据来源" align="center" prop="stockSource" />-->
+<!--      <el-table-column label="部门编码" align="center" prop="departmentNo" />-->
+<!--      <el-table-column label="班组编码" align="center" prop="classNo" />-->
+<!--      <el-table-column label="客户编码" align="center" prop="customerNo" />-->
+      <el-table-column width="120" label="产品分类" align="center" prop="parentId" />
+<!--      <el-table-column label="价格" align="center" prop="price" />-->
+      <el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
+      <el-table-column width="180" label="单位id" align="center" prop="unit" />
+      <el-table-column width="180" label="型号" align="center" prop="spec" />
+      <el-table-column width="180" label="单位名称" align="center" prop="spare1" />
+      <el-table-column width="180" label="url" align="center" prop="spare3" />
+      <el-table-column width="180" label="btnurl" align="center" prop="spare4" />
+      <el-table-column width="180" label="unitjb" align="center" prop="spare7" />
+      <el-table-column width="180" label="扫码数量" align="center" prop="scanNum" />
+      <el-table-column width="180" label="实际数量" align="center" prop="assignNum" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
     </el-table>
 
     <pagination
@@ -336,145 +150,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改入库单据流水对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="入库单号" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入入库单号" />
-        </el-form-item>
-        <el-form-item label="入库子单号" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单号" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="规格型号" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格型号" />
-        </el-form-item>
-        <el-form-item label="生产图号" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入生产图号" />
-        </el-form-item>
-        <el-form-item label="产品状态" prop="productType">
-          <el-select v-model="form.productType" placeholder="请选择产品状态">
-            <el-option
-              v-for="dict in dict.type.product_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
-        </el-form-item>
-        <el-form-item label="单据金额" prop="priceTotal">
-          <el-input v-model="form.priceTotal" placeholder="请输入单据金额" />
-        </el-form-item>
-        <el-form-item label="供应商代号" prop="supplierNo">
-          <el-input v-model="form.supplierNo" placeholder="请输入供应商代号" />
-        </el-form-item>
-        <el-form-item label="供应商名称" prop="supplierName">
-          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-        </el-form-item>
-        <el-form-item label="合同号" prop="spare6">
-          <el-input v-model="form.spare6" placeholder="请输入合同号" />
-        </el-form-item>
-        <el-form-item label="台次" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入台次" />
-        </el-form-item>
-        <el-form-item label="件次" prop="spare7">
-          <el-input v-model="form.spare7" placeholder="请输入件次" />
-        </el-form-item>
-        <el-form-item label="账套" prop="spare3">
-          <el-select v-model="form.spare3" placeholder="请选择账套">
-            <el-option
-              v-for="dict in dict.type.account_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建用户" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建用户" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入创建时间" />
-        </el-form-item>
-        <el-form-item label="单据状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择单据状态">
-            <el-option
-              v-for="dict in dict.type.in_bill_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="质量" prop="spare8">
-          <el-select v-model="form.spare8" placeholder="请选择质量">
-            <el-option
-              v-for="dict in dict.type.quality_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="来源" prop="spare1">
-          <el-select v-model="form.spare1" placeholder="请选择来源">
-            <el-option
-              v-for="dict in dict.type.origin_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用途" prop="spare4">
-          <el-select v-model="form.spare4" placeholder="请选择用途">
-            <el-option
-              v-for="dict in dict.type.purpose_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="spare2">
-          <el-select v-model="form.spare2" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.turnover_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listViewStockinHistory, getViewStockinHistory, delViewStockinHistory, addViewStockinHistory, updateViewStockinHistory } from "@/api/search/ViewStockinHistory"
+import { listViewStockinHistory, getViewStockinHistory} from "@/api/search/ViewStockinHistory"
 
 export default {
   name: "ViewStockinHistory",
-  dicts: ['product_type', 'quality_type', 'turnover_type', 'purpose_type', 'origin_type', 'in_bill_status', 'account_type'],
+  dicts: ['in_bill_status', 'in_bill_type'],
   data() {
     return {
       // 遮罩层
@@ -489,7 +174,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 入库单据流水表格数据
+      // 入库单据历史表格数据
       ViewStockinHistoryList: [],
       // 弹出层标题
       title: "",
@@ -500,41 +185,49 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockinId: null,
+        inType: null,
+        createDate: null,
+        createManId: null,
+        status: null,
+        warehouseId: null,
+        finishDate: null,
+        erpBill: null,
+        stockSource: null,
+        departmentNo: null,
+        classNo: null,
+        customerNo: null,
+        supplierNo: null,
         stockinDetailId: null,
         productId: null,
         productName: null,
-        spec: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        productType: null,
+        unit: null,
+        spec: null,
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
         quantity: null,
         scanNum: null,
         assignNum: null,
-        unit: null,
-        price: null,
-        priceTotal: null,
-        supplierNo: null,
-        supplierName: null,
-        spare6: null,
-        spare5: null,
-        spare7: null,
-        spare3: null,
-        createManId: null,
-        createDate: null,
-        status: null,
-        spare8: null,
-        spare1: null,
-        spare4: null,
-        spare2: null
+        supplierName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         stockinId: [
-          { required: true, message: "入库单号不能为空", trigger: "blur" }
+          { required: true, message: "入库主单ID不能为空", trigger: "blur" }
+        ],
+        inType: [
+          { required: true, message: "入库类型不能为空", trigger: "change" }
         ],
         createDate: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+          { required: true, message: "建立时间不能为空", trigger: "blur" }
         ],
         status: [
           { required: true, message: "单据状态不能为空", trigger: "change" }
@@ -546,7 +239,7 @@ export default {
     this.getList()
   },
   methods: {
-    /** 查询入库单据流水列表 */
+    /** 查询入库单据历史列表 */
     getList() {
       this.loading = true
       listViewStockinHistory(this.queryParams).then(response => {
@@ -564,32 +257,37 @@ export default {
     reset() {
       this.form = {
         stockinId: null,
+        inType: null,
+        createDate: null,
+        createManId: null,
+        status: null,
+        warehouseId: null,
+        finishDate: null,
+        erpBill: null,
+        stockSource: null,
+        departmentNo: null,
+        classNo: null,
+        customerNo: null,
+        supplierNo: null,
         stockinDetailId: null,
         productId: null,
         productName: null,
-        spec: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        productType: null,
+        unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
         quantity: null,
         scanNum: null,
         assignNum: null,
-        unit: null,
-        price: null,
-        priceTotal: null,
-        supplierNo: null,
-        supplierName: null,
-        spare6: null,
-        spare5: null,
-        spare7: null,
-        spare3: null,
-        createManId: null,
-        createDate: null,
-        status: null,
-        spare8: null,
-        remark: null,
-        spare1: null,
-        spare4: null,
-        spare2: null
+        supplierName: null
       }
       this.resetForm("form")
     },
@@ -613,7 +311,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加入库单据流水"
+      this.title = "添加入库单据历史"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -622,7 +320,7 @@ export default {
       getViewStockinHistory(stockinId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改入库单据流水"
+        this.title = "修改入库单据历史"
       })
     },
     /** 提交按钮 */
@@ -648,7 +346,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockinIds = row.stockinId || this.ids
-      this.$modal.confirm('是否确认删除入库单据流水编号为"' + stockinIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除入库单据历史编号为"' + stockinIds + '"的数据项？').then(function() {
         return delViewStockinHistory(stockinIds)
       }).then(() => {
         this.getList()
@@ -664,3 +362,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index eac93b8..040d2df 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -1,22 +1,43 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出库单号" prop="stockoutId">
+      <el-form-item label="出库订单ID" prop="stockoutId">
         <el-input
           v-model="queryParams.stockoutId"
-          placeholder="请输入出库单号"
+          placeholder="请输入出库订单ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出库子单号" prop="stockoutDetailId">
+      <el-form-item label="出库类型" prop="outType">
+        <el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
+          <el-option
+            v-for="dict in dict.type.out_bill_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.out_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="子单id" prop="stockoutDetailId">
         <el-input
           v-model="queryParams.stockoutDetailId"
-          placeholder="请输入出库子单号"
+          placeholder="请输入子单id"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -33,228 +54,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图号" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料状态" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择物料状态" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="出库数量" prop="quantity">
-        <el-input
-          v-model="queryParams.quantity"
-          placeholder="请输入出库数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分配数量" prop="allotQuantity">
-        <el-input
-          v-model="queryParams.allotQuantity"
-          placeholder="请输入分配数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实际数量" prop="assignNum">
-        <el-input
-          v-model="queryParams.assignNum"
-          placeholder="请输入实际数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同号" prop="contract">
-        <el-input
-          v-model="queryParams.contract"
-          placeholder="请输入合同号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="台次" prop="power">
-        <el-input
-          v-model="queryParams.power"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="phase">
-        <el-input
-          v-model="queryParams.phase"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出库金额" prop="priceTotal">
-        <el-input
-          v-model="queryParams.priceTotal"
-          placeholder="请输入出库金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户编码" prop="customerNo">
-        <el-input
-          v-model="queryParams.customerNo"
-          placeholder="请输入客户编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
-          <el-option
-            v-for="dict in dict.type.out_bill_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createManId">
-        <el-input
-          v-model="queryParams.createManId"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
-        <el-input
-          v-model="queryParams.createDate"
-          placeholder="请输入创建时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="套账" prop="account">
-        <el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="管理号" prop="managementNo">
-        <el-input
-          v-model="queryParams.managementNo"
-          placeholder="请输入管理号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商编码" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          placeholder="请输入供应商"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用途" prop="purpose">
-        <el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="质量" prop="quality">
-        <el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
-          <el-option
-            v-for="dict in dict.type.quality_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="来源" prop="source">
-        <el-select v-model="queryParams.source" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="turnoverStatus">
-        <el-select v-model="queryParams.turnoverStatus" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用途2" prop="purpose2">
-        <el-input
-          v-model="queryParams.purpose2"
-          placeholder="请输入用途2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -262,38 +61,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['search:ViewStockoutHistory:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['search:ViewStockoutHistory:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['search:ViewStockoutHistory:remove']"
-        >删除</el-button>
-      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -308,84 +75,47 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="出库单号" align="center" prop="stockoutId" width="160"/>
-      <el-table-column label="出库子单号" align="center" prop="stockoutDetailId" width="160"/>
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
-      <el-table-column label="图号" align="center" prop="cargoNo" width="160"/>
-      <el-table-column label="物料状态" align="center" prop="productType">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="180" label="出库订单ID" align="center" prop="stockoutId" />
+      <el-table-column width="180" label="子单id" align="center" prop="stockoutDetailId" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="数量" align="center" prop="quantity" />
+      <el-table-column width="200" label="unitPrices" align="center" prop="spare5" />
+      <el-table-column width="200" label="units" align="center" prop="spare6" />
+      <el-table-column width="120" label="出库类型" align="center" prop="outType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
+          <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
         </template>
       </el-table-column>
-      <el-table-column label="出库数量" align="center" prop="quantity" />
-      <el-table-column label="分配数量" align="center" prop="allotQuantity" />
-      <el-table-column label="实际数量" align="center" prop="assignNum" />
-      <el-table-column label="合同号" align="center" prop="contract" />
-      <el-table-column label="台次" align="center" prop="power" />
-      <el-table-column label="件次" align="center" prop="phase" />
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="出库金额" align="center" prop="priceTotal" />
-      <el-table-column label="客户编码" align="center" prop="customerNo" width="120"/>
-      <el-table-column label="客户名称" align="center" prop="customerName" width="160"/>
-      <el-table-column label="单据状态" align="center" prop="status">
+      <el-table-column width="180" label="建立时间" align="center" prop="createDate" />
+      <el-table-column width="120" label="创建人" align="center" prop="createManId" />
+      <el-table-column width="120" label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createManId" />
-      <el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="套账" align="center" prop="account">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="管理号" align="center" prop="managementNo" />
-      <el-table-column label="供应商编码" align="center" prop="supplierId" width="120"/>
-      <el-table-column label="供应商" align="center" prop="supplierName" width="160"/>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="用途" align="center" prop="purpose">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="质量" align="center" prop="quality">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="turnoverStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.turnoverStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途2" align="center" prop="purpose2" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['search:ViewStockoutHistory:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['search:ViewStockoutHistory:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>-->
+      <el-table-column width="180" label="供应商编号" align="center" prop="supplierNo" />
+      <el-table-column width="180" label="供应商名称" align="center" prop="supplierName" />
+      <el-table-column width="180" label="客户编号" align="center" prop="customerNo" />
+      <el-table-column width="180" label="客户名称" align="center" prop="contactName" />
+      <el-table-column width="180" label="单据来源" align="center" prop="stockoutSource" />
+      <el-table-column width="180" label="出口" align="center" prop="exitId" />
+      <el-table-column width="180" label="单据主题" align="center" prop="FID" />
+      <el-table-column width="180" label="erp出库id" align="center" prop="erpStockoutId" />
+      <el-table-column width="180" label="批次" align="center" prop="lotNo" />
+      <el-table-column width="180" label="实际数量" align="center" prop="assignNum" />
+      <el-table-column width="180" label="分配数量" align="center" prop="allotQuantity" />
+      <el-table-column width="180" label="产品分类" align="center" prop="parentId" />
+      <el-table-column width="180" label="价格" align="center" prop="price" />
+      <el-table-column width="180" label="产品编码" align="center" prop="cargoNo" />
+      <el-table-column width="180" label="单位id" align="center" prop="unit" />
+      <el-table-column width="180" label="型号" align="center" prop="spec" />
+      <el-table-column width="180" label="单位名称" align="center" prop="spare1" />
+      <el-table-column width="180" label="url" align="center" prop="spare3" />
+      <el-table-column width="180" label="btnurl" align="center" prop="spare4" />
+      <el-table-column width="180" label="unitjb" align="center" prop="spare7" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
     </el-table>
 
     <pagination
@@ -396,166 +126,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改出库单据历史对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="出库单号" prop="stockoutId">
-          <el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
-        </el-form-item>
-        <el-form-item label="出库子单号" prop="stockoutDetailId">
-          <el-input v-model="form.stockoutDetailId" placeholder="请输入出库子单号" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="图号" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入图号" />
-        </el-form-item>
-        <el-form-item label="物料状态" prop="productType">
-          <el-select v-model="form.productType" placeholder="请选择物料状态">
-            <el-option
-              v-for="dict in dict.type.product_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入出库数量" />
-        </el-form-item>
-        <el-form-item label="分配数量" prop="allotQuantity">
-          <el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
-        </el-form-item>
-        <el-form-item label="实际数量" prop="assignNum">
-          <el-input v-model="form.assignNum" placeholder="请输入实际数量" />
-        </el-form-item>
-        <el-form-item label="合同号" prop="contract">
-          <el-input v-model="form.contract" placeholder="请输入合同号" />
-        </el-form-item>
-        <el-form-item label="台次" prop="power">
-          <el-input v-model="form.power" placeholder="请输入台次" />
-        </el-form-item>
-        <el-form-item label="件次" prop="phase">
-          <el-input v-model="form.phase" placeholder="请输入件次" />
-        </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
-        </el-form-item>
-        <el-form-item label="出库金额" prop="priceTotal">
-          <el-input v-model="form.priceTotal" placeholder="请输入出库金额" />
-        </el-form-item>
-        <el-form-item label="客户编码" prop="customerNo">
-          <el-input v-model="form.customerNo" placeholder="请输入客户编码" />
-        </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-        </el-form-item>
-        <el-form-item label="单据状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择单据状态">
-            <el-option
-              v-for="dict in dict.type.out_bill_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建人" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入创建时间" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="套账" prop="account">
-          <el-select v-model="form.account" placeholder="请选择套账">
-            <el-option
-              v-for="dict in dict.type.account_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="管理号" prop="managementNo">
-          <el-input v-model="form.managementNo" placeholder="请输入管理号" />
-        </el-form-item>
-        <el-form-item label="供应商编码" prop="supplierId">
-          <el-input v-model="form.supplierId" placeholder="请输入供应商编码" />
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="form.supplierName" placeholder="请输入供应商" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="用途" prop="purpose">
-          <el-select v-model="form.purpose" placeholder="请选择用途">
-            <el-option
-              v-for="dict in dict.type.purpose_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="质量" prop="quality">
-          <el-select v-model="form.quality" placeholder="请选择质量">
-            <el-option
-              v-for="dict in dict.type.quality_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="来源" prop="source">
-          <el-select v-model="form.source" placeholder="请选择来源">
-            <el-option
-              v-for="dict in dict.type.origin_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="turnoverStatus">
-          <el-select v-model="form.turnoverStatus" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.turnover_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用途2" prop="purpose2">
-          <el-input v-model="form.purpose2" placeholder="请输入用途2" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listViewStockoutHistory, getViewStockoutHistory, delViewStockoutHistory, addViewStockoutHistory, updateViewStockoutHistory } from "@/api/search/ViewStockoutHistory"
+import { listViewStockoutHistory, getViewStockoutHistory} from "@/api/search/ViewStockoutHistory"
 
 export default {
   name: "ViewStockoutHistory",
-  dicts: ['product_type', 'quality_type', 'turnover_type', 'purpose_type', 'origin_type', 'account_type', 'out_bill_status'],
+  dicts: ['out_bill_type', 'out_bill_status'],
   data() {
     return {
       // 遮罩层
@@ -581,52 +161,41 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockoutId: null,
+        outType: null,
+        createDate: null,
+        createManId: null,
+        status: null,
+        stockoutSource: null,
+        exitId: null,
+        FID: null,
+        erpStockoutId: null,
         stockoutDetailId: null,
+        lotNo: null,
+        quantity: null,
+        assignNum: null,
+        allotQuantity: null,
         productId: null,
         productName: null,
-        spec: null,
-        cargoNo: null,
-        productType: null,
-        quantity: null,
-        allotQuantity: null,
-        assignNum: null,
-        contract: null,
-        power: null,
-        phase: null,
+        parentId: null,
         price: null,
-        priceTotal: null,
-        customerNo: null,
-        customerName: null,
-        status: null,
-        createManId: null,
-        createDate: null,
+        cargoNo: null,
         unit: null,
-        account: null,
-        managementNo: null,
-        supplierId: null,
+        spec: null,
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
+        supplierNo: null,
         supplierName: null,
-        purpose: null,
-        quality: null,
-        source: null,
-        turnoverStatus: null,
-        purpose2: null
+        customerNo: null,
+        contactName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        stockoutId: [
-          { required: true, message: "出库单号不能为空", trigger: "blur" }
-        ],
-        stockoutDetailId: [
-          { required: true, message: "出库子单号不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "单据状态不能为空", trigger: "change" }
-        ],
-        createDate: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
       }
     }
   },
@@ -652,36 +221,37 @@ export default {
     reset() {
       this.form = {
         stockoutId: null,
+        outType: null,
+        createDate: null,
+        createManId: null,
+        status: null,
+        stockoutSource: null,
+        exitId: null,
+        FID: null,
+        erpStockoutId: null,
         stockoutDetailId: null,
+        lotNo: null,
+        quantity: null,
+        assignNum: null,
+        allotQuantity: null,
         productId: null,
         productName: null,
-        spec: null,
-        cargoNo: null,
-        productType: null,
-        quantity: null,
-        allotQuantity: null,
-        assignNum: null,
-        contract: null,
-        power: null,
-        phase: null,
+        parentId: null,
         price: null,
-        priceTotal: null,
-        customerNo: null,
-        customerName: null,
-        status: null,
-        createManId: null,
-        createDate: null,
+        cargoNo: null,
         unit: null,
-        account: null,
-        managementNo: null,
-        supplierId: null,
-        supplierName: null,
+        spec: null,
         remark: null,
-        purpose: null,
-        quality: null,
-        source: null,
-        turnoverStatus: null,
-        purpose2: null
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
+        supplierNo: null,
+        supplierName: null,
+        customerNo: null,
+        contactName: null
       }
       this.resetForm("form")
     },
@@ -756,3 +326,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>