diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
index 34c7040..e9b2169 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
@@ -2,6 +2,10 @@ package com.ruoyi.search.StockSummary.domain;
 
 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;
 
 /**
  * 库存汇总对象 stock_summary
@@ -9,6 +13,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-05-26
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
 public class StockSummary extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -18,71 +26,212 @@ public class StockSummary extends BaseEntity
     private Long onlyIdentity;
 
     /** 物料编码 */
-    @Excel(name = "${search.StockSummary.productId}")
+    @Excel(name = "物料编码")
     private String productId;
 
     /** 物料名称 */
-    @Excel(name = "${search.StockSummary.productName}")
+    @Excel(name = "物料名称")
     private String productName;
 
     /** 规格 */
-//    @Excel(name = "${search.StockSummary.spec}")
+    @Excel(name = "规格")
     private String spec;
 
     /** 单位 */
-    @Excel(name = "${search.StockSummary.unit}")
+    @Excel(name = "单位")
     private String unit;
 
     /** 批号 */
-//    @Excel(name = "${search.StockSummary.lotNo}")
+    @Excel(name = "批号")
     private String lotNo;
 
     /** 仓库 */
     private String warehouseId;
-    @Excel(name = "${search.StockSummary.warehouseName}")
+    @Excel(name = "仓库")
     private String warehouseName;
 
-    @Excel(name = "${search.StockSummary.cargoSpaceName}")
+    @Excel(name = "货位")
     private String cargoSpaceName;
 
     /** 巷道 */
+    @Excel(name = "巷道")
     private String roadwayId;
 
     /** 库存数量 */
-    @Excel(name = "${search.StockSummary.quantity}")
+    @Excel(name = "库存数量")
     private Double quantity;
 
 
     /** 价格 */
-//    @Excel(name = "${search.StockSummary.price}")
+    @Excel(name = "价格")
     private String price;
 
-    /** 英文名称 */
-    @Excel(name = "${search.StockSummary.spare1}")
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 型号 */
+    @Excel(name = "型号")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.StockSummary.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.StockSummary.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.StockSummary.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.StockSummary.spare7}")
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.StockSummary.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
 
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
+
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
+
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
+
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
+
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
+
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
+
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
+
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
+
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
+
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
+
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
+
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
+
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
+
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
+
+    /** 产品线/产品系列（组码） */
+    @Excel(name = "产品线/产品系列")
+    private String spare24;
+
+    /** BOM状态（组码） */
+    @Excel(name = "BOM状态")
+    private String spare25;
+
+    /** 产品定位（组码） */
+    @Excel(name = "产品定位")
+    private String spare26;
+
+    /** 电脑板型号（组码） */
+    @Excel(name = "电脑板型号")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌（组码） */
+    @Excel(name = "品牌")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
     /** 备注 */
-    @Excel(name = "${search.StockSummary.remark}")
+    @Excel(name = "备注")
     private String remark;
     private String cargoSpaceId;
 
@@ -97,348 +246,48 @@ public class StockSummary extends BaseEntity
     private Boolean groupByWarehouseId;
     private Boolean groupByRoadwayId;
     private Boolean groupByPrice;
+    private Boolean groupByParentId;
+    private Boolean groupByCargoNo;
     private Boolean groupBySpare1;
     private Boolean groupBySpare2;
+    private Boolean groupBySpare3;
+    private Boolean groupBySpare4;
     private Boolean groupBySpare5;
     private Boolean groupBySpare6;
     private Boolean groupBySpare7;
     private Boolean groupBySpare8;
+    private Boolean groupBySpare9;
+    private Boolean groupBySpare10;
+    private Boolean groupBySpare11;
+    private Boolean groupBySpare12;
+    private Boolean groupBySpare13;
+    private Boolean groupBySpare14;
+    private Boolean groupBySpare15;
+    private Boolean groupBySpare16;
+    private Boolean groupBySpare17;
+    private Boolean groupBySpare18;
+    private Boolean groupBySpare19;
+    private Boolean groupBySpare20;
+    private Boolean groupBySpare21;
+    private Boolean groupBySpare22;
+    private Boolean groupBySpare23;
+    private Boolean groupBySpare24;
+    private Boolean groupBySpare25;
+    private Boolean groupBySpare26;
+    private Boolean groupBySpare27;
+    private Boolean groupBySpare28;
+    private Boolean groupBySpare29;
+    private Boolean groupBySpare30;
+    private Boolean groupBySpare31;
+    private Boolean groupBySpare32;
+    private Boolean groupBySpare33;
+    private Boolean groupBySpare34;
+    private Boolean groupBySpare35;
+    private Boolean groupBySpare36;
+    private Boolean groupBySpare37;
+    private Boolean groupBySpare38;
+    private Boolean groupBySpare39;
     private Boolean groupByCargoSpaceId;
 
-    public String getCargoSpaceName() {
-        return cargoSpaceName;
-    }
 
-    public void setCargoSpaceName(String cargoSpaceName) {
-        this.cargoSpaceName = cargoSpaceName;
-    }
-
-    public String getCargoSpaceId() {
-        return cargoSpaceId;
-    }
-
-    public void setCargoSpaceId(String cargoSpaceId) {
-        this.cargoSpaceId = cargoSpaceId;
-    }
-
-    public Boolean getGroupByCargoSpaceId() {
-        return groupByCargoSpaceId;
-    }
-
-    public void setGroupByCargoSpaceId(Boolean groupByCargoSpaceId) {
-        this.groupByCargoSpaceId = groupByCargoSpaceId;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getSpare1() {
-        return spare1;
-    }
-
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare2() {
-        return spare2;
-    }
-
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare5() {
-        return spare5;
-    }
-
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare6() {
-        return spare6;
-    }
-
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare7() {
-        return spare7;
-    }
-
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare8() {
-        return spare8;
-    }
-
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
-
-    @Override
-    public String getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Boolean getGroupByPrice() {
-        return groupByPrice;
-    }
-
-    public void setGroupByPrice(Boolean groupByPrice) {
-        this.groupByPrice = groupByPrice;
-    }
-
-    public Boolean getGroupBySpare1() {
-        return groupBySpare1;
-    }
-
-    public void setGroupBySpare1(Boolean groupBySpare1) {
-        this.groupBySpare1 = groupBySpare1;
-    }
-
-    public Boolean getGroupBySpare2() {
-        return groupBySpare2;
-    }
-
-    public void setGroupBySpare2(Boolean groupBySpare2) {
-        this.groupBySpare2 = groupBySpare2;
-    }
-
-    public Boolean getGroupBySpare5() {
-        return groupBySpare5;
-    }
-
-    public void setGroupBySpare5(Boolean groupBySpare5) {
-        this.groupBySpare5 = groupBySpare5;
-    }
-
-    public Boolean getGroupBySpare6() {
-        return groupBySpare6;
-    }
-
-    public void setGroupBySpare6(Boolean groupBySpare6) {
-        this.groupBySpare6 = groupBySpare6;
-    }
-
-    public Boolean getGroupBySpare7() {
-        return groupBySpare7;
-    }
-
-    public void setGroupBySpare7(Boolean groupBySpare7) {
-        this.groupBySpare7 = groupBySpare7;
-    }
-
-    public Boolean getGroupBySpare8() {
-        return groupBySpare8;
-    }
-
-    public void setGroupBySpare8(Boolean groupBySpare8) {
-        this.groupBySpare8 = groupBySpare8;
-    }
-
-    public Boolean getGroupByProductId() {
-        return groupByProductId;
-    }
-
-    public void setGroupByProductId(Boolean groupByProductId) {
-        this.groupByProductId = groupByProductId;
-    }
-
-    public Boolean getGroupByProductName() {
-        return groupByProductName;
-    }
-
-    public void setGroupByProductName(Boolean groupByProductName) {
-        this.groupByProductName = groupByProductName;
-    }
-
-    public Boolean getGroupBySpec() {
-        return groupBySpec;
-    }
-
-    public void setGroupBySpec(Boolean groupBySpec) {
-        this.groupBySpec = groupBySpec;
-    }
-
-    public Boolean getGroupByUnit() {
-        return groupByUnit;
-    }
-
-    public void setGroupByUnit(Boolean groupByUnit) {
-        this.groupByUnit = groupByUnit;
-    }
-
-    public Boolean getGroupByLotNo() {
-        return groupByLotNo;
-    }
-
-    public void setGroupByLotNo(Boolean groupByLotNo) {
-        this.groupByLotNo = groupByLotNo;
-    }
-
-    public Boolean getGroupByWarehouseId() {
-        return groupByWarehouseId;
-    }
-
-    public void setGroupByWarehouseId(Boolean groupByWarehouseId) {
-        this.groupByWarehouseId = groupByWarehouseId;
-    }
-
-    public Boolean getGroupByRoadwayId() {
-        return groupByRoadwayId;
-    }
-
-    public void setGroupByRoadwayId(Boolean groupByRoadwayId) {
-        this.groupByRoadwayId = groupByRoadwayId;
-    }
-
-    public void setOnlyIdentity(Long onlyIdentity)
-    {
-        this.onlyIdentity = onlyIdentity;
-    }
-
-    public Long getOnlyIdentity()
-    {
-        return onlyIdentity;
-    }
-
-    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 setUnit(String unit)
-    {
-        this.unit = unit;
-    }
-
-    public String getUnit()
-    {
-        return unit;
-    }
-
-    public void setLotNo(String lotNo)
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo()
-    {
-        return lotNo;
-    }
-
-    public void setWarehouseId(String warehouseId)
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId()
-    {
-        return warehouseId;
-    }
-
-    public void setRoadwayId(String roadwayId)
-    {
-        this.roadwayId = roadwayId;
-    }
-
-    public String getRoadwayId()
-    {
-        return roadwayId;
-    }
-
-    public void setQuantity(Double quantity)
-    {
-        this.quantity = quantity;
-    }
-
-    public Double getQuantity()
-    {
-        return quantity;
-    }
-
-    @Override
-    public String toString() {
-        return "StockSummary{" +
-                "onlyIdentity=" + onlyIdentity +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", quantity=" + quantity +
-                ", price='" + price + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                ", groupByProductId=" + groupByProductId +
-                ", groupByProductName=" + groupByProductName +
-                ", groupBySpec=" + groupBySpec +
-                ", groupByUnit=" + groupByUnit +
-                ", groupByLotNo=" + groupByLotNo +
-                ", groupByWarehouseId=" + groupByWarehouseId +
-                ", groupByRoadwayId=" + groupByRoadwayId +
-                ", groupByPrice=" + groupByPrice +
-                ", groupBySpare1=" + groupBySpare1 +
-                ", groupBySpare2=" + groupBySpare2 +
-                ", groupBySpare5=" + groupBySpare5 +
-                ", groupBySpare6=" + groupBySpare6 +
-                ", groupBySpare7=" + groupBySpare7 +
-                ", groupBySpare8=" + groupBySpare8 +
-                '}';
-    }
 }
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 68efbee..89a024a 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
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewInJobFlow.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.ViewInJobFlow.domain.ViewInJobFlow;
 import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
-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-28
+ * @date 2025-09-22
  */
 @RestController
 @RequestMapping("/search/ViewInJobFlow")
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 44908a2..9058c99 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,560 +1,1105 @@
 package com.ruoyi.search.ViewInJobFlow.domain;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
-import java.util.Date;
-
 /**
  * 入库作业流水对象 view_in_job_flow
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-22
  */
 public class ViewInJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 作业ID */
-    @Excel(name = "${search.ViewInJobFlow.jobId}")
+    @Excel(name = "作业ID")
     private String jobId;
 
     /** 子作业ID */
-    @Excel(name = "${search.ViewInJobFlow.jobDetailId}")
+    @Excel(name = "子作业ID")
     private String jobDetailId;
 
     /** 状态 */
-    @Excel(name = "${search.ViewInJobFlow.status}",dictType = "mydo_job_status")
+    @Excel(name = "状态")
     private String status;
 
     /** 任务号 */
-    @Excel(name = "${search.ViewInJobFlow.taskNo}")
+    @Excel(name = "任务号")
     private String taskNo;
 
     /** 托盘号 */
-    @Excel(name = "${search.ViewInJobFlow.trayCode}")
+    @Excel(name = "托盘号")
     private String trayCode;
 
     /** 巷道ID */
-//    @Excel(name = "${search.ViewInJobFlow.roadwayId}")
+    @Excel(name = "巷道ID")
     private String roadwayId;
 
     /** 货位ID */
-//    @Excel(name = "${search.ViewInJobFlow.cargoSpaceId}")
+    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
     /** 货位名称 */
-    @Excel(name = "${search.ViewInJobFlow.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 排 */
-//    @Excel(name = "${search.ViewInJobFlow.thePlatoon}")
+    @Excel(name = "排")
     private Long thePlatoon;
 
     /** 列 */
-//    @Excel(name = "${search.ViewInJobFlow.theColumn}")
+    @Excel(name = "列")
     private Long theColumn;
 
     /** 层 */
-//    @Excel(name = "${search.ViewInJobFlow.theFloor}")
+    @Excel(name = "层")
     private Long theFloor;
 
     /** 优先级 */
-    @Excel(name = "${search.ViewInJobFlow.priority}")
+    @Excel(name = "优先级")
     private Long priority;
 
     /** 执行阶段 */
-//    @Excel(name = "${search.ViewInJobFlow.executionPhase}",dictType = "execution_phase_type")
+    @Excel(name = "执行阶段")
     private String executionPhase;
 
     /** 作业类型 */
-    @Excel(name = "${search.ViewInJobFlow.inOrOut}",dictType = "in_job_type")
+    @Excel(name = "作业类型")
     private String inOrOut;
 
     /** 入口ID */
-    @Excel(name = "${search.ViewInJobFlow.entranceId}")
+    @Excel(name = "入口ID")
     private String entranceId;
 
     /** 物料ID */
-    @Excel(name = "${search.ViewInJobFlow.productId}")
-    private String productId;
+    @Excel(name = "物料ID")
+    private String wlbh;
 
     /** 批号 */
-//    @Excel(name = "${search.ViewInJobFlow.lotNo}")
+    @Excel(name = "批号")
     private String lotNo;
 
     /** 垛型ID */
-//    @Excel(name = "${search.ViewInJobFlow.stackingId}")
+    @Excel(name = "垛型ID")
     private String stackingId;
 
     /** 库存状态 */
-//    @Excel(name = "${search.ViewInJobFlow.stockStatus}")
+    @Excel(name = "库存状态")
     private String stockStatus;
 
     /** 入库数量 */
-    @Excel(name = "${search.ViewInJobFlow.inQuantity}")
+    @Excel(name = "入库数量")
     private String inQuantity;
 
     /** 单据ID */
-    @Excel(name = "${search.ViewInJobFlow.inOrOutId}")
+    @Excel(name = "单据ID")
     private String inOrOutId;
 
     /** 子单据ID */
-    @Excel(name = "${search.ViewInJobFlow.inOrOutDId}")
+    @Excel(name = "子单据ID")
     private String inOrOutDId;
 
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
     /** 开始时间 */
-//    @Excel(name = "${search.ViewInJobFlow.startTime}")
+    @Excel(name = "开始时间")
     private String startTime;
 
     /** 结束时间 */
-    @Excel(name = "${search.ViewInJobFlow.finishTime}")
+    @Excel(name = "结束时间")
     private String finishTime;
 
     /** 仓库ID */
-    @Excel(name = "${search.ViewInJobFlow.warehouseId}")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
-    /** 物料名称 */
-    @Excel(name = "${search.ViewInJobFlow.productName}")
-    private String productName;
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
 
-    /** 规格 */
-//    @Excel(name = "${search.ViewInJobFlow.spec}")
-    private String spec;
+    /** 品名 */
+    @Excel(name = "品名")
+    private String productId;
 
-    /** 单位 */
-    @Excel(name = "${search.ViewInJobFlow.unit}")
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String price;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
     private String unit;
 
-    /** 英文名称 */
-    @Excel(name = "${search.ViewInJobFlow.spare1}")
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
+
+    /** 型号 */
+    @Excel(name = "型号")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.ViewInJobFlow.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewInJobFlow.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewInJobFlow.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewInJobFlow.spare7}")
+    /** 品名 */
+    @Excel(name = "品名")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewInJobFlow.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
 
-    /** 价格 */
-    @Excel(name = "${search.ViewInJobFlow.price}")
-    private String price;
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
 
-    /** 备注 */
-    @Excel(name = "${search.ViewInJobFlow.remark}")
-    private String remark;
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
 
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
 
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
 
-    @Override
-    public String getRemark() {
-        return remark;
-    }
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
 
-    public String getPrice() {
-        return price;
-    }
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
 
-    public void setPrice(String price) {
-        this.price = price;
-    }
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
 
-    public String getSpare1() {
-        return spare1;
-    }
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
 
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
 
-    public String getSpare2() {
-        return spare2;
-    }
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
 
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
 
-    public String getSpare5() {
-        return spare5;
-    }
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
 
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
 
-    public String getSpare6() {
-        return spare6;
-    }
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
+    /** 产品线/产品系列（组码） */
+    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
+    private String spare24;
 
-    public String getSpare7() {
-        return spare7;
-    }
+    /** BOM状态（组码） */
+    @Excel(name = "BOM状态", readConverterExp = "组=码")
+    private String spare25;
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
+    /** 产品定位（组码） */
+    @Excel(name = "产品定位", readConverterExp = "组=码")
+    private String spare26;
 
-    public String getSpare8() {
-        return spare8;
-    }
+    /** 电脑板型号（组码） */
+    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+    private String spare27;
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
 
-    public void setJobId(String jobId)
+    /** 品牌（组码） */
+    @Excel(name = "品牌", readConverterExp = "组=码")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款", readConverterExp = "组=码")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
+    public void setJobId(String jobId) 
     {
         this.jobId = jobId;
     }
 
-    public String getJobId()
+    public String getJobId() 
     {
         return jobId;
     }
 
-    public void setJobDetailId(String jobDetailId)
+    public void setJobDetailId(String jobDetailId) 
     {
         this.jobDetailId = jobDetailId;
     }
 
-    public String getJobDetailId()
+    public String getJobDetailId() 
     {
         return jobDetailId;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setTaskNo(String taskNo)
+    public void setTaskNo(String taskNo) 
     {
         this.taskNo = taskNo;
     }
 
-    public String getTaskNo()
+    public String getTaskNo() 
     {
         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 setRoadwayId(String roadwayId)
+    public void setRoadwayId(String roadwayId) 
     {
         this.roadwayId = roadwayId;
     }
 
-    public String getRoadwayId()
+    public String getRoadwayId() 
     {
         return roadwayId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId)
+    public void setCargoSpaceId(String cargoSpaceId) 
     {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceId()
+    public String getCargoSpaceId() 
     {
         return cargoSpaceId;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName)
+    public void setCargoSpaceName(String cargoSpaceName) 
     {
         this.cargoSpaceName = cargoSpaceName;
     }
 
-    public String getCargoSpaceName()
+    public String getCargoSpaceName() 
     {
         return cargoSpaceName;
     }
 
-    public void setThePlatoon(Long thePlatoon)
+    public void setThePlatoon(Long thePlatoon) 
     {
         this.thePlatoon = thePlatoon;
     }
 
-    public Long getThePlatoon()
+    public Long getThePlatoon() 
     {
         return thePlatoon;
     }
 
-    public void setTheColumn(Long theColumn)
+    public void setTheColumn(Long theColumn) 
     {
         this.theColumn = theColumn;
     }
 
-    public Long getTheColumn()
+    public Long getTheColumn() 
     {
         return theColumn;
     }
 
-    public void setTheFloor(Long theFloor)
+    public void setTheFloor(Long theFloor) 
     {
         this.theFloor = theFloor;
     }
 
-    public Long getTheFloor()
+    public Long getTheFloor() 
     {
         return theFloor;
     }
 
-    public void setPriority(Long priority)
+    public void setPriority(Long priority) 
     {
         this.priority = priority;
     }
 
-    public Long getPriority()
+    public Long getPriority() 
     {
         return priority;
     }
 
-    public void setExecutionPhase(String executionPhase)
+    public void setExecutionPhase(String executionPhase) 
     {
         this.executionPhase = executionPhase;
     }
 
-    public String getExecutionPhase()
+    public String getExecutionPhase() 
     {
         return executionPhase;
     }
 
-    public void setInOrOut(String inOrOut)
+    public void setInOrOut(String inOrOut) 
     {
         this.inOrOut = inOrOut;
     }
 
-    public String getInOrOut()
+    public String getInOrOut() 
     {
         return inOrOut;
     }
 
-    public void setEntranceId(String entranceId)
+    public void setEntranceId(String entranceId) 
     {
         this.entranceId = entranceId;
     }
 
-    public String getEntranceId()
+    public String getEntranceId() 
     {
         return entranceId;
     }
 
-    public void setProductId(String productId)
+    public void setWlbh(String wlbh) 
     {
-        this.productId = productId;
+        this.wlbh = wlbh;
     }
 
-    public String getProductId()
+    public String getWlbh() 
     {
-        return productId;
+        return wlbh;
     }
 
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setStackingId(String stackingId)
+    public void setStackingId(String stackingId) 
     {
         this.stackingId = stackingId;
     }
 
-    public String getStackingId()
+    public String getStackingId() 
     {
         return stackingId;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setStockStatus(String stockStatus) 
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus()
+    public String getStockStatus() 
     {
         return stockStatus;
     }
 
-    public void setInQuantity(String inQuantity)
+    public void setInQuantity(String inQuantity) 
     {
         this.inQuantity = inQuantity;
     }
 
-    public String getInQuantity()
+    public String getInQuantity() 
     {
         return inQuantity;
     }
 
-    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 setStartTime(String startTime)
+    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 setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setProductName(String productName)
+    public void setProductGuid(String productGuid) 
     {
-        this.productName = productName;
+        this.productGuid = productGuid;
     }
 
-    public String getProductName()
+    public String getProductGuid() 
     {
-        return productName;
+        return productGuid;
     }
 
-    public void setSpec(String spec)
+    public void setProductId(String productId) 
     {
-        this.spec = spec;
+        this.productId = productId;
     }
 
-    public String getSpec()
+    public String getProductId() 
     {
-        return spec;
+        return productId;
     }
 
-    public void setUnit(String unit)
+    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 setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
     @Override
     public String toString() {
-        return "ViewInJobFlow{" +
-                "jobId='" + jobId + '\'' +
-                ", jobDetailId='" + jobDetailId + '\'' +
-                ", status='" + status + '\'' +
-                ", taskNo='" + taskNo + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                ", priority=" + priority +
-                ", executionPhase='" + executionPhase + '\'' +
-                ", inOrOut='" + inOrOut + '\'' +
-                ", entranceId='" + entranceId + '\'' +
-                ", productId='" + productId + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", inQuantity='" + inQuantity + '\'' +
-                ", inOrOutId='" + inOrOutId + '\'' +
-                ", inOrOutDId='" + inOrOutDId + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", finishTime='" + finishTime + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobDetailId", getJobDetailId())
+            .append("status", getStatus())
+            .append("taskNo", getTaskNo())
+            .append("trayCode", getTrayCode())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .append("thePlatoon", getThePlatoon())
+            .append("theColumn", getTheColumn())
+            .append("theFloor", getTheFloor())
+            .append("priority", getPriority())
+            .append("executionPhase", getExecutionPhase())
+            .append("inOrOut", getInOrOut())
+            .append("entranceId", getEntranceId())
+            .append("wlbh", getWlbh())
+            .append("lotNo", getLotNo())
+            .append("stackingId", getStackingId())
+            .append("stockStatus", getStockStatus())
+            .append("inQuantity", getInQuantity())
+            .append("inOrOutId", getInOrOutId())
+            .append("inOrOutDId", getInOrOutDId())
+            .append("createTime", getCreateTime())
+            .append("startTime", getStartTime())
+            .append("finishTime", getFinishTime())
+            .append("warehouseId", getWarehouseId())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
+            .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 ad4f919..a825e0e 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewInJobFlow.mapper;
 
-import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
-
 import java.util.List;
+import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
 
 /**
  * 入库作业流水Mapper接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-22
  */
-public interface ViewInJobFlowMapper
+public interface ViewInJobFlowMapper 
 {
     /**
      * 查询入库作业流水
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
@@ -22,7 +21,7 @@ public interface ViewInJobFlowMapper
 
     /**
      * 查询入库作业流水列表
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 入库作业流水集合
      */
@@ -30,7 +29,7 @@ public interface ViewInJobFlowMapper
 
     /**
      * 新增入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ViewInJobFlowMapper
 
     /**
      * 修改入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ViewInJobFlowMapper
 
     /**
      * 删除入库作业流水
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ViewInJobFlowMapper
 
     /**
      * 批量删除入库作业流水
-     *
+     * 
      * @param jobIds 需要删除的数据主键集合
      * @return 结果
      */
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 6d8ceb2..5091f11 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewInJobFlow.service;
 
-import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
-
 import java.util.List;
+import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
 
 /**
  * 入库作业流水Service接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-22
  */
-public interface IViewInJobFlowService
+public interface IViewInJobFlowService 
 {
     /**
      * 查询入库作业流水
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
@@ -22,7 +21,7 @@ public interface IViewInJobFlowService
 
     /**
      * 查询入库作业流水列表
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 入库作业流水集合
      */
@@ -30,7 +29,7 @@ public interface IViewInJobFlowService
 
     /**
      * 新增入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface IViewInJobFlowService
 
     /**
      * 修改入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface IViewInJobFlowService
 
     /**
      * 批量删除入库作业流水
-     *
+     * 
      * @param jobIds 需要删除的入库作业流水主键集合
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface IViewInJobFlowService
 
     /**
      * 删除入库作业流水信息
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 结果
      */
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 4d580d9..c7e48dc 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
@@ -1,30 +1,28 @@
 package com.ruoyi.search.ViewInJobFlow.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
+import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
-import com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper;
-import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper;
+import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
+import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
 
 /**
  * 入库作业流水Service业务层处理
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-22
  */
 @Service
-public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
+public class ViewInJobFlowServiceImpl implements IViewInJobFlowService 
 {
     @Autowired
     private ViewInJobFlowMapper viewInJobFlowMapper;
 
     /**
      * 查询入库作业流水
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 入库作业流水
      */
@@ -36,12 +34,11 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 查询入库作业流水列表
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 入库作业流水
      */
     @Override
-    @DataScope(warehouseAlias = "vijf")
     public List<ViewInJobFlow> selectViewInJobFlowList(ViewInJobFlow viewInJobFlow)
     {
         return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow);
@@ -49,7 +46,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 新增入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -62,7 +59,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 修改入库作业流水
-     *
+     * 
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -74,7 +71,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 批量删除入库作业流水
-     *
+     * 
      * @param jobIds 需要删除的入库作业流水主键
      * @return 结果
      */
@@ -86,7 +83,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 删除入库作业流水信息
-     *
+     * 
      * @param jobId 入库作业流水主键
      * @return 结果
      */
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 e19d552..3ebb940 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
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewOutJobFlow.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.ViewOutJobFlow.domain.ViewOutJobFlow;
 import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
-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
- *
+ * 出库作业流水Controller
+ * 
  * @author gw
- * @date 2025-05-29
+ * @date 2025-09-22
  */
 @RestController
 @RequestMapping("/search/ViewOutJobFlow")
@@ -29,7 +35,7 @@ public class ViewOutJobFlowController extends BaseController
     private IViewOutJobFlowService viewOutJobFlowService;
 
     /**
-     * 查询出库做业务流水列表
+     * 查询出库作业流水列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:list')")
     @GetMapping("/list")
@@ -41,20 +47,20 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 导出出库做业务流水列表
+     * 导出出库作业流水列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:export')")
-    @Log(title = "出库做业务流水", 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, "出库做业务流水数据");
+        util.exportExcel(response, list, "出库作业流水数据");
     }
 
     /**
-     * 获取出库做业务流水详细信息
+     * 获取出库作业流水详细信息
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:query')")
     @GetMapping(value = "/{jobId}")
@@ -64,10 +70,10 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 新增出库做业务流水
+     * 新增出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:add')")
-    @Log(title = "出库做业务流水", businessType = BusinessType.INSERT)
+    @Log(title = "出库作业流水", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ViewOutJobFlow viewOutJobFlow)
     {
@@ -75,10 +81,10 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 修改出库做业务流水
+     * 修改出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:edit')")
-    @Log(title = "出库做业务流水", businessType = BusinessType.UPDATE)
+    @Log(title = "出库作业流水", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ViewOutJobFlow viewOutJobFlow)
     {
@@ -86,10 +92,10 @@ public class ViewOutJobFlowController extends BaseController
     }
 
     /**
-     * 删除出库做业务流水
+     * 删除出库作业流水
      */
     @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:remove')")
-    @Log(title = "出库做业务流水", businessType = BusinessType.DELETE)
+    @Log(title = "出库作业流水", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{jobIds}")
     public AjaxResult remove(@PathVariable String[] 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 b244df0..ed63d8b 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
@@ -1,592 +1,1135 @@
 package com.ruoyi.search.ViewOutJobFlow.domain;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
-import java.util.Date;
-
 /**
- * 出库做业务流水对象 view_out_job_flow
- *
+ * 出库作业流水对象 view_out_job_flow
+ * 
  * @author gw
- * @date 2025-05-29
+ * @date 2025-09-22
  */
 public class ViewOutJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 作业ID */
-    @Excel(name = "${search.ViewOutJobFlow.jobId}")
+    @Excel(name = "作业ID")
     private String jobId;
 
     /** 子作业ID */
-    @Excel(name = "${search.ViewOutJobFlow.jobDetailId}")
+    @Excel(name = "子作业ID")
     private String jobDetailId;
 
     /** 状态 */
-    @Excel(name = "${search.ViewOutJobFlow.status}",dictType = "mydo_job_status")
+    @Excel(name = "状态")
     private String status;
 
     /** 任务号 */
-    @Excel(name = "${search.ViewOutJobFlow.taskNo}")
+    @Excel(name = "任务号")
     private String taskNo;
 
     /** 托盘码 */
-    @Excel(name = "${search.ViewOutJobFlow.trayCode}")
+    @Excel(name = "托盘码")
     private String trayCode;
 
     /** 巷道ID */
-//    @Excel(name = "${search.ViewOutJobFlow.roadwayId}")
+    @Excel(name = "巷道ID")
     private String roadwayId;
 
     /** 货位ID */
-    @Excel(name = "${search.ViewOutJobFlow.cargoSpaceId}")
+    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
     /** 货位名称 */
-    @Excel(name = "${search.ViewOutJobFlow.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 排 */
-    @Excel(name = "${search.ViewOutJobFlow.thePlatoon}")
+    @Excel(name = "排")
     private Long thePlatoon;
 
     /** 列 */
-    @Excel(name = "${search.ViewOutJobFlow.theColumn}")
+    @Excel(name = "列")
     private Long theColumn;
 
     /** 层 */
-    @Excel(name = "${search.ViewOutJobFlow.theFloor}")
+    @Excel(name = "层")
     private Long theFloor;
 
     /** 优先级 */
-    @Excel(name = "${search.ViewOutJobFlow.priority}")
+    @Excel(name = "优先级")
     private Long priority;
 
     /** 执行阶段 */
-//    @Excel(name = "${search.ViewOutJobFlow.executionPhase}")
+    @Excel(name = "执行阶段")
     private String executionPhase;
 
     /** 作业类型 */
-    @Excel(name = "${search.ViewOutJobFlow.inOrOut}",dictType = "out_job_type")
+    @Excel(name = "作业类型")
     private String inOrOut;
 
     /** 出口ID */
-    @Excel(name = "${search.ViewOutJobFlow.exitId}")
+    @Excel(name = "出口ID")
     private String exitId;
 
     /** 物料ID */
-    @Excel(name = "${search.ViewOutJobFlow.productId}")
-    private String productId;
+    @Excel(name = "物料ID")
+    private String wlbh;
 
     /** 批号 */
-//    @Excel(name = "${search.ViewOutJobFlow.lotNo}")
+    @Excel(name = "批号")
     private String lotNo;
 
     /** 剁型ID */
-//    @Excel(name = "${search.ViewOutJobFlow.stackingId}")
+    @Excel(name = "剁型ID")
     private String stackingId;
 
     /** 库存状态 */
-//    @Excel(name = "${search.ViewOutJobFlow.stockStatus}")
+    @Excel(name = "库存状态")
     private String stockStatus;
 
     /** 出库数量 */
-    @Excel(name = "${search.ViewOutJobFlow.outQuantity}")
+    @Excel(name = "出库数量")
     private String outQuantity;
 
     /** 回流数量 */
-//    @Excel(name = "${search.ViewOutJobFlow.giveNum}")
+    @Excel(name = "回流数量")
     private String giveNum;
 
     /** 单据ID */
-    @Excel(name = "${search.ViewOutJobFlow.inOrOutId}")
+    @Excel(name = "单据ID")
     private String inOrOutId;
 
     /** 子单据ID */
-    @Excel(name = "${search.ViewOutJobFlow.inOrOutDId}")
+    @Excel(name = "子单据ID")
     private String inOrOutDId;
-    /** 创建时间 */
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 
     /** 开始时间 */
-    @Excel(name = "${search.ViewOutJobFlow.startTime}")
+    @Excel(name = "开始时间")
     private String startTime;
 
     /** 结束时间 */
-    @Excel(name = "${search.ViewOutJobFlow.finishTime}")
+    @Excel(name = "结束时间")
     private String finishTime;
 
     /** 仓库ID */
-    @Excel(name = "${search.ViewOutJobFlow.warehouseId}")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
-    /** 物料名称 */
-    @Excel(name = "${search.ViewOutJobFlow.productName}")
-    private String productName;
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
 
-    /** 规格 */
-//    @Excel(name = "${search.ViewOutJobFlow.spec}")
-    private String spec;
+    /** 品号 */
+    @Excel(name = "品号")
+    private String productId;
 
-    /** 单位 */
-    @Excel(name = "${search.ViewOutJobFlow.unit}")
-    private String unit;
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
 
-    /** 客户名称 */
-    @Excel(name = "${search.ViewOutJobFlow.customerName}")
-    private String customerName;
-
-    /** 价格 */
-    @Excel(name = "${search.ViewOutJobFlow.price}")
+    /** 品号描述 */
+    @Excel(name = "品号描述")
     private String price;
 
-    /** 英文名称 */
-    @Excel(name = "${search.ViewOutJobFlow.spare1}")
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
+    private String unit;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
+
+    /** 型号 */
+    @Excel(name = "型号")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.ViewOutJobFlow.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewOutJobFlow.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewOutJobFlow.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewOutJobFlow.spare7}")
+    /** 品名 */
+    @Excel(name = "品名")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewOutJobFlow.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
 
-    /** 备注 */
-    @Excel(name = "${search.ViewOutJobFlow.remark}")
-    private String remark;
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
 
-    @Override
-    public String getRemark() {
-        return remark;
-    }
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
 
-    public String getPrice() {
-        return price;
-    }
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
 
-    public void setPrice(String price) {
-        this.price = price;
-    }
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
 
-    public String getSpare1() {
-        return spare1;
-    }
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
 
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
 
-    public String getSpare2() {
-        return spare2;
-    }
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
 
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
 
-    public String getSpare5() {
-        return spare5;
-    }
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
 
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
 
-    public String getSpare6() {
-        return spare6;
-    }
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
 
-    public String getSpare7() {
-        return spare7;
-    }
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
 
-    public String getSpare8() {
-        return spare8;
-    }
+    /** 产品线/产品系列（组码） */
+    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
+    private String spare24;
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
+    /** BOM状态（组码） */
+    @Excel(name = "BOM状态", readConverterExp = "组=码")
+    private String spare25;
 
-    public void setJobId(String jobId)
+    /** 产品定位（组码） */
+    @Excel(name = "产品定位", readConverterExp = "组=码")
+    private String spare26;
+
+    /** 电脑板型号（组码） */
+    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌（组码） */
+    @Excel(name = "品牌", readConverterExp = "组=码")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款", readConverterExp = "组=码")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    public void setJobId(String jobId) 
     {
         this.jobId = jobId;
     }
 
-    public String getJobId()
+    public String getJobId() 
     {
         return jobId;
     }
 
-    public void setJobDetailId(String jobDetailId)
+    public void setJobDetailId(String jobDetailId) 
     {
         this.jobDetailId = jobDetailId;
     }
 
-    public String getJobDetailId()
+    public String getJobDetailId() 
     {
         return jobDetailId;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setTaskNo(String taskNo)
+    public void setTaskNo(String taskNo) 
     {
         this.taskNo = taskNo;
     }
 
-    public String getTaskNo()
+    public String getTaskNo() 
     {
         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 setRoadwayId(String roadwayId)
+    public void setRoadwayId(String roadwayId) 
     {
         this.roadwayId = roadwayId;
     }
 
-    public String getRoadwayId()
+    public String getRoadwayId() 
     {
         return roadwayId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId)
+    public void setCargoSpaceId(String cargoSpaceId) 
     {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceId()
+    public String getCargoSpaceId() 
     {
         return cargoSpaceId;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName)
+    public void setCargoSpaceName(String cargoSpaceName) 
     {
         this.cargoSpaceName = cargoSpaceName;
     }
 
-    public String getCargoSpaceName()
+    public String getCargoSpaceName() 
     {
         return cargoSpaceName;
     }
 
-    public void setThePlatoon(Long thePlatoon)
+    public void setThePlatoon(Long thePlatoon) 
     {
         this.thePlatoon = thePlatoon;
     }
 
-    public Long getThePlatoon()
+    public Long getThePlatoon() 
     {
         return thePlatoon;
     }
 
-    public void setTheColumn(Long theColumn)
+    public void setTheColumn(Long theColumn) 
     {
         this.theColumn = theColumn;
     }
 
-    public Long getTheColumn()
+    public Long getTheColumn() 
     {
         return theColumn;
     }
 
-    public void setTheFloor(Long theFloor)
+    public void setTheFloor(Long theFloor) 
     {
         this.theFloor = theFloor;
     }
 
-    public Long getTheFloor()
+    public Long getTheFloor() 
     {
         return theFloor;
     }
 
-    public void setPriority(Long priority)
+    public void setPriority(Long priority) 
     {
         this.priority = priority;
     }
 
-    public Long getPriority()
+    public Long getPriority() 
     {
         return priority;
     }
 
-    public void setExecutionPhase(String executionPhase)
+    public void setExecutionPhase(String executionPhase) 
     {
         this.executionPhase = executionPhase;
     }
 
-    public String getExecutionPhase()
+    public String getExecutionPhase() 
     {
         return executionPhase;
     }
 
-    public void setInOrOut(String inOrOut)
+    public void setInOrOut(String inOrOut) 
     {
         this.inOrOut = inOrOut;
     }
 
-    public String getInOrOut()
+    public String getInOrOut() 
     {
         return inOrOut;
     }
 
-    public void setExitId(String exitId)
+    public void setExitId(String exitId) 
     {
         this.exitId = exitId;
     }
 
-    public String getExitId()
+    public String getExitId() 
     {
         return exitId;
     }
 
-    public void setProductId(String productId)
+    public void setWlbh(String wlbh) 
     {
-        this.productId = productId;
+        this.wlbh = wlbh;
     }
 
-    public String getProductId()
+    public String getWlbh() 
     {
-        return productId;
+        return wlbh;
     }
 
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setStackingId(String stackingId)
+    public void setStackingId(String stackingId) 
     {
         this.stackingId = stackingId;
     }
 
-    public String getStackingId()
+    public String getStackingId() 
     {
         return stackingId;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setStockStatus(String stockStatus) 
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus()
+    public String getStockStatus() 
     {
         return stockStatus;
     }
 
-    public void setOutQuantity(String outQuantity)
+    public void setOutQuantity(String outQuantity) 
     {
         this.outQuantity = outQuantity;
     }
 
-    public String getOutQuantity()
+    public String getOutQuantity() 
     {
         return outQuantity;
     }
 
-    public void setGiveNum(String giveNum)
+    public void setGiveNum(String giveNum) 
     {
         this.giveNum = giveNum;
     }
 
-    public String getGiveNum()
+    public String getGiveNum() 
     {
         return giveNum;
     }
 
-    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 setStartTime(String startTime)
+    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 setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setProductName(String productName)
+    public void setProductGuid(String productGuid) 
     {
-        this.productName = productName;
+        this.productGuid = productGuid;
     }
 
-    public String getProductName()
+    public String getProductGuid() 
     {
-        return productName;
+        return productGuid;
     }
 
-    public void setSpec(String spec)
+    public void setProductId(String productId) 
     {
-        this.spec = spec;
+        this.productId = productId;
     }
 
-    public String getSpec()
+    public String getProductId() 
     {
-        return spec;
+        return productId;
     }
 
-    public void setUnit(String unit)
+    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 setCustomerName(String customerName)
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
+    public void setCustomerName(String customerName) 
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName()
+    public String getCustomerName() 
     {
         return customerName;
     }
 
     @Override
     public String toString() {
-        return "ViewOutJobFlow{" +
-                "jobId='" + jobId + '\'' +
-                ", jobDetailId='" + jobDetailId + '\'' +
-                ", status='" + status + '\'' +
-                ", taskNo='" + taskNo + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                ", priority=" + priority +
-                ", executionPhase='" + executionPhase + '\'' +
-                ", inOrOut='" + inOrOut + '\'' +
-                ", exitId='" + exitId + '\'' +
-                ", productId='" + productId + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", outQuantity='" + outQuantity + '\'' +
-                ", giveNum='" + giveNum + '\'' +
-                ", inOrOutId='" + inOrOutId + '\'' +
-                ", inOrOutDId='" + inOrOutDId + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", finishTime='" + finishTime + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", customerName='" + customerName + '\'' +
-                ", price='" + price + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobDetailId", getJobDetailId())
+            .append("status", getStatus())
+            .append("taskNo", getTaskNo())
+            .append("trayCode", getTrayCode())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .append("thePlatoon", getThePlatoon())
+            .append("theColumn", getTheColumn())
+            .append("theFloor", getTheFloor())
+            .append("priority", getPriority())
+            .append("executionPhase", getExecutionPhase())
+            .append("inOrOut", getInOrOut())
+            .append("exitId", getExitId())
+            .append("wlbh", getWlbh())
+            .append("lotNo", getLotNo())
+            .append("stackingId", getStackingId())
+            .append("stockStatus", getStockStatus())
+            .append("outQuantity", getOutQuantity())
+            .append("giveNum", getGiveNum())
+            .append("inOrOutId", getInOrOutId())
+            .append("inOrOutDId", getInOrOutDId())
+            .append("createTime", getCreateTime())
+            .append("startTime", getStartTime())
+            .append("finishTime", getFinishTime())
+            .append("warehouseId", getWarehouseId())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
+            .append("customerName", getCustomerName())
+            .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 697b2fa..dd6c4d6 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
@@ -1,60 +1,59 @@
 package com.ruoyi.search.ViewOutJobFlow.mapper;
 
+import java.util.List;
 import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 
-import java.util.List;
-
 /**
- * 出库做业务流水Mapper接口
- *
+ * 出库作业流水Mapper接口
+ * 
  * @author gw
- * @date 2025-05-29
+ * @date 2025-09-22
  */
-public interface ViewOutJobFlowMapper
+public interface ViewOutJobFlowMapper 
 {
     /**
-     * 查询出库做业务流水
-     *
-     * @param jobId 出库做业务流水主键
-     * @return 出库做业务流水
+     * 查询出库作业流水
+     * 
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
     public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 查询出库做业务流水列表
-     *
-     * @param viewOutJobFlow 出库做业务流水
-     * @return 出库做业务流水集合
+     * 查询出库作业流水列表
+     * 
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水集合
      */
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 新增出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 新增出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 修改出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 修改出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 删除出库做业务流水
-     *
-     * @param jobId 出库做业务流水主键
+     * 删除出库作业流水
+     * 
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
     public int deleteViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 批量删除出库做业务流水
-     *
+     * 批量删除出库作业流水
+     * 
      * @param jobIds 需要删除的数据主键集合
      * @return 结果
      */
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 24ec11d..97d05da 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
@@ -1,61 +1,60 @@
 package com.ruoyi.search.ViewOutJobFlow.service;
 
+import java.util.List;
 import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 
-import java.util.List;
-
 /**
- * 出库做业务流水Service接口
- *
+ * 出库作业流水Service接口
+ * 
  * @author gw
- * @date 2025-05-29
+ * @date 2025-09-22
  */
-public interface IViewOutJobFlowService
+public interface IViewOutJobFlowService 
 {
     /**
-     * 查询出库做业务流水
-     *
-     * @param jobId 出库做业务流水主键
-     * @return 出库做业务流水
+     * 查询出库作业流水
+     * 
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
     public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId);
 
     /**
-     * 查询出库做业务流水列表
-     *
-     * @param viewOutJobFlow 出库做业务流水
-     * @return 出库做业务流水集合
+     * 查询出库作业流水列表
+     * 
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水集合
      */
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 新增出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 新增出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 修改出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 修改出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow);
 
     /**
-     * 批量删除出库做业务流水
-     *
-     * @param jobIds 需要删除的出库做业务流水主键集合
+     * 批量删除出库作业流水
+     * 
+     * @param jobIds 需要删除的出库作业流水主键集合
      * @return 结果
      */
     public int deleteViewOutJobFlowByJobIds(String[] jobIds);
 
     /**
-     * 删除出库做业务流水信息
-     *
-     * @param jobId 出库做业务流水主键
+     * 删除出库作业流水信息
+     * 
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
     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 25f5d21..2fad341 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
@@ -1,32 +1,30 @@
 package com.ruoyi.search.ViewOutJobFlow.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
+import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
-import com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper;
-import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper;
+import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
+import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
 
 /**
- * 出库做业务流水Service业务层处理
- *
+ * 出库作业流水Service业务层处理
+ * 
  * @author gw
- * @date 2025-05-29
+ * @date 2025-09-22
  */
 @Service
-public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
+public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService 
 {
     @Autowired
     private ViewOutJobFlowMapper viewOutJobFlowMapper;
 
     /**
-     * 查询出库做业务流水
-     *
-     * @param jobId 出库做业务流水主键
-     * @return 出库做业务流水
+     * 查询出库作业流水
+     * 
+     * @param jobId 出库作业流水主键
+     * @return 出库作业流水
      */
     @Override
     public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId)
@@ -35,22 +33,21 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 查询出库做业务流水列表
-     *
-     * @param viewOutJobFlow 出库做业务流水
-     * @return 出库做业务流水
+     * 查询出库作业流水列表
+     * 
+     * @param viewOutJobFlow 出库作业流水
+     * @return 出库作业流水
      */
     @Override
-    @DataScope(warehouseAlias = "vojf")
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow)
     {
         return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow);
     }
 
     /**
-     * 新增出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 新增出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     @Override
@@ -61,9 +58,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 修改出库做业务流水
-     *
-     * @param viewOutJobFlow 出库做业务流水
+     * 修改出库作业流水
+     * 
+     * @param viewOutJobFlow 出库作业流水
      * @return 结果
      */
     @Override
@@ -73,9 +70,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 批量删除出库做业务流水
-     *
-     * @param jobIds 需要删除的出库做业务流水主键
+     * 批量删除出库作业流水
+     * 
+     * @param jobIds 需要删除的出库作业流水主键
      * @return 结果
      */
     @Override
@@ -85,9 +82,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
     }
 
     /**
-     * 删除出库做业务流水信息
-     *
-     * @param jobId 出库做业务流水主键
+     * 删除出库作业流水信息
+     * 
+     * @param jobId 出库作业流水主键
      * @return 结果
      */
     @Override
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 bb7b166..c831e08 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
@@ -13,119 +13,268 @@ public class ViewStockDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
-//    @Excel(name = "${search.ViewStockDetail.onlyIdentity}")
+    /** 序号 */
+    @Excel(name = "序号")
     private Long onlyIdentity;
 
     /** 库存ID */
-    @Excel(name = "${search.ViewStockDetail.stockId}")
+    @Excel(name = "库存ID")
     private String stockId;
 
     /** 货位ID */
-    @Excel(name = "${search.ViewStockDetail.cargoSpaceId}")
+    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
     /** 托盘条码 */
-    @Excel(name = "${search.ViewStockDetail.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 数量 */
-    @Excel(name = "${search.ViewStockDetail.quantity}")
+    @Excel(name = "数量")
     private String quantity;
 
     /** 作业ID */
-    @Excel(name = "${search.ViewStockDetail.jobId}")
+    @Excel(name = "作业ID")
     private String jobId;
 
     /** 批号 */
-//    @Excel(name = "${search.ViewStockDetail.lotNo}")
+    @Excel(name = "批号")
     private String lotNo;
 
     /** 入库子单ID */
-    @Excel(name = "${search.ViewStockDetail.stockinDetailId}")
+    @Excel(name = "入库子单ID")
     private String stockinDetailId;
 
     /** 入库时间 */
-    @Excel(name = "${search.ViewStockDetail.inDate}")
+    @Excel(name = "入库时间")
     private String inDate;
 
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
     private String warehouseId;
-    /** 仓库 */
-    @Excel(name = "${search.ViewStockDetail.warehouseId}")
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
     private String warehouseName;
 
-    /** 剁型ID */
-//    @Excel(name = "${search.ViewStockDetail.stackingId}")
+    /** 垛型ID */
+    @Excel(name = "垛型ID")
     private String stackingId;
 
     /** 货位名称 */
-    @Excel(name = "${search.ViewStockDetail.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 巷道ID */
-    @Excel(name = "${search.ViewStockDetail.roadwayId}")
+    @Excel(name = "巷道ID")
     private String roadwayId;
 
-    /** 货位状态 */
-    @Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}",dictType = "cargo_space_status")
+    /** 货位状态 1空2满 3入库分配 4出库分配 5入库盘点 6出库盘点 */
+    @Excel(name = "货位状态", dictType = "cargo_space_status")
     private String cargoSpaceStatus;
 
-    @Excel(name = "${search.ViewStockDetail.stockStatus}",dictType = "stock_status")
+    /** 库存状态 1正常 2冻结 */
+    @Excel(name = "库存状态", dictType = "stock_status")
     private String stockStatus;
 
-    @Excel(name = "${search.ViewStockDetail.productStatus}",dictType = "product_status")
+    /** 物料状态 1正常 2盘点待审批 3异常 */
+    @Excel(name = "物料状态", dictType = "product_status")
     private String productStatus;
 
-    /** 是否锁定 */
-    @Excel(name = "${search.ViewStockDetail.locked}",dictType = "cargo_space_lock_status")
+    /** 是否锁定 Y锁、N开 */
+    @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
     private String locked;
 
-    /** 物料ID */
-    @Excel(name = "${search.ViewStockDetail.productId}")
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
     private String productId;
 
     /** 物料名称 */
-    @Excel(name = "${search.ViewStockDetail.productName}")
+    @Excel(name = "物料名称")
     private String productName;
 
     /** 规格 */
-//    @Excel(name = "${search.ViewStockDetail.spec}")
+    @Excel(name = "规格")
     private String spec;
 
     /** 单位 */
-    @Excel(name = "${search.ViewStockDetail.unit}")
+    @Excel(name = "单位")
     private String unit;
 
     /** 价格 */
-//    @Excel(name = "${search.ViewStockDetail.price}")
+    @Excel(name = "价格")
     private String price;
 
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String cargoNo;
+
     /** 英文名称 */
-    @Excel(name = "${search.ViewStockDetail.spare1}")
+    @Excel(name = "英文名称")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.ViewStockDetail.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewStockDetail.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewStockDetail.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewStockDetail.spare7}")
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewStockDetail.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
 
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
+
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
+
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
+
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
+
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
+
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
+
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
+
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
+
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
+
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
+
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
+
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
+
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
+
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
+
+    /** 产品线/产品系列 */
+    @Excel(name = "产品线/产品系列")
+    private String spare24;
+
+    /** BOM状态 */
+    @Excel(name = "BOM状态")
+    private String spare25;
+
+    /** 产品定位 */
+    @Excel(name = "产品定位")
+    private String spare26;
+
+    /** 电脑板型号 */
+    @Excel(name = "电脑板型号")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款 */
+    @Excel(name = "是否标准款")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
     /** 备注 */
-    @Excel(name = "${search.ViewStockDetail.remark}")
+    @Excel(name = "描述")
     private String remark;
 
 
@@ -412,6 +561,366 @@ public class ViewStockDetail extends BaseEntity
         return price;
     }
 
+    public String getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(String parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getCargoNo()
+    {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo)
+    {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getProductGuid()
+    {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid)
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getSpare3()
+    {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3)
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4()
+    {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4)
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare9()
+    {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9)
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare10()
+    {
+        return spare10;
+    }
+
+    public void setSpare10(String spare10)
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare11()
+    {
+        return spare11;
+    }
+
+    public void setSpare11(String spare11)
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare12()
+    {
+        return spare12;
+    }
+
+    public void setSpare12(String spare12)
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare13()
+    {
+        return spare13;
+    }
+
+    public void setSpare13(String spare13)
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare14()
+    {
+        return spare14;
+    }
+
+    public void setSpare14(String spare14)
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare15()
+    {
+        return spare15;
+    }
+
+    public void setSpare15(String spare15)
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare16()
+    {
+        return spare16;
+    }
+
+    public void setSpare16(String spare16)
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare17()
+    {
+        return spare17;
+    }
+
+    public void setSpare17(String spare17)
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare18()
+    {
+        return spare18;
+    }
+
+    public void setSpare18(String spare18)
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare19()
+    {
+        return spare19;
+    }
+
+    public void setSpare19(String spare19)
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare20()
+    {
+        return spare20;
+    }
+
+    public void setSpare20(String spare20)
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare21()
+    {
+        return spare21;
+    }
+
+    public void setSpare21(String spare21)
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare22()
+    {
+        return spare22;
+    }
+
+    public void setSpare22(String spare22)
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare23()
+    {
+        return spare23;
+    }
+
+    public void setSpare23(String spare23)
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare24()
+    {
+        return spare24;
+    }
+
+    public void setSpare24(String spare24)
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare25()
+    {
+        return spare25;
+    }
+
+    public void setSpare25(String spare25)
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare26()
+    {
+        return spare26;
+    }
+
+    public void setSpare26(String spare26)
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare27()
+    {
+        return spare27;
+    }
+
+    public void setSpare27(String spare27)
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare28()
+    {
+        return spare28;
+    }
+
+    public void setSpare28(String spare28)
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare29()
+    {
+        return spare29;
+    }
+
+    public void setSpare29(String spare29)
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare30()
+    {
+        return spare30;
+    }
+
+    public void setSpare30(String spare30)
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare31()
+    {
+        return spare31;
+    }
+
+    public void setSpare31(String spare31)
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare32()
+    {
+        return spare32;
+    }
+
+    public void setSpare32(String spare32)
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare33()
+    {
+        return spare33;
+    }
+
+    public void setSpare33(String spare33)
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare34()
+    {
+        return spare34;
+    }
+
+    public void setSpare34(String spare34)
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare35()
+    {
+        return spare35;
+    }
+
+    public void setSpare35(String spare35)
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare36()
+    {
+        return spare36;
+    }
+
+    public void setSpare36(String spare36)
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare37()
+    {
+        return spare37;
+    }
+
+    public void setSpare37(String spare37)
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare38()
+    {
+        return spare38;
+    }
+
+    public void setSpare38(String spare38)
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare39()
+    {
+        return spare39;
+    }
+
+    public void setSpare39(String spare39)
+    {
+        this.spare39 = spare39;
+    }
+
     @Override
     public String toString() {
         return "ViewStockDetail{" +
@@ -425,22 +934,61 @@ public class ViewStockDetail extends BaseEntity
                 ", stockinDetailId='" + stockinDetailId + '\'' +
                 ", inDate='" + inDate + '\'' +
                 ", warehouseId='" + warehouseId + '\'' +
+                ", warehouseName='" + warehouseName + '\'' +
                 ", stackingId='" + stackingId + '\'' +
                 ", cargoSpaceName='" + cargoSpaceName + '\'' +
                 ", roadwayId='" + roadwayId + '\'' +
                 ", cargoSpaceStatus='" + cargoSpaceStatus + '\'' +
+                ", stockStatus='" + stockStatus + '\'' +
+                ", productStatus='" + productStatus + '\'' +
                 ", locked='" + locked + '\'' +
+                ", productGuid='" + productGuid + '\'' +
                 ", productId='" + productId + '\'' +
                 ", productName='" + productName + '\'' +
                 ", spec='" + spec + '\'' +
                 ", unit='" + unit + '\'' +
                 ", price='" + price + '\'' +
+                ", parentId='" + parentId + '\'' +
+                ", cargoNo='" + cargoNo + '\'' +
                 ", spare1='" + spare1 + '\'' +
                 ", spare2='" + spare2 + '\'' +
+                ", spare3='" + spare3 + '\'' +
+                ", spare4='" + spare4 + '\'' +
                 ", spare5='" + spare5 + '\'' +
                 ", spare6='" + spare6 + '\'' +
                 ", spare7='" + spare7 + '\'' +
                 ", spare8='" + spare8 + '\'' +
+                ", spare9='" + spare9 + '\'' +
+                ", spare10='" + spare10 + '\'' +
+                ", spare11='" + spare11 + '\'' +
+                ", spare12='" + spare12 + '\'' +
+                ", spare13='" + spare13 + '\'' +
+                ", spare14='" + spare14 + '\'' +
+                ", spare15='" + spare15 + '\'' +
+                ", spare16='" + spare16 + '\'' +
+                ", spare17='" + spare17 + '\'' +
+                ", spare18='" + spare18 + '\'' +
+                ", spare19='" + spare19 + '\'' +
+                ", spare20='" + spare20 + '\'' +
+                ", spare21='" + spare21 + '\'' +
+                ", spare22='" + spare22 + '\'' +
+                ", spare23='" + spare23 + '\'' +
+                ", spare24='" + spare24 + '\'' +
+                ", spare25='" + spare25 + '\'' +
+                ", spare26='" + spare26 + '\'' +
+                ", spare27='" + spare27 + '\'' +
+                ", spare28='" + spare28 + '\'' +
+                ", spare29='" + spare29 + '\'' +
+                ", spare30='" + spare30 + '\'' +
+                ", spare31='" + spare31 + '\'' +
+                ", spare32='" + spare32 + '\'' +
+                ", spare33='" + spare33 + '\'' +
+                ", spare34='" + spare34 + '\'' +
+                ", spare35='" + spare35 + '\'' +
+                ", spare36='" + spare36 + '\'' +
+                ", spare37='" + spare37 + '\'' +
+                ", spare38='" + spare38 + '\'' +
+                ", spare39='" + spare39 + '\'' +
                 ", remark='" + remark + '\'' +
                 '}';
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
index b58f470..21cdcca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockSecure.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.ViewStockSecure.domain.ViewStockSecure;
 import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
-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 ruoyi
- * @date 2025-08-06
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 @RestController
 @RequestMapping("/search/ViewStockSecure")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
index 72d3f55..8e31af0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
@@ -1,815 +1,1220 @@
 package com.ruoyi.search.ViewStockSecure.domain;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 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_secure
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 public class ViewStockSecure extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 仓库名称 */
-    @Excel(name = "${search.ViewStockSecure.warehouseName}")
-    private String warehouseName;
-
     /** 库存ID */
-    @Excel(name = "${search.ViewStockSecure.stockId}")
+    @Excel(name = "库存ID")
     private String stockId;
 
     /** 货位ID */
-    @Excel(name = "${search.ViewStockSecure.cargoSpaceId}")
+    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
     /** 库存状态 */
-    @Excel(name = "${search.ViewStockSecure.stockStatus}",dictType = "stock_status")
+    @Excel(name = "库存状态")
     private String stockStatus;
 
     /** 物料状态 */
-    @Excel(name = "${search.ViewStockSecure.productStatus}",dictType = "product_status")
+    @Excel(name = "物料状态")
     private String productStatus;
 
     /** 批次号 */
-//    @Excel(name = "${search.ViewStockSecure.lotNo}")
+    @Excel(name = "批次号")
     private String lotNo;
 
     /** 入库时间 */
-    @Excel(name = "${search.ViewStockSecure.inDate}")
+    @Excel(name = "入库时间")
     private String inDate;
 
     /** 回流时间 */
-//    @Excel(name = "${search.ViewStockSecure.backDate}")
+    @Excel(name = "回流时间")
     private String backDate;
 
-    /** 物料GUID */
-//    @Excel(name = "${search.ViewStockSecure.productGuid}")
-    private String productGuid;
-
     /** 库存数量 */
-    @Excel(name = "${search.ViewStockSecure.quantity}")
+    @Excel(name = "库存数量")
     private String quantity;
 
     /** 作业ID */
-    @Excel(name = "${search.ViewStockSecure.jobId}")
+    @Excel(name = "作业ID")
     private String jobId;
 
     /** 托盘条码 */
-    @Excel(name = "${search.ViewStockSecure.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 出库数量 */
-//    @Excel(name = "${search.ViewStockSecure.outQuantity}")
+    @Excel(name = "出库数量")
     private String outQuantity;
 
     /** 入库子单ID */
-    @Excel(name = "${search.ViewStockSecure.stockinDetailId}")
+    @Excel(name = "入库子单ID")
     private String stockinDetailId;
 
     /** 入库主单 */
-    @Excel(name = "${search.ViewStockSecure.stockinId}")
+    @Excel(name = "入库主单")
     private String stockinId;
 
     /** 入库类型 */
-    @Excel(name = "${search.ViewStockSecure.inType}",dictType = "in_job_type")
+    @Excel(name = "入库类型")
     private String inType;
 
     /** 入库班组ID */
-//    @Excel(name = "${search.ViewStockSecure.inClassId}")
+    @Excel(name = "入库班组ID")
     private String inClassId;
 
     /** 仓库ID */
-//    @Excel(name = "${search.ViewStockSecure.warehouseId}")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
     /** 垛型ID */
-//    @Excel(name = "${search.ViewStockSecure.stackingId}")
+    @Excel(name = "垛型ID")
     private String stackingId;
 
-    /** 库存预警标识 */
-//    @Excel(name = "${search.ViewStockSecure.spare1}")
-    private String spare1;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare2;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare3;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare4;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare5;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare6;
-
-    /** 物料ID */
-    @Excel(name = "${search.ViewStockSecure.productId}")
-    private String productId;
-
-    /** 物料名称 */
-    @Excel(name = "${search.ViewStockSecure.productName}")
-    private String productName;
-
-    /** 英文名称 */
-    @Excel(name = "${search.ViewStockSecure.enName}")
-    private String enName;
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
 
     /** 仓库地址 */
-//    @Excel(name = "${search.ViewStockSecure.address}")
+    @Excel(name = "仓库地址")
     private String address;
 
     /** 仓库描述 */
-//    @Excel(name = "${search.ViewStockSecure.cDesc}")
+    @Excel(name = "仓库描述")
     private String cDesc;
 
     /** 仓库级别 */
-//    @Excel(name = "${search.ViewStockSecure.warehouseKind}")
+    @Excel(name = "仓库级别")
     private String warehouseKind;
 
     /** 仓库类型 */
-//    @Excel(name = "${search.ViewStockSecure.warehouseType}")
+    @Excel(name = "仓库类型")
     private String warehouseType;
 
-    /** 价格 */
-    @Excel(name = "${search.ViewStockSecure.price}")
-    private String price;
-
-    /** 单位 */
-    @Excel(name = "${search.ViewStockSecure.unit}")
-    private String unit;
-
     /** 是否可用 */
-//    @Excel(name = "${search.ViewStockSecure.isCurrent}")
+    @Excel(name = "是否可用")
     private String isCurrent;
 
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 品号 */
+    @Excel(name = "品号")
+    private String productId;
+
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String price;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
+    private String unit;
+
     /** 规格 */
-//    @Excel(name = "${search.ViewStockSecure.spec}")
+    @Excel(name = "规格")
     private String spec;
 
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spare1;
+
     /** 单件净重 */
-    @Excel(name = "${search.ViewStockSecure.weight}")
-    private String weight;
+    @Excel(name = "单件净重")
+    private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewStockSecure.longMM}")
-    private String longMM;
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewStockSecure.wide}")
-    private String wide;
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewStockSecure.hight}")
-    private String hight;
+    /** 电压 */
+    @Excel(name = "电压")
+    private String spare5;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewStockSecure.volume}")
-    private String volume;
+    /** 功率 */
+    @Excel(name = "功率")
+    private String spare6;
 
+    /** 品名 */
+    @Excel(name = "品名")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
+    private String spare7;
+
+    /** 毛重 */
+    @Excel(name = "毛重")
+    private String spare8;
+
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
+
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
+
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
+
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
+
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
+
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
+
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
+
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
+
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
+
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
+
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
+
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
+
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
+
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
+
+    /** 产品线/产品系列（组码） */
+    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
+    private String spare24;
+
+    /** BOM状态（组码） */
+    @Excel(name = "BOM状态", readConverterExp = "组=码")
+    private String spare25;
+
+    /** 产品定位（组码） */
+    @Excel(name = "产品定位", readConverterExp = "组=码")
+    private String spare26;
+
+    /** 电脑板型号（组码）  */
+    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌（组码） */
+    @Excel(name = "品牌", readConverterExp = "组=码")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款", readConverterExp = "组=码")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
 
     /** 货位名称 */
-    @Excel(name = "${search.ViewStockSecure.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 巷道ID */
-//    @Excel(name = "${search.ViewStockSecure.roadwayId}")
+    @Excel(name = "巷道ID")
     private String roadwayId;
 
-    /** 货区ID */
-//    @Excel(name = "${search.ViewStockSecure.cargoAreaId}")
+    /** 货区id */
+    @Excel(name = "货区id")
     private String cargoAreaId;
 
     /** 货位类型 */
-//    @Excel(name = "${search.ViewStockSecure.theType}")
+    @Excel(name = "货位类型")
     private String theType;
 
     /** 货位类型名称 */
-//    @Excel(name = "${search.ViewStockSecure.theTypeName}")
+    @Excel(name = "货位类型名称")
     private String theTypeName;
 
     /** 排 */
-//    @Excel(name = "${search.ViewStockSecure.thePlatoon}")
+    @Excel(name = "排")
     private Long thePlatoon;
 
     /** 列 */
-//    @Excel(name = "${search.ViewStockSecure.theColumn}")
+    @Excel(name = "列")
     private Long theColumn;
 
     /** 层 */
-//    @Excel(name = "${search.ViewStockSecure.theFloor}")
+    @Excel(name = "层")
     private Long theFloor;
 
     /** 货位状态 */
-    @Excel(name = "${search.ViewStockSecure.cargoStatus}",dictType = "cargo_space_status")
+    @Excel(name = "货位状态")
     private String cargoStatus;
 
     /** 是否锁定 */
-    @Excel(name = "${search.ViewStockSecure.locked}",dictType = "cargo_space_lock_status")
+    @Excel(name = "是否锁定")
     private String locked;
 
     /** 货位高度 */
-//    @Excel(name = "${search.ViewStockSecure.cargoHight}")
+    @Excel(name = "货位高度")
     private String cargoHight;
 
     /** 是否双伸 */
-//    @Excel(name = "${search.ViewStockSecure.issDouble}")
+    @Excel(name = "是否双伸")
     private String issDouble;
 
     /** 双货位分组编码 */
-//    @Excel(name = "${search.ViewStockSecure.groupCodingNo}")
+    @Excel(name = "双货位分组编码")
     private String groupCodingNo;
 
-    /** 双货位分组编码 */
-//    @Excel(name = "${search.ViewStockSecure.groupCoding}")
+    /** 双货位分组编码1 */
+    @Excel(name = "双货位分组编码1")
     private String groupCoding;
 
     /** 双货位标识 */
-//    @Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}")
+    @Excel(name = "双货位标识")
     private String cargoSpaceLogo;
 
     /** 本仓库区域 */
-//    @Excel(name = "${search.ViewStockSecure.thisCargoArea}")
+    @Excel(name = "本仓库区域")
     private String thisCargoArea;
 
-    public void setStockId(String stockId)
+    public void setStockId(String stockId) 
     {
         this.stockId = stockId;
     }
 
-    public String getStockId()
+    public String getStockId() 
     {
         return stockId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId)
+    public void setCargoSpaceId(String cargoSpaceId) 
     {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceId()
+    public String getCargoSpaceId() 
     {
         return cargoSpaceId;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setStockStatus(String stockStatus) 
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus()
+    public String getStockStatus() 
     {
         return stockStatus;
     }
 
-    public void setProductStatus(String productStatus)
+    public void setProductStatus(String productStatus) 
     {
         this.productStatus = productStatus;
     }
 
-    public String getProductStatus()
+    public String getProductStatus() 
     {
         return productStatus;
     }
 
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setInDate(String inDate)
+    public void setInDate(String inDate) 
     {
         this.inDate = inDate;
     }
 
-    public String getInDate()
+    public String getInDate() 
     {
         return inDate;
     }
 
-    public void setBackDate(String backDate)
+    public void setBackDate(String backDate) 
     {
         this.backDate = backDate;
     }
 
-    public String getBackDate()
+    public String getBackDate() 
     {
         return backDate;
     }
 
-    public void setProductGuid(String productGuid)
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductGuid()
-    {
-        return productGuid;
-    }
-
-    public void setQuantity(String quantity)
+    public void setQuantity(String quantity) 
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity()
+    public String getQuantity() 
     {
         return quantity;
     }
 
-    public void setJobId(String jobId)
+    public void setJobId(String jobId) 
     {
         this.jobId = jobId;
     }
 
-    public String getJobId()
+    public String getJobId() 
     {
         return jobId;
     }
 
-    public void setTrayCode(String trayCode)
+    public void setTrayCode(String trayCode) 
     {
         this.trayCode = trayCode;
     }
 
-    public String getTrayCode()
+    public String getTrayCode() 
     {
         return trayCode;
     }
 
-    public void setOutQuantity(String outQuantity)
+    public void setOutQuantity(String outQuantity) 
     {
         this.outQuantity = outQuantity;
     }
 
-    public String getOutQuantity()
+    public String getOutQuantity() 
     {
         return outQuantity;
     }
 
-    public void setStockinDetailId(String stockinDetailId)
+    public void setStockinDetailId(String stockinDetailId) 
     {
         this.stockinDetailId = stockinDetailId;
     }
 
-    public String getStockinDetailId()
+    public String getStockinDetailId() 
     {
         return stockinDetailId;
     }
 
-    public void setStockinId(String stockinId)
+    public void setStockinId(String stockinId) 
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId()
+    public String getStockinId() 
     {
         return stockinId;
     }
 
-    public void setInType(String inType)
+    public void setInType(String inType) 
     {
         this.inType = inType;
     }
 
-    public String getInType()
+    public String getInType() 
     {
         return inType;
     }
 
-    public void setInClassId(String inClassId)
+    public void setInClassId(String inClassId) 
     {
         this.inClassId = inClassId;
     }
 
-    public String getInClassId()
+    public String getInClassId() 
     {
         return inClassId;
     }
 
-    public void setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setStackingId(String stackingId)
+    public void setStackingId(String stackingId) 
     {
         this.stackingId = stackingId;
     }
 
-    public String getStackingId()
+    public String getStackingId() 
     {
         return stackingId;
     }
 
-    public void setSpare1(String spare1)
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1()
-    {
-        return spare1;
-    }
-
-    public void setSpare2(String spare2)
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2()
-    {
-        return spare2;
-    }
-
-    public void setSpare3(String spare3)
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3()
-    {
-        return spare3;
-    }
-
-    public void setSpare4(String spare4)
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4()
-    {
-        return spare4;
-    }
-
-    public void setSpare5(String spare5)
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5()
-    {
-        return spare5;
-    }
-
-    public void setSpare6(String spare6)
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6()
-    {
-        return spare6;
-    }
-
-    public void setProductId(String productId)
-    {
-        this.productId = productId;
-    }
-
-    public String getProductId()
-    {
-        return productId;
-    }
-
-    public void setWarehouseName(String warehouseName)
+    public void setWarehouseName(String warehouseName) 
     {
         this.warehouseName = warehouseName;
     }
 
-    public String getWarehouseName()
+    public String getWarehouseName() 
     {
         return warehouseName;
     }
 
-    public void setAddress(String address)
+    public void setAddress(String address) 
     {
         this.address = address;
     }
 
-    public String getAddress()
+    public String getAddress() 
     {
         return address;
     }
 
-    public void setcDesc(String cDesc)
+    public void setcDesc(String cDesc) 
     {
         this.cDesc = cDesc;
     }
 
-    public String getcDesc()
+    public String getcDesc() 
     {
         return cDesc;
     }
 
-    public void setWarehouseKind(String warehouseKind)
+    public void setWarehouseKind(String warehouseKind) 
     {
         this.warehouseKind = warehouseKind;
     }
 
-    public String getWarehouseKind()
+    public String getWarehouseKind() 
     {
         return warehouseKind;
     }
 
-    public void setWarehouseType(String warehouseType)
+    public void setWarehouseType(String warehouseType) 
     {
         this.warehouseType = warehouseType;
     }
 
-    public String getWarehouseType()
+    public String getWarehouseType() 
     {
         return warehouseType;
     }
 
-    public void setIsCurrent(String isCurrent)
+    public void setIsCurrent(String isCurrent) 
     {
         this.isCurrent = isCurrent;
     }
 
-    public String getIsCurrent()
+    public String getIsCurrent() 
     {
         return isCurrent;
     }
 
-    public void setPrice(String price)
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setParentId(String parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId() 
+    {
+        return parentId;
+    }
+
+    public void setPrice(String price) 
     {
         this.price = price;
     }
 
-    public String getPrice()
+    public String getPrice() 
     {
         return price;
     }
 
-    public void setUnit(String unit)
+    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 setSpec(String spec)
+    public void setSpec(String spec) 
     {
         this.spec = spec;
     }
 
-    public String getSpec()
+    public String getSpec() 
     {
         return spec;
     }
 
-    public void setEnName(String enName)
+    public void setSpare1(String spare1) 
     {
-        this.enName = enName;
+        this.spare1 = spare1;
     }
 
-    public String getEnName()
+    public String getSpare1() 
     {
-        return enName;
+        return spare1;
     }
 
-    public void setWeight(String weight)
+    public void setSpare2(String spare2) 
     {
-        this.weight = weight;
+        this.spare2 = spare2;
     }
 
-    public String getWeight()
+    public String getSpare2() 
     {
-        return weight;
+        return spare2;
     }
 
-    public void setLongMM(String longMM)
+    public void setSpare3(String spare3) 
     {
-        this.longMM = longMM;
+        this.spare3 = spare3;
     }
 
-    public String getLongMM()
+    public String getSpare3() 
     {
-        return longMM;
+        return spare3;
     }
 
-    public void setWide(String wide)
+    public void setSpare4(String spare4) 
     {
-        this.wide = wide;
+        this.spare4 = spare4;
     }
 
-    public String getWide()
+    public String getSpare4() 
     {
-        return wide;
+        return spare4;
     }
 
-    public void setHight(String hight)
+    public void setSpare5(String spare5) 
     {
-        this.hight = hight;
+        this.spare5 = spare5;
     }
 
-    public String getHight()
+    public String getSpare5() 
     {
-        return hight;
+        return spare5;
     }
 
-    public void setVolume(String volume)
+    public void setSpare6(String spare6) 
     {
-        this.volume = volume;
+        this.spare6 = spare6;
     }
 
-    public String getVolume()
+    public String getSpare6() 
     {
-        return volume;
+        return spare6;
     }
 
-    public void setProductName(String productName)
+    public void setProductName(String productName) 
     {
         this.productName = productName;
     }
 
-    public String getProductName()
+    public String getProductName() 
     {
         return productName;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName)
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) 
     {
         this.cargoSpaceName = cargoSpaceName;
     }
 
-    public String getCargoSpaceName()
+    public String getCargoSpaceName() 
     {
         return cargoSpaceName;
     }
 
-    public void setRoadwayId(String roadwayId)
+    public void setRoadwayId(String roadwayId) 
     {
         this.roadwayId = roadwayId;
     }
 
-    public String getRoadwayId()
+    public String getRoadwayId() 
     {
         return roadwayId;
     }
 
-    public void setCargoAreaId(String cargoAreaId)
+    public void setCargoAreaId(String cargoAreaId) 
     {
         this.cargoAreaId = cargoAreaId;
     }
 
-    public String getCargoAreaId()
+    public String getCargoAreaId() 
     {
         return cargoAreaId;
     }
 
-    public void setTheType(String theType)
+    public void setTheType(String theType) 
     {
         this.theType = theType;
     }
 
-    public String getTheType()
+    public String getTheType() 
     {
         return theType;
     }
 
-    public void setTheTypeName(String theTypeName)
+    public void setTheTypeName(String theTypeName) 
     {
         this.theTypeName = theTypeName;
     }
 
-    public String getTheTypeName()
+    public String getTheTypeName() 
     {
         return theTypeName;
     }
 
-    public void setThePlatoon(Long thePlatoon)
+    public void setThePlatoon(Long thePlatoon) 
     {
         this.thePlatoon = thePlatoon;
     }
 
-    public Long getThePlatoon()
+    public Long getThePlatoon() 
     {
         return thePlatoon;
     }
 
-    public void setTheColumn(Long theColumn)
+    public void setTheColumn(Long theColumn) 
     {
         this.theColumn = theColumn;
     }
 
-    public Long getTheColumn()
+    public Long getTheColumn() 
     {
         return theColumn;
     }
 
-    public void setTheFloor(Long theFloor)
+    public void setTheFloor(Long theFloor) 
     {
         this.theFloor = theFloor;
     }
 
-    public Long getTheFloor()
+    public Long getTheFloor() 
     {
         return theFloor;
     }
 
-    public void setCargoStatus(String cargoStatus)
+    public void setCargoStatus(String cargoStatus) 
     {
         this.cargoStatus = cargoStatus;
     }
 
-    public String getCargoStatus()
+    public String getCargoStatus() 
     {
         return cargoStatus;
     }
 
-    public void setLocked(String locked)
+    public void setLocked(String locked) 
     {
         this.locked = locked;
     }
 
-    public String getLocked()
+    public String getLocked() 
     {
         return locked;
     }
 
-    public void setCargoHight(String cargoHight)
+    public void setCargoHight(String cargoHight) 
     {
         this.cargoHight = cargoHight;
     }
 
-    public String getCargoHight()
+    public String getCargoHight() 
     {
         return cargoHight;
     }
 
-    public void setIssDouble(String issDouble)
+    public void setIssDouble(String issDouble) 
     {
         this.issDouble = issDouble;
     }
 
-    public String getIssDouble()
+    public String getIssDouble() 
     {
         return issDouble;
     }
 
-    public void setGroupCodingNo(String groupCodingNo)
+    public void setGroupCodingNo(String groupCodingNo) 
     {
         this.groupCodingNo = groupCodingNo;
     }
 
-    public String getGroupCodingNo()
+    public String getGroupCodingNo() 
     {
         return groupCodingNo;
     }
 
-    public void setGroupCoding(String groupCoding)
+    public void setGroupCoding(String groupCoding) 
     {
         this.groupCoding = groupCoding;
     }
 
-    public String getGroupCoding()
+    public String getGroupCoding() 
     {
         return groupCoding;
     }
 
-    public void setCargoSpaceLogo(String cargoSpaceLogo)
+    public void setCargoSpaceLogo(String cargoSpaceLogo) 
     {
         this.cargoSpaceLogo = cargoSpaceLogo;
     }
 
-    public String getCargoSpaceLogo()
+    public String getCargoSpaceLogo() 
     {
         return cargoSpaceLogo;
     }
 
-    public void setThisCargoArea(String thisCargoArea)
+    public void setThisCargoArea(String thisCargoArea) 
     {
         this.thisCargoArea = thisCargoArea;
     }
 
-    public String getThisCargoArea()
+    public String getThisCargoArea() 
     {
         return thisCargoArea;
     }
@@ -817,63 +1222,93 @@ public class ViewStockSecure extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("stockId", getStockId())
-                .append("cargoSpaceId", getCargoSpaceId())
-                .append("stockStatus", getStockStatus())
-                .append("productStatus", getProductStatus())
-                .append("lotNo", getLotNo())
-                .append("inDate", getInDate())
-                .append("backDate", getBackDate())
-                .append("productGuid", getProductGuid())
-                .append("quantity", getQuantity())
-                .append("jobId", getJobId())
-                .append("trayCode", getTrayCode())
-                .append("outQuantity", getOutQuantity())
-                .append("stockinDetailId", getStockinDetailId())
-                .append("stockinId", getStockinId())
-                .append("inType", getInType())
-                .append("inClassId", getInClassId())
-                .append("warehouseId", getWarehouseId())
-                .append("stackingId", getStackingId())
-                .append("spare1", getSpare1())
-                .append("spare2", getSpare2())
-                .append("spare3", getSpare3())
-                .append("spare4", getSpare4())
-                .append("spare5", getSpare5())
-                .append("spare6", getSpare6())
-                .append("productId", getProductId())
-                .append("warehouseName", getWarehouseName())
-                .append("address", getAddress())
-                .append("cDesc", getcDesc())
-                .append("warehouseKind", getWarehouseKind())
-                .append("warehouseType", getWarehouseType())
-                .append("isCurrent", getIsCurrent())
-                .append("price", getPrice())
-                .append("unit", getUnit())
-                .append("spec", getSpec())
-                .append("enName", getEnName())
-                .append("weight", getWeight())
-                .append("longMM", getLongMM())
-                .append("wide", getWide())
-                .append("hight", getHight())
-                .append("volume", getVolume())
-                .append("productName", getProductName())
-                .append("cargoSpaceName", getCargoSpaceName())
-                .append("roadwayId", getRoadwayId())
-                .append("cargoAreaId", getCargoAreaId())
-                .append("theType", getTheType())
-                .append("theTypeName", getTheTypeName())
-                .append("thePlatoon", getThePlatoon())
-                .append("theColumn", getTheColumn())
-                .append("theFloor", getTheFloor())
-                .append("cargoStatus", getCargoStatus())
-                .append("locked", getLocked())
-                .append("cargoHight", getCargoHight())
-                .append("issDouble", getIssDouble())
-                .append("groupCodingNo", getGroupCodingNo())
-                .append("groupCoding", getGroupCoding())
-                .append("cargoSpaceLogo", getCargoSpaceLogo())
-                .append("thisCargoArea", getThisCargoArea())
-                .toString();
+            .append("stockId", getStockId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("stockStatus", getStockStatus())
+            .append("productStatus", getProductStatus())
+            .append("lotNo", getLotNo())
+            .append("inDate", getInDate())
+            .append("backDate", getBackDate())
+            .append("quantity", getQuantity())
+            .append("jobId", getJobId())
+            .append("trayCode", getTrayCode())
+            .append("outQuantity", getOutQuantity())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("inClassId", getInClassId())
+            .append("warehouseId", getWarehouseId())
+            .append("stackingId", getStackingId())
+            .append("warehouseName", getWarehouseName())
+            .append("address", getAddress())
+            .append("cDesc", getcDesc())
+            .append("warehouseKind", getWarehouseKind())
+            .append("warehouseType", getWarehouseType())
+            .append("isCurrent", getIsCurrent())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoAreaId", getCargoAreaId())
+            .append("theType", getTheType())
+            .append("theTypeName", getTheTypeName())
+            .append("thePlatoon", getThePlatoon())
+            .append("theColumn", getTheColumn())
+            .append("theFloor", getTheFloor())
+            .append("cargoStatus", getCargoStatus())
+            .append("locked", getLocked())
+            .append("cargoHight", getCargoHight())
+            .append("issDouble", getIssDouble())
+            .append("groupCodingNo", getGroupCodingNo())
+            .append("groupCoding", getGroupCoding())
+            .append("cargoSpaceLogo", getCargoSpaceLogo())
+            .append("thisCargoArea", getThisCargoArea())
+            .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
index 5779dac..b2f1887 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockSecure.mapper;
 
-import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
 
 /**
  * 安全库存查询Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
-public interface ViewStockSecureMapper
+public interface ViewStockSecureMapper 
 {
     /**
      * 查询安全库存查询
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 安全库存查询
      */
@@ -22,7 +21,7 @@ public interface ViewStockSecureMapper
 
     /**
      * 查询安全库存查询列表
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 安全库存查询集合
      */
@@ -30,7 +29,7 @@ public interface ViewStockSecureMapper
 
     /**
      * 新增安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ViewStockSecureMapper
 
     /**
      * 修改安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ViewStockSecureMapper
 
     /**
      * 删除安全库存查询
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ViewStockSecureMapper
 
     /**
      * 批量删除安全库存查询
-     *
+     * 
      * @param stockIds 需要删除的数据主键集合
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
index e88a320..9d0ac3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockSecure.service;
 
-import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
 
 /**
  * 安全库存查询Service接口
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
-public interface IViewStockSecureService
+public interface IViewStockSecureService 
 {
     /**
      * 查询安全库存查询
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 安全库存查询
      */
@@ -22,7 +21,7 @@ public interface IViewStockSecureService
 
     /**
      * 查询安全库存查询列表
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 安全库存查询集合
      */
@@ -30,7 +29,7 @@ public interface IViewStockSecureService
 
     /**
      * 新增安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface IViewStockSecureService
 
     /**
      * 修改安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface IViewStockSecureService
 
     /**
      * 批量删除安全库存查询
-     *
+     * 
      * @param stockIds 需要删除的安全库存查询主键集合
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface IViewStockSecureService
 
     /**
      * 删除安全库存查询信息
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
index e60c7a6..566a10c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
@@ -1,28 +1,27 @@
 package com.ruoyi.search.ViewStockSecure.service.impl;
 
-import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
-import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
-import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
+import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
+import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;
 
 /**
  * 安全库存查询Service业务层处理
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 @Service
-public class ViewStockSecureServiceImpl implements IViewStockSecureService
+public class ViewStockSecureServiceImpl implements IViewStockSecureService 
 {
     @Autowired
     private ViewStockSecureMapper viewStockSecureMapper;
 
     /**
      * 查询安全库存查询
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 安全库存查询
      */
@@ -34,7 +33,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
 
     /**
      * 查询安全库存查询列表
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 安全库存查询
      */
@@ -46,7 +45,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
 
     /**
      * 新增安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -58,7 +57,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
 
     /**
      * 修改安全库存查询
-     *
+     * 
      * @param viewStockSecure 安全库存查询
      * @return 结果
      */
@@ -70,7 +69,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
 
     /**
      * 批量删除安全库存查询
-     *
+     * 
      * @param stockIds 需要删除的安全库存查询主键
      * @return 结果
      */
@@ -82,7 +81,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService
 
     /**
      * 删除安全库存查询信息
-     *
+     * 
      * @param stockId 安全库存查询主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
index 25bd8d6..0153f61 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockWarning.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.ViewStockWarning.domain.ViewStockWarning;
 import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
-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 ruoyi
- * @date 2025-08-06
+ * 库存预警查询Controller
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 @RestController
 @RequestMapping("/search/ViewStockWarning")
@@ -29,7 +35,7 @@ public class ViewStockWarningController extends BaseController
     private IViewStockWarningService viewStockWarningService;
 
     /**
-     * 查询库存预警报表列表
+     * 查询库存预警查询列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:list')")
     @GetMapping("/list")
@@ -41,20 +47,20 @@ public class ViewStockWarningController extends BaseController
     }
 
     /**
-     * 导出库存预警报表列表
+     * 导出库存预警查询列表
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:export')")
-    @Log(title = "库存预警报表", businessType = BusinessType.EXPORT)
+    @Log(title = "库存预警查询", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ViewStockWarning viewStockWarning)
     {
         List<ViewStockWarning> list = viewStockWarningService.selectViewStockWarningList(viewStockWarning);
         ExcelUtil<ViewStockWarning> util = new ExcelUtil<ViewStockWarning>(ViewStockWarning.class);
-        util.exportExcel(response, list, "库存预警报表数据");
+        util.exportExcel(response, list, "库存预警查询数据");
     }
 
     /**
-     * 获取库存预警报表详细信息
+     * 获取库存预警查询详细信息
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:query')")
     @GetMapping(value = "/{stockId}")
@@ -64,10 +70,10 @@ public class ViewStockWarningController extends BaseController
     }
 
     /**
-     * 新增库存预警报表
+     * 新增库存预警查询
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:add')")
-    @Log(title = "库存预警报表", businessType = BusinessType.INSERT)
+    @Log(title = "库存预警查询", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ViewStockWarning viewStockWarning)
     {
@@ -75,10 +81,10 @@ public class ViewStockWarningController extends BaseController
     }
 
     /**
-     * 修改库存预警报表
+     * 修改库存预警查询
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:edit')")
-    @Log(title = "库存预警报表", businessType = BusinessType.UPDATE)
+    @Log(title = "库存预警查询", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ViewStockWarning viewStockWarning)
     {
@@ -86,10 +92,10 @@ public class ViewStockWarningController extends BaseController
     }
 
     /**
-     * 删除库存预警报表
+     * 删除库存预警查询
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:remove')")
-    @Log(title = "库存预警报表", businessType = BusinessType.DELETE)
+    @Log(title = "库存预警查询", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{stockIds}")
     public AjaxResult remove(@PathVariable String[] stockIds)
     {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
index bc8608c..573aaf1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
@@ -1,816 +1,1220 @@
 package com.ruoyi.search.ViewStockWarning.domain;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 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_warning
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 库存预警查询对象 view_stock_warning
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 public class ViewStockWarning extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
-    /** 仓库名称 */
-    @Excel(name = "${search.ViewStockSecure.warehouseName}")
-    private String warehouseName;
-
     /** 库存ID */
-    @Excel(name = "${search.ViewStockSecure.stockId}")
+    @Excel(name = "库存ID")
     private String stockId;
 
     /** 货位ID */
-    @Excel(name = "${search.ViewStockSecure.cargoSpaceId}")
+    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
     /** 库存状态 */
-    @Excel(name = "${search.ViewStockSecure.stockStatus}",dictType = "stock_status")
+    @Excel(name = "库存状态")
     private String stockStatus;
 
     /** 物料状态 */
-    @Excel(name = "${search.ViewStockSecure.productStatus}",dictType = "product_status")
+    @Excel(name = "物料状态")
     private String productStatus;
 
     /** 批次号 */
-//    @Excel(name = "${search.ViewStockSecure.lotNo}")
+    @Excel(name = "批次号")
     private String lotNo;
 
     /** 入库时间 */
-    @Excel(name = "${search.ViewStockSecure.inDate}")
+    @Excel(name = "入库时间")
     private String inDate;
 
     /** 回流时间 */
-//    @Excel(name = "${search.ViewStockSecure.backDate}")
+    @Excel(name = "回流时间")
     private String backDate;
 
-    /** 物料GUID */
-//    @Excel(name = "${search.ViewStockSecure.productGuid}")
-    private String productGuid;
-
     /** 库存数量 */
-    @Excel(name = "${search.ViewStockSecure.quantity}")
+    @Excel(name = "库存数量")
     private String quantity;
 
     /** 作业ID */
-    @Excel(name = "${search.ViewStockSecure.jobId}")
+    @Excel(name = "作业ID")
     private String jobId;
 
     /** 托盘条码 */
-    @Excel(name = "${search.ViewStockSecure.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 出库数量 */
-//    @Excel(name = "${search.ViewStockSecure.outQuantity}")
+    @Excel(name = "出库数量")
     private String outQuantity;
 
     /** 入库子单ID */
-    @Excel(name = "${search.ViewStockSecure.stockinDetailId}")
+    @Excel(name = "入库子单ID")
     private String stockinDetailId;
 
     /** 入库主单 */
-    @Excel(name = "${search.ViewStockSecure.stockinId}")
+    @Excel(name = "入库主单")
     private String stockinId;
 
     /** 入库类型 */
-    @Excel(name = "${search.ViewStockSecure.inType}",dictType = "in_job_type")
+    @Excel(name = "入库类型")
     private String inType;
 
     /** 入库班组ID */
-//    @Excel(name = "${search.ViewStockSecure.inClassId}")
+    @Excel(name = "入库班组ID")
     private String inClassId;
 
     /** 仓库ID */
-//    @Excel(name = "${search.ViewStockSecure.warehouseId}")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
     /** 垛型ID */
-//    @Excel(name = "${search.ViewStockSecure.stackingId}")
+    @Excel(name = "垛型ID")
     private String stackingId;
 
-    /** 库存预警标识 */
-//    @Excel(name = "${search.ViewStockSecure.spare1}")
-    private String spare1;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare2;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare3;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare4;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare5;
-
-    /** $column.columnComment */
-//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare6;
-
-    /** 物料ID */
-    @Excel(name = "${search.ViewStockSecure.productId}")
-    private String productId;
-
-    /** 物料名称 */
-    @Excel(name = "${search.ViewStockSecure.productName}")
-    private String productName;
-
-    /** 英文名称 */
-    @Excel(name = "${search.ViewStockSecure.enName}")
-    private String enName;
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
 
     /** 仓库地址 */
-//    @Excel(name = "${search.ViewStockSecure.address}")
+    @Excel(name = "仓库地址")
     private String address;
 
     /** 仓库描述 */
-//    @Excel(name = "${search.ViewStockSecure.cDesc}")
+    @Excel(name = "仓库描述")
     private String cDesc;
 
     /** 仓库级别 */
-//    @Excel(name = "${search.ViewStockSecure.warehouseKind}")
+    @Excel(name = "仓库级别")
     private String warehouseKind;
 
     /** 仓库类型 */
-//    @Excel(name = "${search.ViewStockSecure.warehouseType}")
+    @Excel(name = "仓库类型")
     private String warehouseType;
 
-    /** 价格 */
-    @Excel(name = "${search.ViewStockSecure.price}")
-    private String price;
-
-    /** 单位 */
-    @Excel(name = "${search.ViewStockSecure.unit}")
-    private String unit;
-
     /** 是否可用 */
-//    @Excel(name = "${search.ViewStockSecure.isCurrent}")
+    @Excel(name = "是否可用")
     private String isCurrent;
 
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 品号 */
+    @Excel(name = "品号")
+    private String productId;
+
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String price;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
+    private String unit;
+
     /** 规格 */
-//    @Excel(name = "${search.ViewStockSecure.spec}")
+    @Excel(name = "规格")
     private String spec;
 
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spare1;
+
     /** 单件净重 */
-    @Excel(name = "${search.ViewStockSecure.weight}")
-    private String weight;
+    @Excel(name = "单件净重")
+    private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewStockSecure.longMM}")
-    private String longMM;
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewStockSecure.wide}")
-    private String wide;
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewStockSecure.hight}")
-    private String hight;
+    /** 电压 */
+    @Excel(name = "电压")
+    private String spare5;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewStockSecure.volume}")
-    private String volume;
+    /** 功率 */
+    @Excel(name = "功率")
+    private String spare6;
 
+    /** 品名 */
+    @Excel(name = "品名")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
+    private String spare7;
+
+    /** 毛重 */
+    @Excel(name = "毛重")
+    private String spare8;
+
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
+
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
+
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
+
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
+
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
+
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
+
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
+
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
+
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
+
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
+
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
+
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
+
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
+
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
+
+    /** 产品线/产品系列（组码） */
+    @Excel(name = "产品线/产品系列", readConverterExp = "组=码")
+    private String spare24;
+
+    /** BOM状态（组码） */
+    @Excel(name = "BOM状态", readConverterExp = "组=码")
+    private String spare25;
+
+    /** 产品定位（组码） */
+    @Excel(name = "产品定位", readConverterExp = "组=码")
+    private String spare26;
+
+    /** 电脑板型号（组码） */
+    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌（组码） */
+    @Excel(name = "品牌", readConverterExp = "组=码")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款", readConverterExp = "组=码")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
 
     /** 货位名称 */
-    @Excel(name = "${search.ViewStockSecure.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
-    /** 巷道ID */
-//    @Excel(name = "${search.ViewStockSecure.roadwayId}")
+    /** 巷道id */
+    @Excel(name = "巷道id")
     private String roadwayId;
 
-    /** 货区ID */
-//    @Excel(name = "${search.ViewStockSecure.cargoAreaId}")
+    /** 货区id */
+    @Excel(name = "货区id")
     private String cargoAreaId;
 
     /** 货位类型 */
-//    @Excel(name = "${search.ViewStockSecure.theType}")
+    @Excel(name = "货位类型")
     private String theType;
 
     /** 货位类型名称 */
-//    @Excel(name = "${search.ViewStockSecure.theTypeName}")
+    @Excel(name = "货位类型名称")
     private String theTypeName;
 
     /** 排 */
-//    @Excel(name = "${search.ViewStockSecure.thePlatoon}")
+    @Excel(name = "排")
     private Long thePlatoon;
 
     /** 列 */
-//    @Excel(name = "${search.ViewStockSecure.theColumn}")
+    @Excel(name = "列")
     private Long theColumn;
 
     /** 层 */
-//    @Excel(name = "${search.ViewStockSecure.theFloor}")
+    @Excel(name = "层")
     private Long theFloor;
 
     /** 货位状态 */
-    @Excel(name = "${search.ViewStockSecure.cargoStatus}",dictType = "cargo_space_status")
+    @Excel(name = "货位状态")
     private String cargoStatus;
 
     /** 是否锁定 */
-    @Excel(name = "${search.ViewStockSecure.locked}",dictType = "cargo_space_lock_status")
+    @Excel(name = "是否锁定")
     private String locked;
 
     /** 货位高度 */
-//    @Excel(name = "${search.ViewStockSecure.cargoHight}")
+    @Excel(name = "货位高度")
     private String cargoHight;
 
     /** 是否双伸 */
-//    @Excel(name = "${search.ViewStockSecure.issDouble}")
+    @Excel(name = "是否双伸")
     private String issDouble;
 
     /** 双货位分组编码 */
-//    @Excel(name = "${search.ViewStockSecure.groupCodingNo}")
+    @Excel(name = "双货位分组编码")
     private String groupCodingNo;
 
-    /** 双货位分组编码 */
-//    @Excel(name = "${search.ViewStockSecure.groupCoding}")
+    /** 双货位分组编码1 */
+    @Excel(name = "双货位分组编码1")
     private String groupCoding;
 
     /** 双货位标识 */
-//    @Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}")
+    @Excel(name = "双货位标识")
     private String cargoSpaceLogo;
 
     /** 本仓库区域 */
-//    @Excel(name = "${search.ViewStockSecure.thisCargoArea}")
+    @Excel(name = "本仓库区域")
     private String thisCargoArea;
 
-    public void setStockId(String stockId)
+    public void setStockId(String stockId) 
     {
         this.stockId = stockId;
     }
 
-    public String getStockId()
+    public String getStockId() 
     {
         return stockId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId)
+    public void setCargoSpaceId(String cargoSpaceId) 
     {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceId()
+    public String getCargoSpaceId() 
     {
         return cargoSpaceId;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setStockStatus(String stockStatus) 
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus()
+    public String getStockStatus() 
     {
         return stockStatus;
     }
 
-    public void setProductStatus(String productStatus)
+    public void setProductStatus(String productStatus) 
     {
         this.productStatus = productStatus;
     }
 
-    public String getProductStatus()
+    public String getProductStatus() 
     {
         return productStatus;
     }
 
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setInDate(String inDate)
+    public void setInDate(String inDate) 
     {
         this.inDate = inDate;
     }
 
-    public String getInDate()
+    public String getInDate() 
     {
         return inDate;
     }
 
-    public void setBackDate(String backDate)
+    public void setBackDate(String backDate) 
     {
         this.backDate = backDate;
     }
 
-    public String getBackDate()
+    public String getBackDate() 
     {
         return backDate;
     }
 
-    public void setProductGuid(String productGuid)
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductGuid()
-    {
-        return productGuid;
-    }
-
-    public void setQuantity(String quantity)
+    public void setQuantity(String quantity) 
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity()
+    public String getQuantity() 
     {
         return quantity;
     }
 
-    public void setJobId(String jobId)
+    public void setJobId(String jobId) 
     {
         this.jobId = jobId;
     }
 
-    public String getJobId()
+    public String getJobId() 
     {
         return jobId;
     }
 
-    public void setTrayCode(String trayCode)
+    public void setTrayCode(String trayCode) 
     {
         this.trayCode = trayCode;
     }
 
-    public String getTrayCode()
+    public String getTrayCode() 
     {
         return trayCode;
     }
 
-    public void setOutQuantity(String outQuantity)
+    public void setOutQuantity(String outQuantity) 
     {
         this.outQuantity = outQuantity;
     }
 
-    public String getOutQuantity()
+    public String getOutQuantity() 
     {
         return outQuantity;
     }
 
-    public void setStockinDetailId(String stockinDetailId)
+    public void setStockinDetailId(String stockinDetailId) 
     {
         this.stockinDetailId = stockinDetailId;
     }
 
-    public String getStockinDetailId()
+    public String getStockinDetailId() 
     {
         return stockinDetailId;
     }
 
-    public void setStockinId(String stockinId)
+    public void setStockinId(String stockinId) 
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId()
+    public String getStockinId() 
     {
         return stockinId;
     }
 
-    public void setInType(String inType)
+    public void setInType(String inType) 
     {
         this.inType = inType;
     }
 
-    public String getInType()
+    public String getInType() 
     {
         return inType;
     }
 
-    public void setInClassId(String inClassId)
+    public void setInClassId(String inClassId) 
     {
         this.inClassId = inClassId;
     }
 
-    public String getInClassId()
+    public String getInClassId() 
     {
         return inClassId;
     }
 
-    public void setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setStackingId(String stackingId)
+    public void setStackingId(String stackingId) 
     {
         this.stackingId = stackingId;
     }
 
-    public String getStackingId()
+    public String getStackingId() 
     {
         return stackingId;
     }
 
-    public void setSpare1(String spare1)
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1()
-    {
-        return spare1;
-    }
-
-    public void setSpare2(String spare2)
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2()
-    {
-        return spare2;
-    }
-
-    public void setSpare3(String spare3)
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3()
-    {
-        return spare3;
-    }
-
-    public void setSpare4(String spare4)
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4()
-    {
-        return spare4;
-    }
-
-    public void setSpare5(String spare5)
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5()
-    {
-        return spare5;
-    }
-
-    public void setSpare6(String spare6)
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6()
-    {
-        return spare6;
-    }
-
-    public void setProductId(String productId)
-    {
-        this.productId = productId;
-    }
-
-    public String getProductId()
-    {
-        return productId;
-    }
-
-    public void setWarehouseName(String warehouseName)
+    public void setWarehouseName(String warehouseName) 
     {
         this.warehouseName = warehouseName;
     }
 
-    public String getWarehouseName()
+    public String getWarehouseName() 
     {
         return warehouseName;
     }
 
-    public void setAddress(String address)
+    public void setAddress(String address) 
     {
         this.address = address;
     }
 
-    public String getAddress()
+    public String getAddress() 
     {
         return address;
     }
 
-    public void setcDesc(String cDesc)
+    public void setcDesc(String cDesc) 
     {
         this.cDesc = cDesc;
     }
 
-    public String getcDesc()
+    public String getcDesc() 
     {
         return cDesc;
     }
 
-    public void setWarehouseKind(String warehouseKind)
+    public void setWarehouseKind(String warehouseKind) 
     {
         this.warehouseKind = warehouseKind;
     }
 
-    public String getWarehouseKind()
+    public String getWarehouseKind() 
     {
         return warehouseKind;
     }
 
-    public void setWarehouseType(String warehouseType)
+    public void setWarehouseType(String warehouseType) 
     {
         this.warehouseType = warehouseType;
     }
 
-    public String getWarehouseType()
+    public String getWarehouseType() 
     {
         return warehouseType;
     }
 
-    public void setIsCurrent(String isCurrent)
+    public void setIsCurrent(String isCurrent) 
     {
         this.isCurrent = isCurrent;
     }
 
-    public String getIsCurrent()
+    public String getIsCurrent() 
     {
         return isCurrent;
     }
 
-    public void setPrice(String price)
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setParentId(String parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId() 
+    {
+        return parentId;
+    }
+
+    public void setPrice(String price) 
     {
         this.price = price;
     }
 
-    public String getPrice()
+    public String getPrice() 
     {
         return price;
     }
 
-    public void setUnit(String unit)
+    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 setSpec(String spec)
+    public void setSpec(String spec) 
     {
         this.spec = spec;
     }
 
-    public String getSpec()
+    public String getSpec() 
     {
         return spec;
     }
 
-    public void setEnName(String enName)
+    public void setSpare1(String spare1) 
     {
-        this.enName = enName;
+        this.spare1 = spare1;
     }
 
-    public String getEnName()
+    public String getSpare1() 
     {
-        return enName;
+        return spare1;
     }
 
-    public void setWeight(String weight)
+    public void setSpare2(String spare2) 
     {
-        this.weight = weight;
+        this.spare2 = spare2;
     }
 
-    public String getWeight()
+    public String getSpare2() 
     {
-        return weight;
+        return spare2;
     }
 
-    public void setLongMM(String longMM)
+    public void setSpare3(String spare3) 
     {
-        this.longMM = longMM;
+        this.spare3 = spare3;
     }
 
-    public String getLongMM()
+    public String getSpare3() 
     {
-        return longMM;
+        return spare3;
     }
 
-    public void setWide(String wide)
+    public void setSpare4(String spare4) 
     {
-        this.wide = wide;
+        this.spare4 = spare4;
     }
 
-    public String getWide()
+    public String getSpare4() 
     {
-        return wide;
+        return spare4;
     }
 
-    public void setHight(String hight)
+    public void setSpare5(String spare5) 
     {
-        this.hight = hight;
+        this.spare5 = spare5;
     }
 
-    public String getHight()
+    public String getSpare5() 
     {
-        return hight;
+        return spare5;
     }
 
-    public void setVolume(String volume)
+    public void setSpare6(String spare6) 
     {
-        this.volume = volume;
+        this.spare6 = spare6;
     }
 
-    public String getVolume()
+    public String getSpare6() 
     {
-        return volume;
+        return spare6;
     }
 
-    public void setProductName(String productName)
+    public void setProductName(String productName) 
     {
         this.productName = productName;
     }
 
-    public String getProductName()
+    public String getProductName() 
     {
         return productName;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName)
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) 
     {
         this.cargoSpaceName = cargoSpaceName;
     }
 
-    public String getCargoSpaceName()
+    public String getCargoSpaceName() 
     {
         return cargoSpaceName;
     }
 
-    public void setRoadwayId(String roadwayId)
+    public void setRoadwayId(String roadwayId) 
     {
         this.roadwayId = roadwayId;
     }
 
-    public String getRoadwayId()
+    public String getRoadwayId() 
     {
         return roadwayId;
     }
 
-    public void setCargoAreaId(String cargoAreaId)
+    public void setCargoAreaId(String cargoAreaId) 
     {
         this.cargoAreaId = cargoAreaId;
     }
 
-    public String getCargoAreaId()
+    public String getCargoAreaId() 
     {
         return cargoAreaId;
     }
 
-    public void setTheType(String theType)
+    public void setTheType(String theType) 
     {
         this.theType = theType;
     }
 
-    public String getTheType()
+    public String getTheType() 
     {
         return theType;
     }
 
-    public void setTheTypeName(String theTypeName)
+    public void setTheTypeName(String theTypeName) 
     {
         this.theTypeName = theTypeName;
     }
 
-    public String getTheTypeName()
+    public String getTheTypeName() 
     {
         return theTypeName;
     }
 
-    public void setThePlatoon(Long thePlatoon)
+    public void setThePlatoon(Long thePlatoon) 
     {
         this.thePlatoon = thePlatoon;
     }
 
-    public Long getThePlatoon()
+    public Long getThePlatoon() 
     {
         return thePlatoon;
     }
 
-    public void setTheColumn(Long theColumn)
+    public void setTheColumn(Long theColumn) 
     {
         this.theColumn = theColumn;
     }
 
-    public Long getTheColumn()
+    public Long getTheColumn() 
     {
         return theColumn;
     }
 
-    public void setTheFloor(Long theFloor)
+    public void setTheFloor(Long theFloor) 
     {
         this.theFloor = theFloor;
     }
 
-    public Long getTheFloor()
+    public Long getTheFloor() 
     {
         return theFloor;
     }
 
-    public void setCargoStatus(String cargoStatus)
+    public void setCargoStatus(String cargoStatus) 
     {
         this.cargoStatus = cargoStatus;
     }
 
-    public String getCargoStatus()
+    public String getCargoStatus() 
     {
         return cargoStatus;
     }
 
-    public void setLocked(String locked)
+    public void setLocked(String locked) 
     {
         this.locked = locked;
     }
 
-    public String getLocked()
+    public String getLocked() 
     {
         return locked;
     }
 
-    public void setCargoHight(String cargoHight)
+    public void setCargoHight(String cargoHight) 
     {
         this.cargoHight = cargoHight;
     }
 
-    public String getCargoHight()
+    public String getCargoHight() 
     {
         return cargoHight;
     }
 
-    public void setIssDouble(String issDouble)
+    public void setIssDouble(String issDouble) 
     {
         this.issDouble = issDouble;
     }
 
-    public String getIssDouble()
+    public String getIssDouble() 
     {
         return issDouble;
     }
 
-    public void setGroupCodingNo(String groupCodingNo)
+    public void setGroupCodingNo(String groupCodingNo) 
     {
         this.groupCodingNo = groupCodingNo;
     }
 
-    public String getGroupCodingNo()
+    public String getGroupCodingNo() 
     {
         return groupCodingNo;
     }
 
-    public void setGroupCoding(String groupCoding)
+    public void setGroupCoding(String groupCoding) 
     {
         this.groupCoding = groupCoding;
     }
 
-    public String getGroupCoding()
+    public String getGroupCoding() 
     {
         return groupCoding;
     }
 
-    public void setCargoSpaceLogo(String cargoSpaceLogo)
+    public void setCargoSpaceLogo(String cargoSpaceLogo) 
     {
         this.cargoSpaceLogo = cargoSpaceLogo;
     }
 
-    public String getCargoSpaceLogo()
+    public String getCargoSpaceLogo() 
     {
         return cargoSpaceLogo;
     }
 
-    public void setThisCargoArea(String thisCargoArea)
+    public void setThisCargoArea(String thisCargoArea) 
     {
         this.thisCargoArea = thisCargoArea;
     }
 
-    public String getThisCargoArea()
+    public String getThisCargoArea() 
     {
         return thisCargoArea;
     }
@@ -825,7 +1229,6 @@ public class ViewStockWarning extends BaseEntity
             .append("lotNo", getLotNo())
             .append("inDate", getInDate())
             .append("backDate", getBackDate())
-            .append("productGuid", getProductGuid())
             .append("quantity", getQuantity())
             .append("jobId", getJobId())
             .append("trayCode", getTrayCode())
@@ -836,29 +1239,60 @@ public class ViewStockWarning extends BaseEntity
             .append("inClassId", getInClassId())
             .append("warehouseId", getWarehouseId())
             .append("stackingId", getStackingId())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .append("productId", getProductId())
             .append("warehouseName", getWarehouseName())
             .append("address", getAddress())
             .append("cDesc", getcDesc())
             .append("warehouseKind", getWarehouseKind())
             .append("warehouseType", getWarehouseType())
             .append("isCurrent", getIsCurrent())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
             .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
             .append("unit", getUnit())
             .append("spec", getSpec())
-            .append("enName", getEnName())
-            .append("weight", getWeight())
-            .append("longMM", getLongMM())
-            .append("wide", getWide())
-            .append("hight", getHight())
-            .append("volume", getVolume())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
             .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
             .append("cargoSpaceName", getCargoSpaceName())
             .append("roadwayId", getRoadwayId())
             .append("cargoAreaId", getCargoAreaId())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
index 40b8bc9..1af4cbe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
@@ -1,60 +1,59 @@
 package com.ruoyi.search.ViewStockWarning.mapper;
 
+import java.util.List;
 import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
 
-import java.util.List;
-
 /**
- * 库存预警报表Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 库存预警查询Mapper接口
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
-public interface ViewStockWarningMapper
+public interface ViewStockWarningMapper 
 {
     /**
-     * 查询库存预警报表
-     *
-     * @param stockId 库存预警报表主键
-     * @return 库存预警报表
+     * 查询库存预警查询
+     * 
+     * @param stockId 库存预警查询主键
+     * @return 库存预警查询
      */
     public ViewStockWarning selectViewStockWarningByStockId(String stockId);
 
     /**
-     * 查询库存预警报表列表
-     *
-     * @param viewStockWarning 库存预警报表
-     * @return 库存预警报表集合
+     * 查询库存预警查询列表
+     * 
+     * @param viewStockWarning 库存预警查询
+     * @return 库存预警查询集合
      */
     public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);
 
     /**
-     * 新增库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 新增库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     public int insertViewStockWarning(ViewStockWarning viewStockWarning);
 
     /**
-     * 修改库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 修改库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     public int updateViewStockWarning(ViewStockWarning viewStockWarning);
 
     /**
-     * 删除库存预警报表
-     *
-     * @param stockId 库存预警报表主键
+     * 删除库存预警查询
+     * 
+     * @param stockId 库存预警查询主键
      * @return 结果
      */
     public int deleteViewStockWarningByStockId(String stockId);
 
     /**
-     * 批量删除库存预警报表
-     *
+     * 批量删除库存预警查询
+     * 
      * @param stockIds 需要删除的数据主键集合
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
index c5a3fde..246872c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
@@ -1,61 +1,60 @@
 package com.ruoyi.search.ViewStockWarning.service;
 
+import java.util.List;
 import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
 
-import java.util.List;
-
 /**
- * 库存预警报表Service接口
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 库存预警查询Service接口
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
-public interface IViewStockWarningService
+public interface IViewStockWarningService 
 {
     /**
-     * 查询库存预警报表
-     *
-     * @param stockId 库存预警报表主键
-     * @return 库存预警报表
+     * 查询库存预警查询
+     * 
+     * @param stockId 库存预警查询主键
+     * @return 库存预警查询
      */
     public ViewStockWarning selectViewStockWarningByStockId(String stockId);
 
     /**
-     * 查询库存预警报表列表
-     *
-     * @param viewStockWarning 库存预警报表
-     * @return 库存预警报表集合
+     * 查询库存预警查询列表
+     * 
+     * @param viewStockWarning 库存预警查询
+     * @return 库存预警查询集合
      */
     public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);
 
     /**
-     * 新增库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 新增库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     public int insertViewStockWarning(ViewStockWarning viewStockWarning);
 
     /**
-     * 修改库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 修改库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     public int updateViewStockWarning(ViewStockWarning viewStockWarning);
 
     /**
-     * 批量删除库存预警报表
-     *
-     * @param stockIds 需要删除的库存预警报表主键集合
+     * 批量删除库存预警查询
+     * 
+     * @param stockIds 需要删除的库存预警查询主键集合
      * @return 结果
      */
     public int deleteViewStockWarningByStockIds(String[] stockIds);
 
     /**
-     * 删除库存预警报表信息
-     *
-     * @param stockId 库存预警报表主键
+     * 删除库存预警查询信息
+     * 
+     * @param stockId 库存预警查询主键
      * @return 结果
      */
     public int deleteViewStockWarningByStockId(String stockId);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
index cd6dca7..09a806c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
@@ -1,30 +1,29 @@
 package com.ruoyi.search.ViewStockWarning.service.impl;
 
-import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
-import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
-import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
+import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
+import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;
 
 /**
- * 库存预警报表Service业务层处理
- *
- * @author ruoyi
- * @date 2025-08-06
+ * 库存预警查询Service业务层处理
+ * 
+ * @author gw
+ * @date 2025-09-22
  */
 @Service
-public class ViewStockWarningServiceImpl implements IViewStockWarningService
+public class ViewStockWarningServiceImpl implements IViewStockWarningService 
 {
     @Autowired
     private ViewStockWarningMapper viewStockWarningMapper;
 
     /**
-     * 查询库存预警报表
-     *
-     * @param stockId 库存预警报表主键
-     * @return 库存预警报表
+     * 查询库存预警查询
+     * 
+     * @param stockId 库存预警查询主键
+     * @return 库存预警查询
      */
     @Override
     public ViewStockWarning selectViewStockWarningByStockId(String stockId)
@@ -33,10 +32,10 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 查询库存预警报表列表
-     *
-     * @param viewStockWarning 库存预警报表
-     * @return 库存预警报表
+     * 查询库存预警查询列表
+     * 
+     * @param viewStockWarning 库存预警查询
+     * @return 库存预警查询
      */
     @Override
     public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning)
@@ -45,9 +44,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 新增库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 新增库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     @Override
@@ -57,9 +56,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 修改库存预警报表
-     *
-     * @param viewStockWarning 库存预警报表
+     * 修改库存预警查询
+     * 
+     * @param viewStockWarning 库存预警查询
      * @return 结果
      */
     @Override
@@ -69,9 +68,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 批量删除库存预警报表
-     *
-     * @param stockIds 需要删除的库存预警报表主键
+     * 批量删除库存预警查询
+     * 
+     * @param stockIds 需要删除的库存预警查询主键
      * @return 结果
      */
     @Override
@@ -81,9 +80,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 删除库存预警报表信息
-     *
-     * @param stockId 库存预警报表主键
+     * 删除库存预警查询信息
+     * 
+     * @param stockId 库存预警查询主键
      * @return 结果
      */
     @Override
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 52c03f9..1dc9fc3 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
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockinHistory.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.ViewStockinHistory.domain.ViewStockinHistory;
 import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
-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-28
+ * @date 2025-09-19
  */
 @RestController
 @RequestMapping("/search/ViewStockinHistory")
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 42b2353..fd3e848 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
@@ -1,653 +1,1209 @@
 package com.ruoyi.search.ViewStockinHistory.domain;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 入库单据历史对象 view_stockin_history
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
 public class ViewStockinHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 入库单guid */
-//    @Excel(name = "${search.ViewStockinHistory.stockinGuid}")
+    @Excel(name = "入库单guid")
     private String stockinGuid;
 
     /** 入库单号 */
-    @Excel(name = "${search.ViewStockinHistory.stockinId}")
+    @Excel(name = "入库单号")
     private String stockinId;
 
     /** 入库类型 */
-    @Excel(name = "${search.ViewStockinHistory.inType}",dictType = "in_job_type")
+    @Excel(name = "入库类型")
     private String inType;
 
     /** 创建时间 */
-    @Excel(name = "${search.ViewStockinHistory.createDate}")
+    @Excel(name = "创建时间")
     private String createDate;
 
     /** 创建人 */
-    @Excel(name = "${search.ViewStockinHistory.createManId}")
+    @Excel(name = "创建人")
     private String createManId;
 
     /** 单据状态 */
-    @Excel(name = "${search.ViewStockinHistory.status}",dictType = "in_bill_status")
+    @Excel(name = "单据状态")
     private String status;
 
     /** 仓库ID */
-    @Excel(name = "${search.ViewStockinHistory.warehouseId}")
+    @Excel(name = "仓库ID")
     private String warehouseId;
 
     /** 完成时间 */
-    @Excel(name = "${search.ViewStockinHistory.finishDate}")
+    @Excel(name = "完成时间")
     private String finishDate;
 
     /** ERP单号 */
-//    @Excel(name = "${search.ViewStockinHistory.erpBill}")
+    @Excel(name = "ERP单号")
     private String erpBill;
 
     /** 单据来源 */
-    @Excel(name = "${search.ViewStockinHistory.stockSource}")
+    @Excel(name = "单据来源")
     private String stockSource;
 
     /** 部门编码 */
-    @Excel(name = "${search.ViewStockinHistory.departmentNo}")
+    @Excel(name = "部门编码")
     private String departmentNo;
 
     /** 班组编码 */
-//    @Excel(name = "${search.ViewStockinHistory.classNo}")
+    @Excel(name = "班组编码")
     private String classNo;
 
     /** 供应商编号 */
-    @Excel(name = "${search.ViewStockinHistory.supplierNo}")
+    @Excel(name = "供应商编号")
     private String supplierNo;
 
     /** 供应商名称 */
-    @Excel(name = "${search.ViewStockinHistory.supplierName}")
+    @Excel(name = "供应商名称")
     private String supplierName;
 
     /** 供应商简称 */
-    @Excel(name = "${search.ViewStockinHistory.simpleName}")
+    @Excel(name = "供应商简称")
     private String simpleName;
+
     /** 联系人 */
-    @Excel(name = "${search.ViewStockinHistory.contactName}")
+    @Excel(name = "联系人")
     private String contactName;
 
     /** 联系电话 */
-    @Excel(name = "${search.ViewStockinHistory.contactNumber}")
+    @Excel(name = "联系电话")
     private String contactNumber;
 
     /** 供应商地址 */
-    @Excel(name = "${search.ViewStockinHistory.address}")
+    @Excel(name = "供应商地址")
     private String address;
 
     /** 入库明细ID */
-    @Excel(name = "${search.ViewStockinHistory.stockinDetailId}")
+    @Excel(name = "入库明细ID")
     private String stockinDetailId;
 
     /** 批次号 */
-//    @Excel(name = "${search.ViewStockinHistory.lotNo}")
+    @Excel(name = "批次号")
     private String lotNo;
 
     /** 计划数量 */
-    @Excel(name = "${search.ViewStockinHistory.quantity}")
+    @Excel(name = "计划数量")
     private String quantity;
 
     /** 计划箱数 */
-//    @Excel(name = "${search.ViewStockinHistory.quantityX}")
+    @Excel(name = "计划箱数")
     private String quantityX;
 
     /** 计划件数 */
-//    @Excel(name = "${search.ViewStockinHistory.quantityJ}")
+    @Excel(name = "计划件数")
     private String quantityJ;
 
     /** 实际数量 */
-    @Excel(name = "${search.ViewStockinHistory.assignNum}")
+    @Excel(name = "实际数量")
     private String assignNum;
 
     /** 实际箱数 */
-//    @Excel(name = "${search.ViewStockinHistory.assignNumX}")
+    @Excel(name = "实际箱数")
     private String assignNumX;
 
     /** 实际件数 */
-//    @Excel(name = "${search.ViewStockinHistory.assignNumJ}")
+    @Excel(name = "实际件数")
     private String assignNumJ;
 
     /** 扫码数量 */
-    @Excel(name = "${search.ViewStockinHistory.scanNum}")
+    @Excel(name = "扫码数量")
     private String scanNum;
 
     /** 扫码箱数 */
-//    @Excel(name = "${search.ViewStockinHistory.scanNumX}")
+    @Excel(name = "扫码箱数")
     private String scanNumX;
 
     /** 扫码件数 */
-//    @Excel(name = "${search.ViewStockinHistory.scanNumJ}")
+    @Excel(name = "扫码件数")
     private String scanNumJ;
 
     /** 入库日期 */
-//    @Excel(name = "${search.ViewStockinHistory.printDate}")
+    @Excel(name = "入库日期")
     private String printDate;
 
     /** 库存状态 */
-//    @Excel(name = "${search.ViewStockinHistory.stockStatus}",dictType = "stock_status")
+    @Excel(name = "库存状态")
     private String stockStatus;
 
-    /** 单价 */
-//    @Excel(name = "${search.ViewStockinHistory.price}")
-    private String price;
+    /** 物料主键 */
+    @Excel(name = "物料主键")
+    private String productGuid;
 
     /** 物料编码 */
-    @Excel(name = "${search.ViewStockinHistory.productId}")
+    @Excel(name = "物料编码")
     private String productId;
 
-    /** 物料名称 */
-    @Excel(name = "${search.ViewStockinHistory.productName}")
-    private String productName;
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
 
-    /** 单位 */
-    @Excel(name = "${search.ViewStockinHistory.unit}")
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String price;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
     private String unit;
 
     /** 规格 */
-//    @Excel(name = "${search.ViewStockinHistory.spec}")
+    @Excel(name = "规格")
     private String spec;
 
-    /** 英文名称 */
-    @Excel(name = "${search.ViewStockinHistory.spare1}")
+    /** 型号 */
+    @Excel(name = "型号")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.ViewStockinHistory.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewStockinHistory.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewStockinHistory.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewStockinHistory.spare7}")
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewStockinHistory.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
 
-    /** 备注 */
-    @Excel(name = "${search.ViewStockinHistory.remark}")
-    private String remark;
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
 
-    public String getSpare1() {
-        return spare1;
-    }
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
 
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
 
-    public String getSpare2() {
-        return spare2;
-    }
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
 
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
 
-    public String getSpare5() {
-        return spare5;
-    }
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
 
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
 
-    public String getSpare6() {
-        return spare6;
-    }
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
 
-    public String getSpare7() {
-        return spare7;
-    }
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
 
-    public String getSpare8() {
-        return spare8;
-    }
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
 
-    @Override
-    public String getRemark() {
-        return remark;
-    }
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
 
-    public void setStockinGuid(String stockinGuid)
+    /** 产品线/产品系列 */
+    @Excel(name = "产品线/产品系列")
+    private String spare24;
+
+    /** BOM状态 */
+    @Excel(name = "BOM状态")
+    private String spare25;
+
+    /** 产品定位 */
+    @Excel(name = "产品定位")
+    private String spare26;
+
+    /** 电脑板型号 */
+    @Excel(name = "电脑板型号")
+    private String spare27;
+
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款 */
+    @Excel(name = "是否标准款")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    public void setStockinGuid(String stockinGuid) 
     {
         this.stockinGuid = stockinGuid;
     }
 
-    public String getStockinGuid()
+    public String getStockinGuid() 
     {
         return stockinGuid;
     }
 
-    public void setStockinId(String stockinId)
+    public void setStockinId(String stockinId) 
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId()
+    public String getStockinId() 
     {
         return stockinId;
     }
 
-    public void setInType(String inType)
+    public void setInType(String inType) 
     {
         this.inType = inType;
     }
 
-    public String getInType()
+    public String getInType() 
     {
         return inType;
     }
 
-    public void setCreateDate(String createDate)
+    public void setCreateDate(String createDate) 
     {
         this.createDate = createDate;
     }
 
-    public String getCreateDate()
+    public String getCreateDate() 
     {
         return createDate;
     }
 
-    public void setCreateManId(String createManId)
+    public void setCreateManId(String createManId) 
     {
         this.createManId = createManId;
     }
 
-    public String getCreateManId()
+    public String getCreateManId() 
     {
         return createManId;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() 
     {
         return warehouseId;
     }
 
-    public void setFinishDate(String finishDate)
+    public void setFinishDate(String finishDate) 
     {
         this.finishDate = finishDate;
     }
 
-    public String getFinishDate()
+    public String getFinishDate() 
     {
         return finishDate;
     }
 
-    public void setErpBill(String erpBill)
+    public void setErpBill(String erpBill) 
     {
         this.erpBill = erpBill;
     }
 
-    public String getErpBill()
+    public String getErpBill() 
     {
         return erpBill;
     }
 
-    public void setStockSource(String stockSource)
+    public void setStockSource(String stockSource) 
     {
         this.stockSource = stockSource;
     }
 
-    public String getStockSource()
+    public String getStockSource() 
     {
         return stockSource;
     }
 
-    public void setDepartmentNo(String departmentNo)
+    public void setDepartmentNo(String departmentNo) 
     {
         this.departmentNo = departmentNo;
     }
 
-    public String getDepartmentNo()
+    public String getDepartmentNo() 
     {
         return departmentNo;
     }
 
-    public void setClassNo(String classNo)
+    public void setClassNo(String classNo) 
     {
         this.classNo = classNo;
     }
 
-    public String getClassNo()
+    public String getClassNo() 
     {
         return classNo;
     }
 
-    public void setSupplierNo(String supplierNo)
+    public void setSupplierNo(String supplierNo) 
     {
         this.supplierNo = supplierNo;
     }
 
-    public String getSupplierNo()
+    public String getSupplierNo() 
     {
         return supplierNo;
     }
 
-    public void setSupplierName(String supplierName)
+    public void setSupplierName(String supplierName) 
     {
         this.supplierName = supplierName;
     }
 
-    public String getSupplierName()
+    public String getSupplierName() 
     {
         return supplierName;
     }
 
-    public void setSimpleName(String simpleName)
+    public void setSimpleName(String simpleName) 
     {
         this.simpleName = simpleName;
     }
 
-    public String getSimpleName()
+    public String getSimpleName() 
     {
         return simpleName;
     }
 
-    public void setContactName(String contactName)
+    public void setContactName(String contactName) 
     {
         this.contactName = contactName;
     }
 
-    public String getContactName()
+    public String getContactName() 
     {
         return contactName;
     }
 
-    public void setContactNumber(String contactNumber)
+    public void setContactNumber(String contactNumber) 
     {
         this.contactNumber = contactNumber;
     }
 
-    public String getContactNumber()
+    public String getContactNumber() 
     {
         return contactNumber;
     }
 
-    public void setAddress(String address)
+    public void setAddress(String address) 
     {
         this.address = address;
     }
 
-    public String getAddress()
+    public String getAddress() 
     {
         return address;
     }
 
-    public void setStockinDetailId(String stockinDetailId)
+    public void setStockinDetailId(String stockinDetailId) 
     {
         this.stockinDetailId = stockinDetailId;
     }
 
-    public String getStockinDetailId()
+    public String getStockinDetailId() 
     {
         return stockinDetailId;
     }
 
-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setQuantity(String quantity)
+    public void setQuantity(String quantity) 
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity()
+    public String getQuantity() 
     {
         return quantity;
     }
 
-    public void setQuantityX(String quantityX)
+    public void setQuantityX(String quantityX) 
     {
         this.quantityX = quantityX;
     }
 
-    public String getQuantityX()
+    public String getQuantityX() 
     {
         return quantityX;
     }
 
-    public void setQuantityJ(String quantityJ)
+    public void setQuantityJ(String quantityJ) 
     {
         this.quantityJ = quantityJ;
     }
 
-    public String getQuantityJ()
+    public String getQuantityJ() 
     {
         return quantityJ;
     }
 
-    public void setAssignNum(String assignNum)
+    public void setAssignNum(String assignNum) 
     {
         this.assignNum = assignNum;
     }
 
-    public String getAssignNum()
+    public String getAssignNum() 
     {
         return assignNum;
     }
 
-    public void setAssignNumX(String assignNumX)
+    public void setAssignNumX(String assignNumX) 
     {
         this.assignNumX = assignNumX;
     }
 
-    public String getAssignNumX()
+    public String getAssignNumX() 
     {
         return assignNumX;
     }
 
-    public void setAssignNumJ(String assignNumJ)
+    public void setAssignNumJ(String assignNumJ) 
     {
         this.assignNumJ = assignNumJ;
     }
 
-    public String getAssignNumJ()
+    public String getAssignNumJ() 
     {
         return assignNumJ;
     }
 
-    public void setScanNum(String scanNum)
+    public void setScanNum(String scanNum) 
     {
         this.scanNum = scanNum;
     }
 
-    public String getScanNum()
+    public String getScanNum() 
     {
         return scanNum;
     }
 
-    public void setScanNumX(String scanNumX)
+    public void setScanNumX(String scanNumX) 
     {
         this.scanNumX = scanNumX;
     }
 
-    public String getScanNumX()
+    public String getScanNumX() 
     {
         return scanNumX;
     }
 
-    public void setScanNumJ(String scanNumJ)
+    public void setScanNumJ(String scanNumJ) 
     {
         this.scanNumJ = scanNumJ;
     }
 
-    public String getScanNumJ()
+    public String getScanNumJ() 
     {
         return scanNumJ;
     }
 
-    public void setPrintDate(String printDate)
+    public void setPrintDate(String printDate) 
     {
         this.printDate = printDate;
     }
 
-    public String getPrintDate()
+    public String getPrintDate() 
     {
         return printDate;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setStockStatus(String stockStatus) 
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus()
+    public String getStockStatus() 
     {
         return stockStatus;
     }
 
-    public void setPrice(String price)
+    public void setProductGuid(String productGuid) 
     {
-        this.price = price;
+        this.productGuid = productGuid;
     }
 
-    public String getPrice()
+    public String getProductGuid() 
     {
-        return price;
+        return productGuid;
     }
 
-    public void setProductId(String productId)
+    public void setProductId(String productId) 
     {
         this.productId = productId;
     }
 
-    public String getProductId()
+    public String getProductId() 
     {
         return productId;
     }
 
-    public void setProductName(String productName)
+    public void setParentId(String parentId) 
     {
-        this.productName = productName;
+        this.parentId = parentId;
     }
 
-    public String getProductName()
+    public String getParentId() 
     {
-        return productName;
+        return parentId;
     }
 
-    public void setUnit(String unit)
+    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 setSpec(String spec)
+    public void setSpec(String spec) 
     {
         this.spec = spec;
     }
 
-    public String getSpec()
+    public String getSpec() 
     {
         return spec;
     }
 
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
+    public void setWarehouseName(String warehouseName) 
+    {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseName() 
+    {
+        return warehouseName;
+    }
+
     @Override
     public String toString() {
-        return "ViewStockinHistory{" +
-                "stockinGuid='" + stockinGuid + '\'' +
-                ", stockinId='" + stockinId + '\'' +
-                ", inType='" + inType + '\'' +
-                ", createDate='" + createDate + '\'' +
-                ", createManId='" + createManId + '\'' +
-                ", status='" + status + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", finishDate='" + finishDate + '\'' +
-                ", erpBill='" + erpBill + '\'' +
-                ", stockSource='" + stockSource + '\'' +
-                ", departmentNo='" + departmentNo + '\'' +
-                ", classNo='" + classNo + '\'' +
-                ", supplierNo='" + supplierNo + '\'' +
-                ", supplierName='" + supplierName + '\'' +
-                ", simpleName='" + simpleName + '\'' +
-                ", contactName='" + contactName + '\'' +
-                ", contactNumber='" + contactNumber + '\'' +
-                ", address='" + address + '\'' +
-                ", stockinDetailId='" + stockinDetailId + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", quantity='" + quantity + '\'' +
-                ", quantityX='" + quantityX + '\'' +
-                ", quantityJ='" + quantityJ + '\'' +
-                ", assignNum='" + assignNum + '\'' +
-                ", assignNumX='" + assignNumX + '\'' +
-                ", assignNumJ='" + assignNumJ + '\'' +
-                ", scanNum='" + scanNum + '\'' +
-                ", scanNumX='" + scanNumX + '\'' +
-                ", scanNumJ='" + scanNumJ + '\'' +
-                ", printDate='" + printDate + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", price='" + price + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", unit='" + unit + '\'' +
-                ", spec='" + spec + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("createDate", getCreateDate())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("warehouseId", getWarehouseId())
+            .append("finishDate", getFinishDate())
+            .append("erpBill", getErpBill())
+            .append("stockSource", getStockSource())
+            .append("departmentNo", getDepartmentNo())
+            .append("classNo", getClassNo())
+            .append("supplierNo", getSupplierNo())
+            .append("supplierName", getSupplierName())
+            .append("simpleName", getSimpleName())
+            .append("contactName", getContactName())
+            .append("contactNumber", getContactNumber())
+            .append("address", getAddress())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("lotNo", getLotNo())
+            .append("quantity", getQuantity())
+            .append("quantityX", getQuantityX())
+            .append("quantityJ", getQuantityJ())
+            .append("assignNum", getAssignNum())
+            .append("assignNumX", getAssignNumX())
+            .append("assignNumJ", getAssignNumJ())
+            .append("scanNum", getScanNum())
+            .append("scanNumX", getScanNumX())
+            .append("scanNumJ", getScanNumJ())
+            .append("printDate", getPrintDate())
+            .append("stockStatus", getStockStatus())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
+            .append("warehouseName", getWarehouseName())
+            .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 4bcfba8..3f72368 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockinHistory.mapper;
 
-import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 
 /**
  * 入库单据历史Mapper接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
-public interface ViewStockinHistoryMapper
+public interface ViewStockinHistoryMapper 
 {
     /**
      * 查询入库单据历史
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 入库单据历史
      */
@@ -22,7 +21,7 @@ public interface ViewStockinHistoryMapper
 
     /**
      * 查询入库单据历史列表
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 入库单据历史集合
      */
@@ -30,7 +29,7 @@ public interface ViewStockinHistoryMapper
 
     /**
      * 新增入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ViewStockinHistoryMapper
 
     /**
      * 修改入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ViewStockinHistoryMapper
 
     /**
      * 删除入库单据历史
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ViewStockinHistoryMapper
 
     /**
      * 批量删除入库单据历史
-     *
+     * 
      * @param stockinGuids 需要删除的数据主键集合
      * @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 6d46f75..46c3e7a 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockinHistory.service;
 
-import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 
 /**
  * 入库单据历史Service接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
-public interface IViewStockinHistoryService
+public interface IViewStockinHistoryService 
 {
     /**
      * 查询入库单据历史
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 入库单据历史
      */
@@ -22,7 +21,7 @@ public interface IViewStockinHistoryService
 
     /**
      * 查询入库单据历史列表
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 入库单据历史集合
      */
@@ -30,7 +29,7 @@ public interface IViewStockinHistoryService
 
     /**
      * 新增入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface IViewStockinHistoryService
 
     /**
      * 修改入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface IViewStockinHistoryService
 
     /**
      * 批量删除入库单据历史
-     *
+     * 
      * @param stockinGuids 需要删除的入库单据历史主键集合
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface IViewStockinHistoryService
 
     /**
      * 删除入库单据历史信息
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 结果
      */
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 87fd195..d03b66d 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
@@ -1,29 +1,27 @@
 package com.ruoyi.search.ViewStockinHistory.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
-import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper;
-import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper;
+import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
+import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
 
 /**
  * 入库单据历史Service业务层处理
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
 @Service
-public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
+public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService 
 {
     @Autowired
     private ViewStockinHistoryMapper viewStockinHistoryMapper;
 
     /**
      * 查询入库单据历史
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 入库单据历史
      */
@@ -35,12 +33,11 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
 
     /**
      * 查询入库单据历史列表
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 入库单据历史
      */
     @Override
-    @DataScope(warehouseAlias = "vsh")
     public List<ViewStockinHistory> selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory)
     {
         return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory);
@@ -48,7 +45,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
 
     /**
      * 新增入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -60,7 +57,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
 
     /**
      * 修改入库单据历史
-     *
+     * 
      * @param viewStockinHistory 入库单据历史
      * @return 结果
      */
@@ -72,7 +69,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
 
     /**
      * 批量删除入库单据历史
-     *
+     * 
      * @param stockinGuids 需要删除的入库单据历史主键
      * @return 结果
      */
@@ -84,7 +81,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService
 
     /**
      * 删除入库单据历史信息
-     *
+     * 
      * @param stockinGuid 入库单据历史主键
      * @return 结果
      */
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 7668685..eed510c 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
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockoutHistory.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.ViewStockoutHistory.domain.ViewStockoutHistory;
 import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
-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-28
+ * @date 2025-09-19
  */
 @RestController
 @RequestMapping("/search/ViewStockoutHistory")
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 e94fe1a..2194983 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
@@ -1,428 +1,970 @@
 package com.ruoyi.search.ViewStockoutHistory.domain;
 
+import java.math.BigDecimal;
+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;
 
-import java.math.BigDecimal;
-
 /**
  * 出库单据历史对象 view_stockout_history
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
 public class ViewStockoutHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 出库单号 */
-//    @Excel(name = "${search.ViewStockoutHistory.stockoutId}")
+    @Excel(name = "出库单号")
     private String stockoutId;
 
-    /** 仓库ID */
-//    @Excel(name = "${search.ViewStockoutHistory.warehouseId}")
-    private String warehouseId;
-
     /** 出库类型 */
-//    @Excel(name = "${search.ViewStockoutHistory.outType}")
+    @Excel(name = "出库类型")
     private String outType;
 
     /** 创建日期 */
-//    @Excel(name = "${search.ViewStockoutHistory.createDate}")
+    @Excel(name = "创建日期")
     private String createDate;
 
     /** 创建人ID */
-//    @Excel(name = "${search.ViewStockoutHistory.createManId}")
+    @Excel(name = "创建人ID")
     private String createManId;
 
     /** 出库状态 */
-//    @Excel(name = "${search.ViewStockoutHistory.status}")
+    @Excel(name = "出库状态")
     private String status;
 
     /** 出库来源 */
-//    @Excel(name = "${search.ViewStockoutHistory.stockoutSource}")
+    @Excel(name = "出库来源")
     private String stockoutSource;
 
-
-
-    /** 出库明细ID */
-    @Excel(name = "${search.ViewStockoutHistory.stockoutDetailId}")
-    private String stockoutDetailId;
-
-    /** 产品ID */
-    @Excel(name = "${search.ViewStockoutHistory.productId}")
-    private String productId;
-
-    /** 产品名称 */
-    @Excel(name = "${search.ViewStockoutHistory.productName}")
-    private String productName;
-
-    /** 出口类型 */
-    @Excel(name = "${search.ViewStockoutHistory.exitId}")
+    /** 出口 */
+    @Excel(name = "出口")
     private String exitId;
 
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /** 出库明细ID */
+    @Excel(name = "出库明细ID")
+    private String stockoutDetailId;
+
     /** 批次号 */
-//    @Excel(name = "${search.ViewStockoutHistory.lotNo}")
+    @Excel(name = "批次号")
     private String lotNo;
 
     /** 出库数量 */
-    @Excel(name = "${search.ViewStockoutHistory.quantity}")
+    @Excel(name = "出库数量")
     private BigDecimal quantity;
 
     /** 分配数量 */
-    @Excel(name = "${search.ViewStockoutHistory.allotQuantity}")
+    @Excel(name = "分配数量")
     private BigDecimal allotQuantity;
 
     /** 分配编号 */
-    @Excel(name = "${search.ViewStockoutHistory.assignNum}")
+    @Excel(name = "分配编号")
     private BigDecimal assignNum;
 
     /** ERP出库单ID */
-//    @Excel(name = "${search.ViewStockoutHistory.erpStockoutId}")
+    @Excel(name = "ERP出库单ID")
     private String erpStockoutId;
 
     /** 客户编号 */
-//    @Excel(name = "${search.ViewStockoutHistory.entryid}")
+    @Excel(name = "客户编号")
     private String entryid;
 
     /** 客户名称 */
-    @Excel(name = "${search.ViewStockoutHistory.customerName}")
+    @Excel(name = "客户名称")
     private String customerName;
 
-    /** 规格 */
-//    @Excel(name = "${search.ViewStockoutHistory.spec}")
-    private String spec;
+    /** 物料主键 */
+    @Excel(name = "物料主键")
+    private String productGuid;
 
-    /** 单位 */
-    @Excel(name = "${search.ViewStockoutHistory.unit}")
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 产品分类 */
+    @Excel(name = "产品分类")
+    private String parentId;
+
+    /** 品号描述 */
+    @Excel(name = "品号描述")
+    private String price;
+
+    /** 英文描述 */
+    @Excel(name = "英文描述")
+    private String cargoNo;
+
+    /** 图号 */
+    @Excel(name = "图号")
     private String unit;
 
-    /** 英文名称 */
-    @Excel(name = "${search.ViewStockoutHistory.spare1}")
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
+
+    /** 型号 */
+    @Excel(name = "型号")
     private String spare1;
 
     /** 单件净重 */
-    @Excel(name = "${search.ViewStockoutHistory.spare2}")
+    @Excel(name = "单件净重")
     private String spare2;
 
-    /** 长MM */
-    @Excel(name = "${search.ViewStockoutHistory.spare5}")
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 电压 */
+    @Excel(name = "电压")
     private String spare5;
 
-    /** 宽MM */
-    @Excel(name = "${search.ViewStockoutHistory.spare6}")
+    /** 功率 */
+    @Excel(name = "功率")
     private String spare6;
 
-    /** 高MM */
-    @Excel(name = "${search.ViewStockoutHistory.spare7}")
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
+
+    /** 相位 */
+    @Excel(name = "相位")
     private String spare7;
 
-    /** 体积m³ */
-    @Excel(name = "${search.ViewStockoutHistory.spare8}")
+    /** 毛重 */
+    @Excel(name = "毛重")
     private String spare8;
-    /** 价格 */
-    @Excel(name = "${search.ViewStockoutHistory.price}")
-    private String price;
 
-    /** 备注 */
-    @Excel(name = "${search.ViewStockoutHistory.remark}")
-    private String remark;
+    /** NC号 */
+    @Excel(name = "NC号")
+    private String spare9;
 
-    public String getWarehouseId() {
-        return warehouseId;
-    }
+    /** 电源线 */
+    @Excel(name = "电源线")
+    private String spare10;
 
-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
+    /** 插头 */
+    @Excel(name = "插头")
+    private String spare11;
 
-    public String getPrice() {
-        return price;
-    }
+    /** 接嘴 */
+    @Excel(name = "接嘴")
+    private String spare12;
 
-    public void setPrice(String price) {
-        this.price = price;
-    }
+    /** 快捷码 */
+    @Excel(name = "快捷码")
+    private String spare13;
 
-    public String getSpare1() {
-        return spare1;
-    }
+    /** 库存单位编号 */
+    @Excel(name = "库存单位编号")
+    private String spare14;
 
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
+    /** 库存单位名称 */
+    @Excel(name = "库存单位名称")
+    private String spare15;
 
-    public String getSpare2() {
-        return spare2;
-    }
+    /** 品号群组 */
+    @Excel(name = "品号群组")
+    private String spare16;
 
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
+    /** 归类品 */
+    @Excel(name = "归类品")
+    private String spare17;
 
-    public String getSpare5() {
-        return spare5;
-    }
+    /** 计量体系 */
+    @Excel(name = "计量体系")
+    private String spare18;
 
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
+    /** 群组名称 */
+    @Excel(name = "群组名称")
+    private String spare19;
 
-    public String getSpare6() {
-        return spare6;
-    }
+    /** 批号管理 */
+    @Excel(name = "批号管理")
+    private String spare20;
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
+    /** 状态 */
+    @Excel(name = "状态")
+    private String spare21;
 
-    public String getSpare7() {
-        return spare7;
-    }
+    /** 产品大类 */
+    @Excel(name = "产品大类")
+    private String spare22;
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
+    /** 产品二类 */
+    @Excel(name = "产品二类")
+    private String spare23;
 
-    public String getSpare8() {
-        return spare8;
-    }
+    /** 产品线/产品系列 */
+    @Excel(name = "产品线/产品系列")
+    private String spare24;
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
+    /** BOM状态 */
+    @Excel(name = "BOM状态")
+    private String spare25;
 
-    @Override
-    public String getRemark() {
-        return remark;
-    }
+    /** 产品定位（组码 */
+    @Excel(name = "产品定位", readConverterExp = "产品定位（组码")
+    private String spare26;
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+    /** 电脑板型号（组码） */
+    @Excel(name = "电脑板型号", readConverterExp = "组=码")
+    private String spare27;
 
-    public void setStockoutId(String stockoutId)
+    /** 非标要求 */
+    @Excel(name = "非标要求")
+    private String spare28;
+
+    /** 品牌（组码） */
+    @Excel(name = "品牌", readConverterExp = "组=码")
+    private String spare29;
+
+    /** 非标颜色 */
+    @Excel(name = "非标颜色")
+    private String spare30;
+
+    /** 主颜色 */
+    @Excel(name = "主颜色")
+    private String spare31;
+
+    /** 辅助颜色 */
+    @Excel(name = "辅助颜色")
+    private String spare32;
+
+    /** 是否标准款（组码） */
+    @Excel(name = "是否标准款", readConverterExp = "组=码")
+    private String spare33;
+
+    /** 包装方式 */
+    @Excel(name = "包装方式")
+    private String spare34;
+
+    /** 主要包装方式 */
+    @Excel(name = "主要包装方式")
+    private String spare35;
+
+    /** 长 */
+    @Excel(name = "长")
+    private String spare36;
+
+    /** 宽 */
+    @Excel(name = "宽")
+    private String spare37;
+
+    /** 高 */
+    @Excel(name = "高")
+    private String spare38;
+
+    /** 包装材积 */
+    @Excel(name = "包装材积")
+    private String spare39;
+
+    public void setStockoutId(String stockoutId) 
     {
         this.stockoutId = stockoutId;
     }
 
-    public String getStockoutId()
+    public String getStockoutId() 
     {
         return stockoutId;
     }
 
-    public void setOutType(String outType)
+    public void setOutType(String outType) 
     {
         this.outType = outType;
     }
 
-    public String getOutType()
+    public String getOutType() 
     {
         return outType;
     }
 
-    public void setCreateDate(String createDate)
+    public void setCreateDate(String createDate) 
     {
         this.createDate = createDate;
     }
 
-    public String getCreateDate()
+    public String getCreateDate() 
     {
         return createDate;
     }
 
-    public void setCreateManId(String createManId)
+    public void setCreateManId(String createManId) 
     {
         this.createManId = createManId;
     }
 
-    public String getCreateManId()
+    public String getCreateManId() 
     {
         return createManId;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
 
-    public void setStockoutSource(String stockoutSource)
+    public void setStockoutSource(String stockoutSource) 
     {
         this.stockoutSource = stockoutSource;
     }
 
-    public String getStockoutSource()
+    public String getStockoutSource() 
     {
         return stockoutSource;
     }
 
-    public void setExitId(String exitId)
+    public void setExitId(String exitId) 
     {
         this.exitId = exitId;
     }
 
-    public String getExitId()
+    public String getExitId() 
     {
         return exitId;
     }
 
-    public void setStockoutDetailId(String stockoutDetailId)
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) 
     {
         this.stockoutDetailId = stockoutDetailId;
     }
 
-    public String getStockoutDetailId()
+    public String getStockoutDetailId() 
     {
         return stockoutDetailId;
     }
 
-    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 setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo()
+    public String getLotNo() 
     {
         return lotNo;
     }
 
-    public void setQuantity(BigDecimal quantity)
+    public void setQuantity(BigDecimal quantity) 
     {
         this.quantity = quantity;
     }
 
-    public BigDecimal getQuantity()
+    public BigDecimal getQuantity() 
     {
         return quantity;
     }
 
-    public void setAllotQuantity(BigDecimal allotQuantity)
+    public void setAllotQuantity(BigDecimal allotQuantity) 
     {
         this.allotQuantity = allotQuantity;
     }
 
-    public BigDecimal getAllotQuantity()
+    public BigDecimal getAllotQuantity() 
     {
         return allotQuantity;
     }
 
-    public void setAssignNum(BigDecimal assignNum)
+    public void setAssignNum(BigDecimal assignNum) 
     {
         this.assignNum = assignNum;
     }
 
-    public BigDecimal getAssignNum()
+    public BigDecimal getAssignNum() 
     {
         return assignNum;
     }
 
-    public void setErpStockoutId(String erpStockoutId)
+    public void setErpStockoutId(String erpStockoutId) 
     {
         this.erpStockoutId = erpStockoutId;
     }
 
-    public String getErpStockoutId()
+    public String getErpStockoutId() 
     {
         return erpStockoutId;
     }
 
-    public void setEntryid(String entryid)
+    public void setEntryid(String entryid) 
     {
         this.entryid = entryid;
     }
 
-    public String getEntryid()
+    public String getEntryid() 
     {
         return entryid;
     }
 
-    public void setCustomerName(String customerName)
+    public void setCustomerName(String customerName) 
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName()
+    public String getCustomerName() 
     {
         return customerName;
     }
 
-    public void setSpec(String spec)
+    public void setProductGuid(String productGuid) 
     {
-        this.spec = spec;
+        this.productGuid = productGuid;
     }
 
-    public String getSpec()
+    public String getProductGuid() 
     {
-        return spec;
+        return productGuid;
     }
 
-    public void setUnit(String unit)
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    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 setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setSpare9(String spare9) 
+    {
+        this.spare9 = spare9;
+    }
+
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    public void setSpare10(String spare10) 
+    {
+        this.spare10 = spare10;
+    }
+
+    public String getSpare10() 
+    {
+        return spare10;
+    }
+
+    public void setSpare11(String spare11) 
+    {
+        this.spare11 = spare11;
+    }
+
+    public String getSpare11() 
+    {
+        return spare11;
+    }
+
+    public void setSpare12(String spare12) 
+    {
+        this.spare12 = spare12;
+    }
+
+    public String getSpare12() 
+    {
+        return spare12;
+    }
+
+    public void setSpare13(String spare13) 
+    {
+        this.spare13 = spare13;
+    }
+
+    public String getSpare13() 
+    {
+        return spare13;
+    }
+
+    public void setSpare14(String spare14) 
+    {
+        this.spare14 = spare14;
+    }
+
+    public String getSpare14() 
+    {
+        return spare14;
+    }
+
+    public void setSpare15(String spare15) 
+    {
+        this.spare15 = spare15;
+    }
+
+    public String getSpare15() 
+    {
+        return spare15;
+    }
+
+    public void setSpare16(String spare16) 
+    {
+        this.spare16 = spare16;
+    }
+
+    public String getSpare16() 
+    {
+        return spare16;
+    }
+
+    public void setSpare17(String spare17) 
+    {
+        this.spare17 = spare17;
+    }
+
+    public String getSpare17() 
+    {
+        return spare17;
+    }
+
+    public void setSpare18(String spare18) 
+    {
+        this.spare18 = spare18;
+    }
+
+    public String getSpare18() 
+    {
+        return spare18;
+    }
+
+    public void setSpare19(String spare19) 
+    {
+        this.spare19 = spare19;
+    }
+
+    public String getSpare19() 
+    {
+        return spare19;
+    }
+
+    public void setSpare20(String spare20) 
+    {
+        this.spare20 = spare20;
+    }
+
+    public String getSpare20() 
+    {
+        return spare20;
+    }
+
+    public void setSpare21(String spare21) 
+    {
+        this.spare21 = spare21;
+    }
+
+    public String getSpare21() 
+    {
+        return spare21;
+    }
+
+    public void setSpare22(String spare22) 
+    {
+        this.spare22 = spare22;
+    }
+
+    public String getSpare22() 
+    {
+        return spare22;
+    }
+
+    public void setSpare23(String spare23) 
+    {
+        this.spare23 = spare23;
+    }
+
+    public String getSpare23() 
+    {
+        return spare23;
+    }
+
+    public void setSpare24(String spare24) 
+    {
+        this.spare24 = spare24;
+    }
+
+    public String getSpare24() 
+    {
+        return spare24;
+    }
+
+    public void setSpare25(String spare25) 
+    {
+        this.spare25 = spare25;
+    }
+
+    public String getSpare25() 
+    {
+        return spare25;
+    }
+
+    public void setSpare26(String spare26) 
+    {
+        this.spare26 = spare26;
+    }
+
+    public String getSpare26() 
+    {
+        return spare26;
+    }
+
+    public void setSpare27(String spare27) 
+    {
+        this.spare27 = spare27;
+    }
+
+    public String getSpare27() 
+    {
+        return spare27;
+    }
+
+    public void setSpare28(String spare28) 
+    {
+        this.spare28 = spare28;
+    }
+
+    public String getSpare28() 
+    {
+        return spare28;
+    }
+
+    public void setSpare29(String spare29) 
+    {
+        this.spare29 = spare29;
+    }
+
+    public String getSpare29() 
+    {
+        return spare29;
+    }
+
+    public void setSpare30(String spare30) 
+    {
+        this.spare30 = spare30;
+    }
+
+    public String getSpare30() 
+    {
+        return spare30;
+    }
+
+    public void setSpare31(String spare31) 
+    {
+        this.spare31 = spare31;
+    }
+
+    public String getSpare31() 
+    {
+        return spare31;
+    }
+
+    public void setSpare32(String spare32) 
+    {
+        this.spare32 = spare32;
+    }
+
+    public String getSpare32() 
+    {
+        return spare32;
+    }
+
+    public void setSpare33(String spare33) 
+    {
+        this.spare33 = spare33;
+    }
+
+    public String getSpare33() 
+    {
+        return spare33;
+    }
+
+    public void setSpare34(String spare34) 
+    {
+        this.spare34 = spare34;
+    }
+
+    public String getSpare34() 
+    {
+        return spare34;
+    }
+
+    public void setSpare35(String spare35) 
+    {
+        this.spare35 = spare35;
+    }
+
+    public String getSpare35() 
+    {
+        return spare35;
+    }
+
+    public void setSpare36(String spare36) 
+    {
+        this.spare36 = spare36;
+    }
+
+    public String getSpare36() 
+    {
+        return spare36;
+    }
+
+    public void setSpare37(String spare37) 
+    {
+        this.spare37 = spare37;
+    }
+
+    public String getSpare37() 
+    {
+        return spare37;
+    }
+
+    public void setSpare38(String spare38) 
+    {
+        this.spare38 = spare38;
+    }
+
+    public String getSpare38() 
+    {
+        return spare38;
+    }
+
+    public void setSpare39(String spare39) 
+    {
+        this.spare39 = spare39;
+    }
+
+    public String getSpare39() 
+    {
+        return spare39;
+    }
+
     @Override
     public String toString() {
-        return "ViewStockoutHistory{" +
-                "stockoutId='" + stockoutId + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", outType='" + outType + '\'' +
-                ", createDate='" + createDate + '\'' +
-                ", createManId='" + createManId + '\'' +
-                ", status='" + status + '\'' +
-                ", stockoutSource='" + stockoutSource + '\'' +
-                ", exitId='" + exitId + '\'' +
-                ", stockoutDetailId='" + stockoutDetailId + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", quantity=" + quantity +
-                ", allotQuantity=" + allotQuantity +
-                ", assignNum=" + assignNum +
-                ", erpStockoutId='" + erpStockoutId + '\'' +
-                ", entryid='" + entryid + '\'' +
-                ", customerName='" + customerName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", price='" + price + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
+        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("warehouseId", getWarehouseId())
+            .append("stockoutDetailId", getStockoutDetailId())
+            .append("lotNo", getLotNo())
+            .append("quantity", getQuantity())
+            .append("allotQuantity", getAllotQuantity())
+            .append("assignNum", getAssignNum())
+            .append("erpStockoutId", getErpStockoutId())
+            .append("entryid", getEntryid())
+            .append("customerName", getCustomerName())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("parentId", getParentId())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("remark", getRemark())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productName", getProductName())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("spare9", getSpare9())
+            .append("spare10", getSpare10())
+            .append("spare11", getSpare11())
+            .append("spare12", getSpare12())
+            .append("spare13", getSpare13())
+            .append("spare14", getSpare14())
+            .append("spare15", getSpare15())
+            .append("spare16", getSpare16())
+            .append("spare17", getSpare17())
+            .append("spare18", getSpare18())
+            .append("spare19", getSpare19())
+            .append("spare20", getSpare20())
+            .append("spare21", getSpare21())
+            .append("spare22", getSpare22())
+            .append("spare23", getSpare23())
+            .append("spare24", getSpare24())
+            .append("spare25", getSpare25())
+            .append("spare26", getSpare26())
+            .append("spare27", getSpare27())
+            .append("spare28", getSpare28())
+            .append("spare29", getSpare29())
+            .append("spare30", getSpare30())
+            .append("spare31", getSpare31())
+            .append("spare32", getSpare32())
+            .append("spare33", getSpare33())
+            .append("spare34", getSpare34())
+            .append("spare35", getSpare35())
+            .append("spare36", getSpare36())
+            .append("spare37", getSpare37())
+            .append("spare38", getSpare38())
+            .append("spare39", getSpare39())
+            .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 37c8cb9..501ffb2 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockoutHistory.mapper;
 
-import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 
 /**
  * 出库单据历史Mapper接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
-public interface ViewStockoutHistoryMapper
+public interface ViewStockoutHistoryMapper 
 {
     /**
      * 查询出库单据历史
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 出库单据历史
      */
@@ -22,7 +21,7 @@ public interface ViewStockoutHistoryMapper
 
     /**
      * 查询出库单据历史列表
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 出库单据历史集合
      */
@@ -30,7 +29,7 @@ public interface ViewStockoutHistoryMapper
 
     /**
      * 新增出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ViewStockoutHistoryMapper
 
     /**
      * 修改出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ViewStockoutHistoryMapper
 
     /**
      * 删除出库单据历史
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ViewStockoutHistoryMapper
 
     /**
      * 批量删除出库单据历史
-     *
+     * 
      * @param stockoutIds 需要删除的数据主键集合
      * @return 结果
      */
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 e4e1f08..56c4001 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
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockoutHistory.service;
 
-import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 
 /**
  * 出库单据历史Service接口
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
-public interface IViewStockoutHistoryService
+public interface IViewStockoutHistoryService 
 {
     /**
      * 查询出库单据历史
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 出库单据历史
      */
@@ -22,7 +21,7 @@ public interface IViewStockoutHistoryService
 
     /**
      * 查询出库单据历史列表
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 出库单据历史集合
      */
@@ -30,7 +29,7 @@ public interface IViewStockoutHistoryService
 
     /**
      * 新增出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface IViewStockoutHistoryService
 
     /**
      * 修改出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface IViewStockoutHistoryService
 
     /**
      * 批量删除出库单据历史
-     *
+     * 
      * @param stockoutIds 需要删除的出库单据历史主键集合
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface IViewStockoutHistoryService
 
     /**
      * 删除出库单据历史信息
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 结果
      */
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 adc6203..5bf1d8c 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
@@ -1,29 +1,27 @@
 package com.ruoyi.search.ViewStockoutHistory.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
-import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper;
-import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper;
+import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
+import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
 
 /**
  * 出库单据历史Service业务层处理
- *
+ * 
  * @author gw
- * @date 2025-05-28
+ * @date 2025-09-19
  */
 @Service
-public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService
+public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService 
 {
     @Autowired
     private ViewStockoutHistoryMapper viewStockoutHistoryMapper;
 
     /**
      * 查询出库单据历史
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 出库单据历史
      */
@@ -35,12 +33,11 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
 
     /**
      * 查询出库单据历史列表
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 出库单据历史
      */
     @Override
-    @DataScope(warehouseAlias = "vsh")
     public List<ViewStockoutHistory> selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory)
     {
         return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory);
@@ -48,7 +45,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
 
     /**
      * 新增出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -60,7 +57,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
 
     /**
      * 修改出库单据历史
-     *
+     * 
      * @param viewStockoutHistory 出库单据历史
      * @return 结果
      */
@@ -72,7 +69,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
 
     /**
      * 批量删除出库单据历史
-     *
+     * 
      * @param stockoutIds 需要删除的出库单据历史主键
      * @return 结果
      */
@@ -84,7 +81,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
 
     /**
      * 删除出库单据历史信息
-     *
+     * 
      * @param stockoutId 出库单据历史主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
index 6956a6e..5c0465e 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
@@ -15,12 +15,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="quantity"    column="quantity"    />
         <result property="price"    column="price"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="cargoNo"    column="cargo_no"    />
         <result property="spare1"    column="spare1"    />
         <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
         <result property="remark"    column="remark"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
@@ -29,23 +65,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectStockSummaryVo">
         SELECT
             <choose>
-                <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByRoadwayId != null and groupByRoadwayId or groupByPrice != null and groupByPrice or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8">
+                <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByPrice != null and groupByPrice or groupByParentId != null and groupByParentId or groupByCargoNo != null and groupByCargoNo or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupBySpare9 != null and groupBySpare9 or groupBySpare10 != null and groupBySpare10">
                     <if test="groupByProductId != null and groupByProductId">p.product_id,</if>
                     <if test="groupByProductName != null and groupByProductName">p.product_name,</if>
-                    <if test="groupByPrice != null and groupByPrice">p.price,</if>
-                    <if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
-                    <if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
-                    <if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
-                    <if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
-                    <if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
-                    <if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
                     <if test="groupBySpec != null and groupBySpec">p.spec,</if>
                     <if test="groupByUnit != null and groupByUnit">p.unit,</if>
+                    <if test="groupByPrice != null and groupByPrice">p.price,</if>
+                    <if test="groupByParentId != null and groupByParentId">p.parent_id,</if>
+                    <if test="groupByCargoNo != null and groupByCargoNo">p.cargo_no,</if>
+                    <if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
+                    <if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
+                    <if test="groupBySpare3 != null and groupBySpare3">p.spare3,</if>
+                    <if test="groupBySpare4 != null and groupBySpare4">p.spare4,</if>
+                    <if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
+                    <if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
+                    <if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
+                    <if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
+                    <if test="groupBySpare9 != null and groupBySpare9">p.spare9,</if>
+                    <if test="groupBySpare10 != null and groupBySpare10">p.spare10,</if>
                     <if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
                     <if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
                     <if test="groupByWarehouseId != null and groupByWarehouseId">bw.warehouse_name,</if>
                     <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
                     <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">bcs.cargo_space_name,</if>
+                    <if test="groupByRoadwayId != null and groupByRoadwayId">bcs.roadway_id,</if>
                     SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
                     FROM bas_stock s
                     LEFT JOIN bas_product p ON s.product_id = p.product_id
@@ -67,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
                         <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
                         <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{roadwayId}, '%')</if>
+                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
                         <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                             ${params.warehouseDataScope}
                         </if>
@@ -79,17 +122,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="groupBySpec != null and groupBySpec">,p.spec</if>
                         <if test="groupByUnit != null and groupByUnit">,p.unit</if>
                         <if test="groupByPrice != null and groupByPrice">,p.price</if>
+                        <if test="groupByParentId != null and groupByParentId">,p.parent_id</if>
+                        <if test="groupByCargoNo != null and groupByCargoNo">,p.cargo_no</if>
                         <if test="groupBySpare1 != null and groupBySpare1">,p.spare1</if>
                         <if test="groupBySpare2 != null and groupBySpare2">,p.spare2</if>
+                        <if test="groupBySpare3 != null and groupBySpare3">,p.spare3</if>
+                        <if test="groupBySpare4 != null and groupBySpare4">,p.spare4</if>
                         <if test="groupBySpare5 != null and groupBySpare5">,p.spare5</if>
                         <if test="groupBySpare6 != null and groupBySpare6">,p.spare6</if>
-                        <if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
                         <if test="groupBySpare7 != null and groupBySpare7">,p.spare7</if>
+                        <if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
+                        <if test="groupBySpare9 != null and groupBySpare9">,p.spare9</if>
+                        <if test="groupBySpare10 != null and groupBySpare10">,p.spare10</if>
+                        <if test="groupBySpare11 != null and groupBySpare11">,p.spare11</if>
+                        <if test="groupBySpare12 != null and groupBySpare12">,p.spare12</if>
+                        <if test="groupBySpare13 != null and groupBySpare13">,p.spare13</if>
+                        <if test="groupBySpare14 != null and groupBySpare14">,p.spare14</if>
+                        <if test="groupBySpare15 != null and groupBySpare15">,p.spare15</if>
+                        <if test="groupBySpare16 != null and groupBySpare16">,p.spare16</if>
+                        <if test="groupBySpare17 != null and groupBySpare17">,p.spare17</if>
+                        <if test="groupBySpare18 != null and groupBySpare18">,p.spare18</if>
+                        <if test="groupBySpare19 != null and groupBySpare19">,p.spare19</if>
+                        <if test="groupBySpare20 != null and groupBySpare20">,p.spare20</if>
+                        <if test="groupBySpare21 != null and groupBySpare21">,p.spare21</if>
+                        <if test="groupBySpare22 != null and groupBySpare22">,p.spare22</if>
+                        <if test="groupBySpare23 != null and groupBySpare23">,p.spare23</if>
+                        <if test="groupBySpare24 != null and groupBySpare24">,p.spare24</if>
+                        <if test="groupBySpare25 != null and groupBySpare25">,p.spare25</if>
+                        <if test="groupBySpare26 != null and groupBySpare26">,p.spare26</if>
+                        <if test="groupBySpare27 != null and groupBySpare27">,p.spare27</if>
+                        <if test="groupBySpare28 != null and groupBySpare28">,p.spare28</if>
+                        <if test="groupBySpare29 != null and groupBySpare29">,p.spare29</if>
+                        <if test="groupBySpare30 != null and groupBySpare30">,p.spare30</if>
+                        <if test="groupBySpare31 != null and groupBySpare31">,p.spare31</if>
+                        <if test="groupBySpare32 != null and groupBySpare32">,p.spare32</if>
+                        <if test="groupBySpare33 != null and groupBySpare33">,p.spare33</if>
+                        <if test="groupBySpare34 != null and groupBySpare34">,p.spare34</if>
+                        <if test="groupBySpare35 != null and groupBySpare35">,p.spare35</if>
+                        <if test="groupBySpare36 != null and groupBySpare36">,p.spare36</if>
+                        <if test="groupBySpare37 != null and groupBySpare37">,p.spare37</if>
+                        <if test="groupBySpare38 != null and groupBySpare38">,p.spare38</if>
+                        <if test="groupBySpare39 != null and groupBySpare39">,p.spare39</if>
                         <if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
                         <if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
                         <if test="groupByWarehouseId != null and groupByWarehouseId">,bw.warehouse_name</if>
                         <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
                         <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,bcs.cargo_space_name</if>
+                        <if test="groupByRoadwayId != null and groupByRoadwayId">,bcs.roadway_id</if>
                     </trim>
                 </when>
                 <otherwise>
@@ -104,16 +183,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
                         <if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
                         <if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
+                        <if test="parentId != null and parentId != ''"> AND p.parent_id like concat('%', #{parentId}, '%')</if>
+                        <if test="cargoNo != null and cargoNo != ''"> AND p.cargo_no like concat('%', #{cargoNo}, '%')</if>
                         <if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
                         <if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare3 != null and spare3 != ''"> AND p.spare3 like concat('%', #{spare3}, '%')</if>
+                        <if test="spare4 != null and spare4 != ''"> AND p.spare4 like concat('%', #{spare4}, '%')</if>
                         <if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
                         <if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
-                        <if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
                         <if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
-                        <if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
+                        <if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
+                        <if test="spare10 != null and spare10 != ''"> AND p.spare10 like concat('%', #{spare10}, '%')</if>
+                        <if test="spare11 != null and spare11 != ''"> AND p.spare11 like concat('%', #{spare11}, '%')</if>
+                        <if test="spare12 != null and spare12 != ''"> AND p.spare12 like concat('%', #{spare12}, '%')</if>
+                        <if test="spare13 != null and spare13 != ''"> AND p.spare13 like concat('%', #{spare13}, '%')</if>
+                        <if test="spare14 != null and spare14 != ''"> AND p.spare14 like concat('%', #{spare14}, '%')</if>
+                        <if test="spare15 != null and spare15 != ''"> AND p.spare15 like concat('%', #{spare15}, '%')</if>
+                        <if test="spare16 != null and spare16 != ''"> AND p.spare16 like concat('%', #{spare16}, '%')</if>
+                        <if test="spare17 != null and spare17 != ''"> AND p.spare17 like concat('%', #{spare17}, '%')</if>
+                        <if test="spare18 != null and spare18 != ''"> AND p.spare18 like concat('%', #{spare18}, '%')</if>
+                        <if test="spare19 != null and spare19 != ''"> AND p.spare19 like concat('%', #{spare19}, '%')</if>
+                        <if test="spare20 != null and spare20 != ''"> AND p.spare20 like concat('%', #{spare20}, '%')</if>
+                        <if test="spare21 != null and spare21 != ''"> AND p.spare21 like concat('%', #{spare21}, '%')</if>
+                        <if test="spare22 != null and spare22 != ''"> AND p.spare22 like concat('%', #{spare22}, '%')</if>
+                        <if test="spare23 != null and spare23 != ''"> AND p.spare23 like concat('%', #{spare23}, '%')</if>
+                        <if test="spare24 != null and spare24 != ''"> AND p.spare24 like concat('%', #{spare24}, '%')</if>
+                        <if test="spare25 != null and spare25 != ''"> AND p.spare25 like concat('%', #{spare25}, '%')</if>
+                        <if test="spare26 != null and spare26 != ''"> AND p.spare26 like concat('%', #{spare26}, '%')</if>
+                        <if test="spare27 != null and spare27 != ''"> AND p.spare27 like concat('%', #{spare27}, '%')</if>
+                        <if test="spare28 != null and spare28 != ''"> AND p.spare28 like concat('%', #{spare28}, '%')</if>
+                        <if test="spare29 != null and spare29 != ''"> AND p.spare29 like concat('%', #{spare29}, '%')</if>
+                        <if test="spare30 != null and spare30 != ''"> AND p.spare30 like concat('%', #{spare30}, '%')</if>
+                        <if test="spare31 != null and spare31 != ''"> AND p.spare31 like concat('%', #{spare31}, '%')</if>
+                        <if test="spare32 != null and spare32 != ''"> AND p.spare32 like concat('%', #{spare32}, '%')</if>
+                        <if test="spare33 != null and spare33 != ''"> AND p.spare33 like concat('%', #{spare33}, '%')</if>
+                        <if test="spare34 != null and spare34 != ''"> AND p.spare34 like concat('%', #{spare34}, '%')</if>
+                        <if test="spare35 != null and spare35 != ''"> AND p.spare35 like concat('%', #{spare35}, '%')</if>
+                        <if test="spare36 != null and spare36 != ''"> AND p.spare36 like concat('%', #{spare36}, '%')</if>
+                        <if test="spare37 != null and spare37 != ''"> AND p.spare37 like concat('%', #{spare37}, '%')</if>
+                        <if test="spare38 != null and spare38 != ''"> AND p.spare38 like concat('%', #{spare38}, '%')</if>
+                        <if test="spare39 != null and spare39 != ''"> AND p.spare39 like concat('%', #{spare39}, '%')</if>
+                        <if test="remark != null and remark != ''"> AND p.remark like concat('%', #{remark}, '%')</if>
                         <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
                         <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
-                        <if test="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id like concat('%', #{roadwayId}, '%')</if>
+                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
                         <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                             ${params.warehouseDataScope}
                         </if>
@@ -139,17 +253,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="price != null">price,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="cargoNo != null">cargo_no,</if>
             <if test="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
-            <if test="spare8 != null">spare8,</if>
             <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
             <if test="remark != null">remark,</if>
             <if test="lotNo != null">lot_no,</if>
             <if test="warehouseId != null">warehouse_id,</if>
-            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
             <if test="quantity != null">quantity,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -158,17 +307,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="price != null">#{price},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
             <if test="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
-            <if test="spare8 != null">#{spare8},</if>
             <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
             <if test="remark != null">#{remark},</if>
             <if test="lotNo != null">#{lotNo},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
             <if test="quantity != null">#{quantity},</if>
          </trim>
     </insert>
@@ -181,16 +365,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec = #{spec},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="price != null">price = #{price},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
             <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="remark != null">spare7 = #{remark},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
         </trim>
         where only_identity = #{onlyIdentity}
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index d2ec74b..8d9c2a3 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
-
+    
     <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
         <result property="jobId"    column="job_id"    />
         <result property="jobDetailId"    column="job_detail_id"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="executionPhase"    column="execution_phase"    />
         <result property="inOrOut"    column="in_or_out"    />
         <result property="entranceId"    column="entrance_id"    />
-        <result property="productId"    column="product_id"    />
+        <result property="wlbh"    column="wlbh"    />
         <result property="lotNo"    column="lot_no"    />
         <result property="stackingId"    column="stacking_id"    />
         <result property="stockStatus"    column="stock_status"    />
@@ -31,26 +31,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
         <result property="warehouseId"    column="warehouse_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <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="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_in_job_flow vijf
+        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
-        <where>
+        <where>  
             <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -66,10 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
             <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
             <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat('%', #{entranceId}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="wlbh != null  and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
             <if test="inQuantity != null  and inQuantity != ''"> and in_quantity like concat('%', #{inQuantity}, '%')</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>
@@ -77,22 +114,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null  and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
             <if test="finishTime != null  and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
         </where>
     </select>
-
+    
     <select id="selectViewInJobFlowByJobId" parameterType="String" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
         where job_id = #{jobId}
@@ -116,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">execution_phase,</if>
             <if test="inOrOut != null">in_or_out,</if>
             <if test="entranceId != null">entrance_id,</if>
-            <if test="productId != null">product_id,</if>
+            <if test="wlbh != null">wlbh,</if>
             <if test="lotNo != null">lot_no,</if>
             <if test="stackingId != null">stacking_id,</if>
             <if test="stockStatus != null">stock_status,</if>
@@ -127,17 +199,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time,</if>
             <if test="finishTime != null">finish_time,</if>
             <if test="warehouseId != null">warehouse_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</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="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -155,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">#{executionPhase},</if>
             <if test="inOrOut != null">#{inOrOut},</if>
             <if test="entranceId != null">#{entranceId},</if>
-            <if test="productId != null">#{productId},</if>
+            <if test="wlbh != null">#{wlbh},</if>
             <if test="lotNo != null">#{lotNo},</if>
             <if test="stackingId != null">#{stackingId},</if>
             <if test="stockStatus != null">#{stockStatus},</if>
@@ -166,17 +275,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">#{startTime},</if>
             <if test="finishTime != null">#{finishTime},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</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="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
          </trim>
     </insert>
 
@@ -197,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
             <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
             <if test="entranceId != null">entrance_id = #{entranceId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
+            <if test="wlbh != null">wlbh = #{wlbh},</if>
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
             <if test="stockStatus != null">stock_status = #{stockStatus},</if>
@@ -208,17 +354,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</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="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</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="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
         </trim>
         where job_id = #{jobId}
     </update>
@@ -228,9 +411,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewInJobFlowByJobIds" parameterType="String">
-        delete from view_in_job_flow where job_id in
+        delete from view_in_job_flow where job_id in 
         <foreach item="jobId" collection="array" open="(" separator="," close=")">
             #{jobId}
         </foreach>
     </delete>
-</mapper>
+</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 68079ee..ca55b40 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
-
+    
     <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
         <result property="jobId"    column="job_id"    />
         <result property="jobDetailId"    column="job_detail_id"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="executionPhase"    column="execution_phase"    />
         <result property="inOrOut"    column="in_or_out"    />
         <result property="exitId"    column="exit_id"    />
-        <result property="productId"    column="product_id"    />
+        <result property="wlbh"    column="wlbh"    />
         <result property="lotNo"    column="lot_no"    />
         <result property="stackingId"    column="stacking_id"    />
         <result property="stockStatus"    column="stock_status"    />
@@ -32,27 +32,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
         <result property="warehouseId"    column="warehouse_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="customerName"    column="customer_name"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <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="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
+        <result property="customerName"    column="customer_name"    />
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec,  unit, customer_name, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_out_job_flow vojf
+        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
-        <where>
+        <where>  
             <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
@@ -66,12 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
             <if test="priority != null "> and priority like concat('%', #{priority}, '%')</if>
             <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
+            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out = #{inOrOut}</if>
             <if test="exitId != null  and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="wlbh != null  and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
             <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
             <if test="giveNum != null  and giveNum != ''"> and give_num like concat('%', #{giveNum}, '%')</if>
             <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
@@ -80,23 +117,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null  and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
             <if test="finishTime != null  and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
         </where>
     </select>
-
+    
     <select id="selectViewOutJobFlowByJobId" parameterType="String" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
         where job_id = #{jobId}
@@ -120,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">execution_phase,</if>
             <if test="inOrOut != null">in_or_out,</if>
             <if test="exitId != null">exit_id,</if>
-            <if test="productId != null">product_id,</if>
+            <if test="wlbh != null">wlbh,</if>
             <if test="lotNo != null">lot_no,</if>
             <if test="stackingId != null">stacking_id,</if>
             <if test="stockStatus != null">stock_status,</if>
@@ -132,18 +204,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time,</if>
             <if test="finishTime != null">finish_time,</if>
             <if test="warehouseId != null">warehouse_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="customerName != null">customer_name,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</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="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+            <if test="customerName != null">customer_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -161,7 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">#{executionPhase},</if>
             <if test="inOrOut != null">#{inOrOut},</if>
             <if test="exitId != null">#{exitId},</if>
-            <if test="productId != null">#{productId},</if>
+            <if test="wlbh != null">#{wlbh},</if>
             <if test="lotNo != null">#{lotNo},</if>
             <if test="stackingId != null">#{stackingId},</if>
             <if test="stockStatus != null">#{stockStatus},</if>
@@ -173,18 +282,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">#{startTime},</if>
             <if test="finishTime != null">#{finishTime},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="customerName != null">#{customerName},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</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="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+            <if test="customerName != null">#{customerName},</if>
          </trim>
     </insert>
 
@@ -205,7 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
             <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
             <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
+            <if test="wlbh != null">wlbh = #{wlbh},</if>
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
             <if test="stockStatus != null">stock_status = #{stockStatus},</if>
@@ -217,18 +363,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</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="customerName != null">customer_name = #{customerName},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</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="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
         </trim>
         where job_id = #{jobId}
     </update>
@@ -238,9 +421,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewOutJobFlowByJobIds" parameterType="String">
-        delete from view_out_job_flow where job_id in
+        delete from view_out_job_flow where job_id in 
         <foreach item="jobId" collection="array" open="(" separator="," close=")">
             #{jobId}
         </foreach>
     </delete>
-</mapper>
+</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 2c9b805..1160bb2 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -38,46 +38,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
-        select only_identity,stock_status,product_status, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8,warehouse_name
-        from view_stock_detail vsd
+        SELECT 
+            ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity, 
+            s.stock_id, 
+            s.cargo_space_id, 
+            s.tray_code, 
+            s.quantity, 
+            s.job_id, 
+            s.lot_no, 
+            s.stockin_detail_id, 
+            s.in_date, 
+            s.warehouse_id, 
+            s.stacking_id, 
+            cs.cargo_space_name, 
+            cs.roadway_id, 
+            cs.status AS cargo_space_status, 
+            s.stock_status AS stock_status, 
+            s.product_status AS product_status, 
+            cs.locked, 
+            p.product_guid,
+            p.product_id,
+            p.product_name,
+            p.spec,
+            p.unit,
+            p.price,
+            p.spare1,
+            p.spare2,
+            p.spare5,
+            p.spare6,
+            p.spare7,
+            p.spare8,
+            p.remark,
+            bw.warehouse_name
+        FROM 
+            bas_stock s 
+            LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id 
+            LEFT JOIN bas_product p ON p.product_guid = s.product_guid 
+            LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id 
+        WHERE 
+            cs.status = '2'
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
-        <where>
-            <if test="onlyIdentity != null "> and only_identity = #{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="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</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="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
-            <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cargo_space_status like concat('%', #{cargoSpaceStatus}, '%')</if>
-            <if test="locked != null  and locked != ''"> and locked like concat('%', #{locked}, '%')</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 like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</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="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
+        <if test="stockId != null  and stockId != ''"> and s.stock_id = #{stockId}</if>
+        <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and s.cargo_space_id = #{cargoSpaceId}</if>
+        <if test="trayCode != null  and trayCode != ''"> and s.tray_code = #{trayCode}</if>
+        <if test="quantity != null  and quantity != ''"> and s.quantity = #{quantity}</if>
+        <if test="jobId != null  and jobId != ''"> and s.job_id = #{jobId}</if>
+        <if test="lotNo != null  and lotNo != ''"> and s.lot_no = #{lotNo}</if>
+        <if test="stockinDetailId != null  and stockinDetailId != ''"> and s.stockin_detail_id = #{stockinDetailId}</if>
+        <if test="inDate != null  and inDate != ''"> and s.in_date = #{inDate}</if>
+        <if test="warehouseId != null  and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if>
+        <if test="warehouseName != null  and warehouseName != ''"> and bw.warehouse_name like concat('%', #{warehouseName}, '%')</if>
+        <if test="stackingId != null  and stackingId != ''"> and s.stacking_id = #{stackingId}</if>
+        <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cs.cargo_space_name = #{cargoSpaceName}</if>
+        <if test="roadwayId != null  and roadwayId != ''"> and cs.roadway_id = #{roadwayId}</if>
+        <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cs.status = #{cargoSpaceStatus}</if>
+        <if test="stockStatus != null  and stockStatus != ''"> and s.stock_status = #{stockStatus}</if>
+        <if test="productStatus != null  and productStatus != ''"> and s.product_status = #{productStatus}</if>
+        <if test="locked != null  and locked != ''"> and cs.locked = #{locked}</if>
+        <if test="productId != null  and productId != ''"> and p.product_id = #{productId}</if>
+        <if test="productName != null  and productName != ''"> and p.product_name like concat('%', #{productName}, '%')</if>
+        <if test="spec != null  and spec != ''"> and p.spec = #{spec}</if>
+        <if test="unit != null  and unit != ''"> and p.unit = #{unit}</if>
+        <if test="price != null  and price != ''"> and p.price = #{price}</if>
+        <if test="spare1 != null  and spare1 != ''"> and p.spare1 = #{spare1}</if>
+        <if test="spare2 != null  and spare2 != ''"> and p.spare2 = #{spare2}</if>
+        <if test="spare5 != null  and spare5 != ''"> and p.spare5 = #{spare5}</if>
+        <if test="spare6 != null  and spare6 != ''"> and p.spare6 = #{spare6}</if>
+        <if test="spare7 != null  and spare7 != ''"> and p.spare7 = #{spare7}</if>
+        <if test="spare8 != null  and spare8 != ''"> and p.spare8 = #{spare8}</if>
+        <if test="remark != null  and remark != ''"> and p.remark = #{remark}</if>
     </select>
 
     <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
index 8c2fd14..3c958a5 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
@@ -23,29 +22,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inClassId"    column="in_class_id"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productId"    column="product_id"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="address"    column="address"    />
         <result property="cDesc"    column="c_desc"    />
         <result property="warehouseKind"    column="warehouse_kind"    />
         <result property="warehouseType"    column="warehouse_type"    />
         <result property="isCurrent"    column="is_current"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <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="enName"    column="enName"    />
-        <result property="weight"    column="weight"    />
-        <result property="longMM"    column="longMM"    />
-        <result property="wide"    column="wide"    />
-        <result property="hight"    column="hight"    />
-        <result property="volume"    column="volume"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
         <result property="productName"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -65,69 +95,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockSecureVo">
-        select 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, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
     </sql>
 
     <select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
         <include refid="selectViewStockSecureVo"/>
         <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="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 = #{stockStatus}</if>
             <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
-            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="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 like concat('%', #{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 = #{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="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%',#{productId}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc = #{cDesc}</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
             <if test="isCurrent != null  and isCurrent != ''"> and is_current = #{isCurrent}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="enName != null  and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
-            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
-            <if test="longMM != null  and longMM != ''"> and longMM = #{longMM}</if>
-            <if test="wide != null  and wide != ''"> and wide = #{wide}</if>
-            <if test="hight != null  and hight != ''"> and hight = #{hight}</if>
-            <if test="volume != null  and volume != ''"> and volume = #{volume}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
-            <if test="theType != null  and theType != ''"> and the_type = #{theType}</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
             <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
+            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
             <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
             <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double = #{issDouble}</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding = #{groupCoding}</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
         </where>
     </select>
     
@@ -146,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">lot_no,</if>
             <if test="inDate != null">in_date,</if>
             <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
             <if test="quantity != null">quantity,</if>
             <if test="jobId != null">job_id,</if>
             <if test="trayCode != null">tray_code,</if>
@@ -157,29 +216,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">in_class_id,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
             <if test="warehouseName != null">warehouse_name,</if>
             <if test="address != null">address,</if>
             <if test="cDesc != null">c_desc,</if>
             <if test="warehouseKind != null">warehouse_kind,</if>
             <if test="warehouseType != null">warehouse_type,</if>
             <if test="isCurrent != null">is_current,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</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="enName != null">enName,</if>
-            <if test="weight != null">weight,</if>
-            <if test="longMM != null">longMM,</if>
-            <if test="wide != null">wide,</if>
-            <if test="hight != null">hight,</if>
-            <if test="volume != null">volume,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
             <if test="productName != null">product_name,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -205,7 +295,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">#{lotNo},</if>
             <if test="inDate != null">#{inDate},</if>
             <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="jobId != null">#{jobId},</if>
             <if test="trayCode != null">#{trayCode},</if>
@@ -216,29 +305,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">#{inClassId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
             <if test="warehouseName != null">#{warehouseName},</if>
             <if test="address != null">#{address},</if>
             <if test="cDesc != null">#{cDesc},</if>
             <if test="warehouseKind != null">#{warehouseKind},</if>
             <if test="warehouseType != null">#{warehouseType},</if>
             <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</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="enName != null">#{enName},</if>
-            <if test="weight != null">#{weight},</if>
-            <if test="longMM != null">#{longMM},</if>
-            <if test="wide != null">#{wide},</if>
-            <if test="hight != null">#{hight},</if>
-            <if test="volume != null">#{volume},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
             <if test="productName != null">#{productName},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -267,7 +387,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="inDate != null">in_date = #{inDate},</if>
             <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="jobId != null">job_id = #{jobId},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
@@ -278,29 +397,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">in_class_id = #{inClassId},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
             <if test="address != null">address = #{address},</if>
             <if test="cDesc != null">c_desc = #{cDesc},</if>
             <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
             <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
             <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</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="enName != null">enName = #{enName},</if>
-            <if test="weight != null">weight = #{weight},</if>
-            <if test="longMM != null">longMM = #{longMM},</if>
-            <if test="wide != null">wide = #{wide},</if>
-            <if test="hight != null">hight = #{hight},</if>
-            <if test="volume != null">volume = #{volume},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
             <if test="productName != null">product_name = #{productName},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
index d0e8329..abea5e6 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
@@ -23,29 +22,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inClassId"    column="in_class_id"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productId"    column="product_id"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="address"    column="address"    />
         <result property="cDesc"    column="c_desc"    />
         <result property="warehouseKind"    column="warehouse_kind"    />
         <result property="warehouseType"    column="warehouse_type"    />
         <result property="isCurrent"    column="is_current"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <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="enName"    column="enName"    />
-        <result property="weight"    column="weight"    />
-        <result property="longMM"    column="longMM"    />
-        <result property="wide"    column="wide"    />
-        <result property="hight"    column="hight"    />
-        <result property="volume"    column="volume"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
         <result property="productName"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -65,69 +95,99 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockWarningVo">
-        select 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, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
     </sql>
 
     <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
         <include refid="selectViewStockWarningVo"/>
         <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="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 = #{stockStatus}</if>
             <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
-            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="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 like concat('%', #{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 = #{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="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc = #{cDesc}</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current = #{isCurrent}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
-            <if test="enName != null  and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
-            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
-            <if test="longMM != null  and longMM != ''"> and longMM = #{longMM}</if>
-            <if test="wide != null  and wide != ''"> and wide = #{wide}</if>
-            <if test="hight != null  and hight != ''"> and hight = #{hight}</if>
-            <if test="volume != null  and volume != ''"> and volume = #{volume}</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
-            <if test="theType != null  and theType != ''"> and the_type = #{theType}</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
             <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
+            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
             <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
             <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double = #{issDouble}</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding = #{groupCoding}</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
         </where>
     </select>
     
@@ -146,7 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">lot_no,</if>
             <if test="inDate != null">in_date,</if>
             <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
             <if test="quantity != null">quantity,</if>
             <if test="jobId != null">job_id,</if>
             <if test="trayCode != null">tray_code,</if>
@@ -157,29 +216,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">in_class_id,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productId != null">product_id,</if>
             <if test="warehouseName != null">warehouse_name,</if>
             <if test="address != null">address,</if>
             <if test="cDesc != null">c_desc,</if>
             <if test="warehouseKind != null">warehouse_kind,</if>
             <if test="warehouseType != null">warehouse_type,</if>
             <if test="isCurrent != null">is_current,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</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="enName != null">enName,</if>
-            <if test="weight != null">weight,</if>
-            <if test="longMM != null">longMM,</if>
-            <if test="wide != null">wide,</if>
-            <if test="hight != null">hight,</if>
-            <if test="volume != null">volume,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
             <if test="productName != null">product_name,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -205,7 +295,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">#{lotNo},</if>
             <if test="inDate != null">#{inDate},</if>
             <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="jobId != null">#{jobId},</if>
             <if test="trayCode != null">#{trayCode},</if>
@@ -216,29 +305,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">#{inClassId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productId != null">#{productId},</if>
             <if test="warehouseName != null">#{warehouseName},</if>
             <if test="address != null">#{address},</if>
             <if test="cDesc != null">#{cDesc},</if>
             <if test="warehouseKind != null">#{warehouseKind},</if>
             <if test="warehouseType != null">#{warehouseType},</if>
             <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</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="enName != null">#{enName},</if>
-            <if test="weight != null">#{weight},</if>
-            <if test="longMM != null">#{longMM},</if>
-            <if test="wide != null">#{wide},</if>
-            <if test="hight != null">#{hight},</if>
-            <if test="volume != null">#{volume},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
             <if test="productName != null">#{productName},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -267,7 +387,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="inDate != null">in_date = #{inDate},</if>
             <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="jobId != null">job_id = #{jobId},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
@@ -278,29 +397,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inClassId != null">in_class_id = #{inClassId},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productId != null">product_id = #{productId},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
             <if test="address != null">address = #{address},</if>
             <if test="cDesc != null">c_desc = #{cDesc},</if>
             <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
             <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
             <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</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="enName != null">enName = #{enName},</if>
-            <if test="weight != null">weight = #{weight},</if>
-            <if test="longMM != null">longMM = #{longMM},</if>
-            <if test="wide != null">wide = #{wide},</if>
-            <if test="hight != null">hight = #{hight},</if>
-            <if test="volume != null">volume = #{volume},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
             <if test="productName != null">product_name = #{productName},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
index 2f2f2fe..7f32e02 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper">
-
+    
     <resultMap type="ViewStockinHistory" id="ViewStockinHistoryResult">
         <result property="stockinGuid"    column="stockin_guid"    />
         <result property="stockinId"    column="stockin_id"    />
@@ -36,27 +36,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scanNumJ"    column="scan_num_j"    />
         <result property="printDate"    column="print_date"    />
         <result property="stockStatus"    column="stock_status"    />
-        <result property="price"    column="price"    />
-        <result property="remark"    column="remark"    />
+        <result property="productGuid"    column="product_guid"    />
         <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
+        <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="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
+        <result property="warehouseName"    column="warehouse_name"    />
     </resultMap>
 
     <sql id="selectViewStockinHistoryVo">
-        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name,  unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history vsh
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, warehouse_name from view_stockin_history
     </sql>
 
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
         <include refid="selectViewStockinHistoryVo"/>
-        <where>
+        <where>  
             <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat('%', #{stockinGuid}, '%')</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>
@@ -80,32 +117,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
             <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat('%', #{quantityX}, '%')</if>
             <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat('%', #{quantityJ}, '%')</if>
-            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
-            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
-            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
-            <if test="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
-            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
-            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat('%', #{assignNum}, '%')</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat('%', #{assignNumX}, '%')</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat('%', #{assignNumJ}, '%')</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat('%', #{scanNum}, '%')</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat('%', #{scanNumX}, '%')</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat('%', #{scanNumJ}, '%')</if>
             <if test="printDate != null  and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
             <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</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 like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
             <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
         </where>
     </select>
-
+    
     <select id="selectViewStockinHistoryByStockinGuid" parameterType="String" resultMap="ViewStockinHistoryResult">
         <include refid="selectViewStockinHistoryVo"/>
         where stockin_guid = #{stockinGuid}
@@ -145,18 +216,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumJ != null">scan_num_j,</if>
             <if test="printDate != null">print_date,</if>
             <if test="stockStatus != null">stock_status,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
+            <if test="productGuid != null">product_guid,</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="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
@@ -190,18 +298,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumJ != null">#{scanNumJ},</if>
             <if test="printDate != null">#{printDate},</if>
             <if test="stockStatus != null">#{stockStatus},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
+            <if test="productGuid != null">#{productGuid},</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="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
          </trim>
     </insert>
 
@@ -238,18 +383,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
             <if test="printDate != null">print_date = #{printDate},</if>
             <if test="stockStatus != null">stock_status = #{stockStatus},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</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="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
         </trim>
         where stockin_guid = #{stockinGuid}
     </update>
@@ -259,9 +441,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewStockinHistoryByStockinGuids" parameterType="String">
-        delete from view_stockin_history where stockin_guid in
+        delete from view_stockin_history where stockin_guid in 
         <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
             #{stockinGuid}
         </foreach>
     </delete>
-</mapper>
+</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 a9dd0da..5617d8e 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
@@ -3,19 +3,17 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper">
-
+    
     <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
         <result property="stockoutId"    column="stockout_id"    />
-        <result property="warehouseId"    column="warehouse_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="warehouseId"    column="warehouse_id"    />
         <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
         <result property="lotNo"    column="lot_no"    />
         <result property="quantity"    column="quantity"    />
         <result property="allotQuantity"    column="allot_quantity"    />
@@ -23,36 +21,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpStockoutId"    column="erp_stockout_id"    />
         <result property="entryid"    column="entryid"    />
         <result property="customerName"    column="customer_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <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="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
     </resultMap>
 
     <sql id="selectViewStockoutHistoryVo">
-        select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history vsh
+        select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id, stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
-        <where>
+        <where>  
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
             <if test="outType != null  and outType != ''"> and out_type = #{outType}</if>
             <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
             <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat('%', #{stockoutSource}, '%')</if>
             <if test="exitId != null  and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
             <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</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="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="quantity != null "> and quantity like concat('%', #{quantity}, '%')</if>
             <if test="allotQuantity != null "> and allot_quantity like concat('%', #{allotQuantity}, '%')</if>
@@ -60,21 +94,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat('%', #{erpStockoutId}, '%')</if>
             <if test="entryid != null  and entryid != ''"> and entryid like concat('%', #{entryid}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
         </where>
     </select>
-
+    
     <select id="selectViewStockoutHistoryByStockoutId" parameterType="String" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         where stockout_id = #{stockoutId}
@@ -84,15 +154,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into view_stockout_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null">out_type,</if>
-            <if test="createDate != null">create_date,</if>
+            <if test="outType != null and outType != ''">out_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
             <if test="createManId != null">create_man_id,</if>
-            <if test="status != null">status,</if>
+            <if test="status != null and status != ''">status,</if>
             <if test="stockoutSource != null">stockout_source,</if>
             <if test="exitId != null">exit_id,</if>
-            <if test="stockoutDetailId != null">stockout_detail_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
             <if test="lotNo != null">lot_no,</if>
             <if test="quantity != null">quantity,</if>
             <if test="allotQuantity != null">allot_quantity,</if>
@@ -100,28 +169,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id,</if>
             <if test="entryid != null">entryid,</if>
             <if test="customerName != null">customer_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</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="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null">#{outType},</if>
-            <if test="createDate != null">#{createDate},</if>
+            <if test="outType != null and outType != ''">#{outType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
             <if test="createManId != null">#{createManId},</if>
-            <if test="status != null">#{status},</if>
+            <if test="status != null and status != ''">#{status},</if>
             <if test="stockoutSource != null">#{stockoutSource},</if>
             <if test="exitId != null">#{exitId},</if>
-            <if test="stockoutDetailId != null">#{stockoutDetailId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
             <if test="lotNo != null">#{lotNo},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="allotQuantity != null">#{allotQuantity},</if>
@@ -129,31 +235,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">#{erpStockoutId},</if>
             <if test="entryid != null">#{entryid},</if>
             <if test="customerName != null">#{customerName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</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="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
          </trim>
     </insert>
 
     <update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
         update view_stockout_history
         <trim prefix="SET" suffixOverrides=",">
-            <if test="outType != null">out_type = #{outType},</if>
-            <if test="createDate != null">create_date = #{createDate},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
             <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null">status = #{status},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
             <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
             <if test="exitId != null">exit_id = #{exitId},</if>
-            <if test="stockoutDetailId != null">stockout_detail_id = #{stockoutDetailId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
             <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
@@ -161,16 +304,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
             <if test="entryid != null">entryid = #{entryid},</if>
             <if test="customerName != null">customer_name = #{customerName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</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="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
         </trim>
         where stockout_id = #{stockoutId}
     </update>
@@ -180,9 +361,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewStockoutHistoryByStockoutIds" parameterType="String">
-        delete from view_stockout_history where stockout_id in
+        delete from view_stockout_history where stockout_id in 
         <foreach item="stockoutId" collection="array" open="(" separator="," close=")">
             #{stockoutId}
         </foreach>
     </delete>
-</mapper>
+</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 3e6af4c..ace8294 100644
--- a/ruoyi-ui/src/api/search/ViewInJobFlow.js
+++ b/ruoyi-ui/src/api/search/ViewInJobFlow.js
@@ -1,11 +1,5 @@
 import request from '@/utils/request'
-// 查询仓库列表
-export function warehouseList() {
-  return request({
-    url: '/bas/warehouse/list',
-    method: 'get'
-  })
-}
+
 // 查询入库作业流水列表
 export function listViewInJobFlow(query) {
   return request({
diff --git a/ruoyi-ui/src/api/search/ViewOutJobFlow.js b/ruoyi-ui/src/api/search/ViewOutJobFlow.js
index f7bb823..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'
 
-// 查询出库做业流水列表
+// 查询出库作业流水列表
 export function listViewOutJobFlow(query) {
   return request({
     url: '/search/ViewOutJobFlow/list',
@@ -9,7 +9,7 @@ export function listViewOutJobFlow(query) {
   })
 }
 
-// 查询出库做业流水详细
+// 查询出库作业流水详细
 export function getViewOutJobFlow(jobId) {
   return request({
     url: '/search/ViewOutJobFlow/' + jobId,
@@ -17,7 +17,7 @@ export function getViewOutJobFlow(jobId) {
   })
 }
 
-// 新增出库做业流水
+// 新增出库作业流水
 export function addViewOutJobFlow(data) {
   return request({
     url: '/search/ViewOutJobFlow',
@@ -26,7 +26,7 @@ export function addViewOutJobFlow(data) {
   })
 }
 
-// 修改出库做业流水
+// 修改出库作业流水
 export function updateViewOutJobFlow(data) {
   return request({
     url: '/search/ViewOutJobFlow',
@@ -35,7 +35,7 @@ export function updateViewOutJobFlow(data) {
   })
 }
 
-// 删除出库做业流水
+// 删除出库作业流水
 export function delViewOutJobFlow(jobId) {
   return request({
     url: '/search/ViewOutJobFlow/' + jobId,
diff --git a/ruoyi-ui/src/api/search/ViewStockWarning.js b/ruoyi-ui/src/api/search/ViewStockWarning.js
index fa9f4d3..025d4e4 100644
--- a/ruoyi-ui/src/api/search/ViewStockWarning.js
+++ b/ruoyi-ui/src/api/search/ViewStockWarning.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询库存预警报表列表
+// 查询库存预警查询列表
 export function listViewStockWarning(query) {
   return request({
     url: '/search/ViewStockWarning/list',
@@ -9,7 +9,7 @@ export function listViewStockWarning(query) {
   })
 }
 
-// 查询库存预警报表详细
+// 查询库存预警查询详细
 export function getViewStockWarning(stockId) {
   return request({
     url: '/search/ViewStockWarning/' + stockId,
@@ -17,7 +17,7 @@ export function getViewStockWarning(stockId) {
   })
 }
 
-// 新增库存预警报表
+// 新增库存预警查询
 export function addViewStockWarning(data) {
   return request({
     url: '/search/ViewStockWarning',
@@ -26,7 +26,7 @@ export function addViewStockWarning(data) {
   })
 }
 
-// 修改库存预警报表
+// 修改库存预警查询
 export function updateViewStockWarning(data) {
   return request({
     url: '/search/ViewStockWarning',
@@ -35,7 +35,7 @@ export function updateViewStockWarning(data) {
   })
 }
 
-// 删除库存预警报表
+// 删除库存预警查询
 export function delViewStockWarning(stockId) {
   return request({
     url: '/search/ViewStockWarning/' + stockId,
diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue
index e26bf19..8163bef 100644
--- a/ruoyi-ui/src/views/search/StockSummary/index.vue
+++ b/ruoyi-ui/src/views/search/StockSummary/index.vue
@@ -3,26 +3,60 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="分组选项">
         <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
-          <el-checkbox label="productId">物料编号(SKU)</el-checkbox>
-          <el-checkbox label="productName">物料名称</el-checkbox>
-<!--          <el-checkbox label="spec">规格</el-checkbox>-->
-          <el-checkbox label="unit">单位</el-checkbox>
-<!--          <el-checkbox label="lotNo">批号</el-checkbox>-->
-          <el-checkbox label="warehouseId">仓库名称</el-checkbox>
-<!--          <el-checkbox label="roadwayId">巷道</el-checkbox>-->
-          <el-checkbox label="cargoSpaceId">货位号</el-checkbox>
-          <el-checkbox label="price">单价(元)</el-checkbox>
-          <el-checkbox label="spare1">英文名称</el-checkbox>
-          <el-checkbox label="spare2">单件净重(kg)</el-checkbox>
-          <el-checkbox label="spare5">长度(mm)</el-checkbox>
-          <el-checkbox label="spare6">宽度(mm)</el-checkbox>
-          <el-checkbox label="spare7">高度(mm)</el-checkbox>
-          <el-checkbox label="spare8">体积(m³)</el-checkbox>
+          <el-checkbox label="productId">品号</el-checkbox>
+          <el-checkbox label="productName">品名</el-checkbox>
+          <!-- <el-checkbox label="unit">单位</el-checkbox> -->
+          <!-- <el-checkbox label="warehouseId">仓库</el-checkbox> -->
+          <el-checkbox label="roadwayId">巷道</el-checkbox>
+          <el-checkbox label="cargoSpaceId">货位</el-checkbox>
+          <el-checkbox label="price">品号描述</el-checkbox>
+          <el-checkbox label="spec">规格</el-checkbox>
+          <!-- <el-checkbox label="parentId">产品分类</el-checkbox> -->
+          <el-checkbox label="cargoNo">英文描述</el-checkbox>
+          <!-- <el-checkbox label="spare1">型号</el-checkbox> -->
+          <el-checkbox label="spare2">单件净重</el-checkbox>
+          <!-- <el-checkbox label="spare3">颜色</el-checkbox> -->
+          <!-- <el-checkbox label="spare4">序列号</el-checkbox> -->
+          <!-- <el-checkbox label="spare5">电压</el-checkbox> -->
+          <!-- <el-checkbox label="spare6">功率</el-checkbox> -->
+          <!-- <el-checkbox label="spare7">相位</el-checkbox> -->
+          <!-- <el-checkbox label="spare8">毛重</el-checkbox> -->
+          <el-checkbox label="spare9">NC号</el-checkbox>
+          <el-checkbox label="spare10">电源线</el-checkbox>
+          <el-checkbox label="spare11">插头</el-checkbox>
+          <el-checkbox label="spare12">接嘴</el-checkbox>
+          <el-checkbox label="spare13">快捷码</el-checkbox>
+          <el-checkbox label="spare14">库存单位编号</el-checkbox>
+          <el-checkbox label="spare15">库存单位名称</el-checkbox>
+          <el-checkbox label="spare16">品号群组</el-checkbox>
+          <el-checkbox label="spare17">归类品</el-checkbox>
+          <el-checkbox label="spare18">计量体系</el-checkbox>
+          <el-checkbox label="spare19">群组名称</el-checkbox>
+          <el-checkbox label="spare20">批号管理</el-checkbox>
+          <el-checkbox label="spare21">状态</el-checkbox>
+          <el-checkbox label="spare22">产品大类</el-checkbox>
+          <el-checkbox label="spare23">产品二类</el-checkbox>
+          <el-checkbox label="spare24">产品线/产品系列</el-checkbox>
+          <el-checkbox label="spare25">BOM状态</el-checkbox>
+          <el-checkbox label="spare26">产品定位</el-checkbox>
+          <el-checkbox label="spare27">电脑板型号</el-checkbox>
+          <el-checkbox label="spare28">非标要求</el-checkbox>
+          <el-checkbox label="spare29">品牌</el-checkbox>
+          <el-checkbox label="spare30">非标颜色</el-checkbox>
+          <el-checkbox label="spare31">主颜色</el-checkbox>
+          <el-checkbox label="spare32">辅助颜色</el-checkbox>
+          <el-checkbox label="spare33">是否标准款</el-checkbox>
+          <el-checkbox label="spare34">包装方式</el-checkbox>
+          <el-checkbox label="spare35">主要包装方式</el-checkbox>
+          <el-checkbox label="spare36">长</el-checkbox>
+          <el-checkbox label="spare37">宽</el-checkbox>
+          <el-checkbox label="spare38">高</el-checkbox>
+          <el-checkbox label="spare39">包装材积</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <br>
-      <el-form-item label="仓库名称" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
+      <!-- <el-form-item label="仓库" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
           <el-option
             v-for="dict in warehouseOptions"
             :key="dict.warehouseId"
@@ -30,11 +64,19 @@
             :value="dict.warehouseId"
           />
         </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="productId">
+      <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号(SKU)"
+          placeholder="请输入物料编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -47,26 +89,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="规格" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="货位编号" prop="cargoSpaceId">
+      <el-form-item label="NC号" prop="spare9">
+        <el-input
+          v-model="queryParams.spare9"
+          placeholder="请输入NC号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位" prop="cargoSpaceId">
         <el-input
           v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位号"
+          placeholder="请输入货位"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -98,19 +132,54 @@
       max-height="650"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="物料编号(SKU)" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
-      <el-table-column label="单位" align="left" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" />
-      <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
-      <el-table-column label="货位号" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
-      <el-table-column label="数量(件)" align="right" prop="quantity" width="120" />
-      <el-table-column label="英文名称" align="left" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" />
-      <el-table-column label="单件净重(kg)" align="right" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" />
-      <el-table-column label="长度(mm)" align="right" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" />
-      <el-table-column label="宽度(mm)" align="right" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" />
-      <el-table-column label="高度(mm)" align="right" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" />
-      <el-table-column label="体积(m³)" align="right" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" />
-      <el-table-column label="单价(元)" align="right" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
+      <el-table-column label="物料编码" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
+      <el-table-column label="物料名称" align="center" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
+      <!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
+      <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
+      <el-table-column label="巷道" align="left" prop="roadwayId" width="120" />
+      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
+      <el-table-column label="库存数量" align="right" prop="quantity" width="120" />
+      <!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
+      <!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
+      <!-- <el-table-column label="电压" align="center" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" /> -->
+      <!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
+      <!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
+      <!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
+      <el-table-column label="规格" align="left" prop="spec" width="120" v-if="queryParams.groupFields.includes('spec')" />
+      <el-table-column label="品号描述" align="left" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
+      <el-table-column label="产品分类" align="left" prop="parentId" width="120" v-if="queryParams.groupFields.includes('parentId')" />
+      <el-table-column label="英文描述" align="left" prop="cargoNo" width="120" v-if="queryParams.groupFields.includes('cargoNo')" />
+      <el-table-column label="NC号" align="left" prop="spare9" width="120" v-if="queryParams.groupFields.includes('spare9')" />
+      <el-table-column label="电源线" align="left" prop="spare10" width="120" v-if="queryParams.groupFields.includes('spare10')" />
+      <el-table-column label="插头" align="left" prop="spare11" width="120" v-if="queryParams.groupFields.includes('spare11')" />
+      <el-table-column label="接嘴" align="left" prop="spare12" width="120" v-if="queryParams.groupFields.includes('spare12')" />
+      <el-table-column label="快捷码" align="left" prop="spare13" width="120" v-if="queryParams.groupFields.includes('spare13')" />
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120" v-if="queryParams.groupFields.includes('spare14')" />
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120" v-if="queryParams.groupFields.includes('spare15')" />
+      <el-table-column label="品号群组" align="left" prop="spare16" width="120" v-if="queryParams.groupFields.includes('spare16')" />
+      <el-table-column label="归类品" align="left" prop="spare17" width="120" v-if="queryParams.groupFields.includes('spare17')" />
+      <el-table-column label="计量体系" align="left" prop="spare18" width="120" v-if="queryParams.groupFields.includes('spare18')" />
+      <el-table-column label="群组名称" align="left" prop="spare19" width="120" v-if="queryParams.groupFields.includes('spare19')" />
+      <el-table-column label="批号管理" align="left" prop="spare20" width="120" v-if="queryParams.groupFields.includes('spare20')" />
+      <el-table-column label="状态" align="left" prop="spare21" width="120" v-if="queryParams.groupFields.includes('spare21')" />
+      <el-table-column label="产品大类" align="left" prop="spare22" width="120" v-if="queryParams.groupFields.includes('spare22')" />
+      <el-table-column label="产品二类" align="left" prop="spare23" width="120" v-if="queryParams.groupFields.includes('spare23')" />
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120" v-if="queryParams.groupFields.includes('spare24')" />
+      <el-table-column label="BOM状态" align="left" prop="spare25" width="120" v-if="queryParams.groupFields.includes('spare25')" />
+      <el-table-column label="产品定位" align="left" prop="spare26" width="120" v-if="queryParams.groupFields.includes('spare26')" />
+      <el-table-column label="电脑板型号" align="left" prop="spare27" width="120" v-if="queryParams.groupFields.includes('spare27')" />
+      <el-table-column label="非标要求" align="left" prop="spare28" width="120" v-if="queryParams.groupFields.includes('spare28')" />
+      <el-table-column label="品牌" align="left" prop="spare29" width="120" v-if="queryParams.groupFields.includes('spare29')" />
+      <el-table-column label="非标颜色" align="left" prop="spare30" width="120" v-if="queryParams.groupFields.includes('spare30')" />
+      <el-table-column label="主颜色" align="left" prop="spare31" width="120" v-if="queryParams.groupFields.includes('spare31')" />
+      <el-table-column label="辅助颜色" align="left" prop="spare32" width="120" v-if="queryParams.groupFields.includes('spare32')" />
+      <el-table-column label="是否标准款" align="left" prop="spare33" width="120" v-if="queryParams.groupFields.includes('spare33')" />
+      <el-table-column label="包装方式" align="left" prop="spare34" width="120" v-if="queryParams.groupFields.includes('spare34')" />
+      <el-table-column label="主要包装方式" align="left" prop="spare35" width="120" v-if="queryParams.groupFields.includes('spare35')" />
+      <el-table-column label="长" align="right" prop="spare36" width="120" v-if="queryParams.groupFields.includes('spare36')" />
+      <el-table-column label="宽" align="right" prop="spare37" width="120" v-if="queryParams.groupFields.includes('spare37')" />
+      <el-table-column label="高" align="right" prop="spare38" width="120" v-if="queryParams.groupFields.includes('spare38')" />
+      <el-table-column label="包装材积" align="center" prop="spare39" width="120" v-if="queryParams.groupFields.includes('spare39')" />
       <el-table-column label="备注" align="left" prop="remark" width="120" />
     </el-table>
 
@@ -133,8 +202,8 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: true,
-      // 仓库选项
+      loading: false,
+      // 仓库选项列表
       warehouseOptions: [],
       // 选中数组
       ids: [],
@@ -160,6 +229,45 @@ export default {
         warehouseId: null,
         roadwayId: null,
         quantity: null,
+        parentId: null,
+        cargoNo: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         //分组字段
         groupFields: []
       }
@@ -168,6 +276,46 @@ export default {
   created() {
     // 初始化时全选分组选项
     this.queryParams.groupFields = [
+      'parentId',
+      'cargoNo',
+      'roadwayId',
+      'spare3',
+      'spare4',
+      'spare5',
+      'spare6',
+      'spare7',
+      'spare8',
+      'spare9',
+      'spare10',
+      'spare11',
+      'spare12',
+      'spare13',
+      'spare14',
+      'spare15',
+      'spare16',
+      'spare17',
+      'spare18',
+      'spare19',
+      'spare20',
+      'spare21',
+      'spare22',
+      'spare23',
+      'spare24',
+      'spare25',
+      'spare26',
+      'spare27',
+      'spare28',
+      'spare29',
+      'spare30',
+      'spare31',
+      'spare32',
+      'spare33',
+      'spare34',
+      'spare35',
+      'spare36',
+      'spare37',
+      'spare38',
+      'spare39',
       'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
       'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
     ];
@@ -217,6 +365,36 @@ export default {
       this.resetForm("queryForm");
       // 重置时恢复全选状态
       this.queryParams.groupFields = [
+        'parentId',
+        'cargoNo',
+        'roadwayId',
+        'spare3',
+        'spare4',
+        'spare5',
+        'spare6',
+        'spare7',
+        'spare8',
+        'spare9',
+        'spare10',
+        'spare11',
+        'spare12',
+        'spare13',
+        'spare14',
+        'spare15',
+        'spare16',
+        'spare17',
+        'spare18',
+        'spare19',
+        'spare20',
+        'spare21',
+        'spare22',
+        'spare23',
+        'spare24',
+        'spare25',
+        'spare26',
+        'spare27',
+        'spare28',
+        'spare29',
         'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
         'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
       ];
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index fa98264..d8bea50 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -1,51 +1,48 @@
 <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="请选择仓库名称" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="作业ID" prop="jobId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.jobId"-->
-<!--          placeholder="请输入作业ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="子作业ID" prop="jobDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.jobDetailId"-->
-<!--          placeholder="请输入子作业ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="status"> &lt;!&ndash; 状态 &ndash;&gt;-->
-<!--        <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="taskNo">
+      <el-form-item label="作业ID" prop="jobId">
         <el-input
-          v-model="queryParams.taskNo"
-          placeholder="请输入任务号"
+          v-model="queryParams.jobId"
+          placeholder="请输入作业ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="子作业ID" prop="jobDetailId">
+        <el-input
+          v-model="queryParams.jobDetailId"
+          placeholder="请输入子作业ID"
+          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.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="任务号" prop="taskNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.taskNo"-->
+<!--          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="巷道ID" prop="roadwayId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.roadwayId"-->
@@ -70,7 +67,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewInJobFlow.thePlatoon')" prop="thePlatoon"> &lt;!&ndash; 排 &ndash;&gt;-->
+<!--      <el-form-item label="排" prop="thePlatoon">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.thePlatoon"-->
 <!--          placeholder="请输入排"-->
@@ -78,7 +75,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewInJobFlow.theColumn')" prop="theColumn"> &lt;!&ndash; 列 &ndash;&gt;-->
+<!--      <el-form-item label="列" prop="theColumn">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.theColumn"-->
 <!--          placeholder="请输入列"-->
@@ -86,7 +83,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewInJobFlow.theFloor')" prop="theFloor"> &lt;!&ndash; 层 &ndash;&gt;-->
+<!--      <el-form-item label="层" prop="theFloor">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.theFloor"-->
 <!--          placeholder="请输入层"-->
@@ -94,14 +91,6 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="托盘号" prop="trayCode"> &lt;!&ndash; 托盘号 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          placeholder="请输入托盘号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
 <!--      <el-form-item label="优先级" prop="priority">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.priority"-->
@@ -120,14 +109,16 @@
 <!--          />-->
 <!--        </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="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择入库作业类型" clearable>
+          <el-option
+            v-for="dict in dict.type.in_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="入口ID" prop="entranceId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.entranceId"-->
@@ -136,45 +127,26 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料编号" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
-        <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="垛型ID" prop="stackingId">-->
+<!--      <el-form-item label="物料ID" prop="wlbh">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.stackingId"-->
-<!--          placeholder="请输入垛型ID"-->
+<!--          v-model="queryParams.wlbh"-->
+<!--          placeholder="请输入物料ID"-->
 <!--          clearable-->
 <!--          @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="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="inQuantity">-->
+<!--      <el-form-item label="批号" prop="lotNo">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.inQuantity"-->
-<!--          placeholder="请输入入库数量"-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="垛型ID" prop="stackingId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stackingId"-->
+<!--          placeholder="请输入垛型ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -196,14 +168,30 @@
 <!--        />-->
 <!--      </el-form-item>-->
 <!--      <el-form-item label="创建时间" prop="createTime">-->
-<!--        <el-date-picker clearable-->
+<!--        <el-input-->
 <!--          v-model="queryParams.createTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="请选择创建时间">-->
-<!--        </el-date-picker>-->
+<!--          placeholder="请输入创建时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId"> &lt;!&ndash; 仓库ID &ndash;&gt;-->
+<!--      <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="仓库ID" prop="warehouseId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.warehouseId"-->
 <!--          placeholder="请输入仓库ID"-->
@@ -211,24 +199,62 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewInJobFlow.startTime')" prop="startTime"> &lt;!&ndash; 开始时间 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
-<!--          v-model="queryParams.startTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="请选择开始时间">-->
-<!--        </el-date-picker>-->
+<!--      <el-form-item label="物料GUID" prop="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料GUID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="结束时间" prop="finishTime"> &lt;!&ndash; 结束时间 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
-<!--          v-model="queryParams.finishTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="请选择结束时间">-->
-<!--        </el-date-picker>-->
+      <el-form-item label="品号" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入品名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品名" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          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="parentId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.parentId"-->
+<!--          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"-->
@@ -237,18 +263,324 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="cargoNo">-->
+
+<!--      <el-form-item label="型号" prop="spare1">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          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="spare8">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="插头" prop="spare11">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
 <!--          placeholder="请输入品牌"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="单位" prop="unit">-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入单位"-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          placeholder="请输入包装材积"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="描述" prop="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -292,72 +624,108 @@
 <!--          v-hasPermi="['search:ViewInJobFlow:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['search:ViewInJobFlow:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['search:ViewInJobFlow:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange" max-height="700">
+    <el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="作业号" width="120" align="left" prop="jobId" />
-      <el-table-column label="子作业号" width="120" align="left" prop="jobDetailId" />
-      <el-table-column label="状态" width="120" align="left" prop="status">
+      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+      <el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
+      <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"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务号" width="120" align="left" prop="taskNo" />
-      <el-table-column label="托盘号" width="120" align="left" prop="trayCode" />
-<!--      <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />-->
-      <el-table-column label="货位名称" width="120" align="left" prop="cargoSpaceName" />
-      <el-table-column label="优先级" width="120" align="right" prop="priority" />
-<!--      <el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">-->
+      <el-table-column width="120" label="任务号" align="left" prop="taskNo" />
+<!--      <el-table-column label="托盘号" align="center" prop="trayCode" />-->
+      <el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
+<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+<!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
+<!--      <el-table-column label="列" align="center" prop="theColumn" />-->
+<!--      <el-table-column label="层" align="center" prop="theFloor" />-->
+<!--      <el-table-column label="优先级" align="center" prop="priority" />-->
+<!--      <el-table-column label="执行阶段" align="center" prop="executionPhase">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="作业类型" width="120" align="left" prop="inOrOut">
+      <el-table-column label="作业类型" align="center" prop="inOrOut" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
-        </template>
+                    <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
+                  </template>
       </el-table-column>
-      <el-table-column label="入口号" width="120" align="left" prop="entranceId" />
-      <el-table-column label="物料编号(SKU)" width="120" align="left" prop="productId" />
-<!--      <el-table-column label="批号" align="left" prop="lotNo" />-->
-<!--      <el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />-->
-<!--      <el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="left" 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="入库数量" width="120" align="right" prop="inQuantity" />
-      <el-table-column label="单据号" width="120" align="left" prop="inOrOutId" />
-      <el-table-column label="子单据号" width="120" align="left" prop="inOrOutDId" />
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180" />
-<!--      <el-table-column label="开始时间" align="left" prop="startTime" width="180" />-->
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" />
-      <el-table-column label="仓库名称" width="120" align="left" prop="warehouseId" />
-      <el-table-column label="物料名称" width="120" align="left" prop="productName" />
-<!--      <el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />-->
-      <el-table-column label="单位" width="120" align="left" prop="unit" />
-      <el-table-column label="英文名称" width="120" align="left" prop="spare1" /><!-- 英文名称 -->
-      <el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
-      <el-table-column label="长度(mm)" width="120" align="right" prop="spare5" /><!-- 长MM -->
-      <el-table-column label="宽度(mm)" width="120" align="right" prop="spare6" /><!-- 宽MM -->
-      <el-table-column label="高度(mm)" width="120" align="right" prop="spare7" /><!-- 高MM -->
-      <el-table-column label="体积(m³)" width="120" align="right" prop="spare8" /><!-- 体积m³ -->
-      <el-table-column label="单价(元)" width="120" align="right" prop="price" /> <!-- 价格 -->
-      <el-table-column label="备注" width="120" align="left" prop="remark" /> <!-- 描述 -->
-
-      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <el-table-column width="120" label="入口ID" align="left" prop="entranceId" />
+<!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
+      <el-table-column width="120" label="批号" align="left" prop="lotNo" />
+<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
+      <el-table-column width="120" label="入库数量" align="right" prop="inQuantity" />
+      <el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
+      <el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
+      <el-table-column width="150" label="创建时间" align="left" prop="createTime" />
+<!--      <el-table-column label="开始时间" align="center" prop="startTime" />-->
+<!--      <el-table-column label="结束时间" align="center" prop="finishTime" />-->
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="120" label="品号" align="left" prop="productId" />
+      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="120" label="规格" align="left" prop="spec" />
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="righ" prop="spare36" />
+      <el-table-column width="120" label="宽" align="righ" prop="spare37" />
+      <el-table-column width="120" label="高" align="righ" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="righ" prop="spare39" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -388,11 +756,11 @@
     <!-- 添加或修改入库作业流水对话框 -->
     <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="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业号" />
+        <el-form-item label="作业ID" prop="jobId">
+          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
         </el-form-item>
-        <el-form-item label="子作业号" prop="jobDetailId">
-          <el-input v-model="form.jobDetailId" placeholder="请输入子作业号" />
+        <el-form-item label="子作业ID" prop="jobDetailId">
+          <el-input v-model="form.jobDetailId" placeholder="请输入子作业ID" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
@@ -410,11 +778,11 @@
         <el-form-item label="托盘号" prop="trayCode">
           <el-input v-model="form.trayCode" placeholder="请输入托盘号" />
         </el-form-item>
-        <el-form-item label="巷道号" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道号" />
+        <el-form-item label="巷道ID" prop="roadwayId">
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
         </el-form-item>
-        <el-form-item label="货位号" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位号" />
+        <el-form-item label="货位ID" prop="cargoSpaceId">
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
         </el-form-item>
         <el-form-item label="货位名称" prop="cargoSpaceName">
           <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
@@ -444,72 +812,181 @@
         <el-form-item label="作业类型" prop="inOrOut">
           <el-input v-model="form.inOrOut" placeholder="请输入作业类型" />
         </el-form-item>
-        <el-form-item label="入口号" prop="entranceId">
-          <el-input v-model="form.entranceId" placeholder="请输入入口号" />
+        <el-form-item label="入口ID" prop="entranceId">
+          <el-input v-model="form.entranceId" placeholder="请输入入口ID" />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
+        <el-form-item label="物料ID" prop="wlbh">
+          <el-input v-model="form.wlbh" 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="垛型号" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入垛型号" />
+        <el-form-item label="垛型ID" prop="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
         </el-form-item>
-        <el-form-item label="库存状态" prop="stockStatus">
-          <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
-            <el-option
-              v-for="dict in dict.type.stock_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+        <el-form-item label="单据ID" prop="inOrOutId">
+          <el-input v-model="form.inOrOutId" placeholder="请输入单据ID" />
         </el-form-item>
-        <el-form-item label="入库数量" prop="inQuantity">
-          <el-input v-model="form.inQuantity" 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 label="子单据ID" prop="inOrOutDId">
+          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据ID" />
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
-          </el-date-picker>
+          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
         </el-form-item>
         <el-form-item label="结束时间" prop="finishTime">
-          <el-date-picker clearable
-            v-model="form.finishTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束时间">
-          </el-date-picker>
+          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
         </el-form-item>
-        <el-form-item label="仓库名称" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库名称" />
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称关键字" />
+        <el-form-item label="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        </el-form-item>
+        <el-form-item label="品名" prop="productId">
+          <el-input v-model="form.productId" 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="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入品牌" />
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位(件/箱/包)" />
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        </el-form-item>
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
+        </el-form-item>
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" 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="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" 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>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -517,10 +994,10 @@
 
 <script>
 import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
-import { listWarehouse } from "@/api/bas/warehouse"
+
 export default {
   name: "ViewInJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','in_job_type'],
+  dicts: ['execution_phase_type', 'mydo_job_status','in_job_type'],
   data() {
     return {
       // 遮罩层
@@ -541,8 +1018,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 仓库选项
-      warehouseOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -562,7 +1037,7 @@ export default {
         executionPhase: null,
         inOrOut: null,
         entranceId: null,
-        productId: null,
+        wlbh: null,
         lotNo: null,
         stackingId: null,
         stockStatus: null,
@@ -573,47 +1048,69 @@ export default {
         startTime: null,
         finishTime: null,
         warehouseId: null,
-        productName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        unit: null
+        unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         jobId: [
-          { required: true, message: "作业号不能为空", trigger: "blur" }
-        ],
-        productId: [
-          { required: true, message: "物料编号不能为空", trigger: "blur" }
-        ],
-        inQuantity: [
-          { required: true, message: "入库数量不能为空", trigger: "blur" },
-          { type: "number", message: "入库数量必须为数字", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "单位不能为空", trigger: "blur" }
+          { 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
@@ -646,7 +1143,7 @@ export default {
         executionPhase: null,
         inOrOut: null,
         entranceId: null,
-        productId: null,
+        wlbh: null,
         lotNo: null,
         stackingId: null,
         stockStatus: null,
@@ -657,10 +1154,54 @@ export default {
         startTime: null,
         finishTime: null,
         warehouseId: null,
-        productName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        unit: null
+        unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null
       }
       this.resetForm("form")
     },
@@ -684,7 +1225,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "新增入库作业流水"
+      this.title = "添加入库作业流水"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -719,7 +1260,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobIds = row.jobId || this.ids
-      this.$modal.confirm('是否确认删除作业号为"' + jobIds + '"的入库作业？').then(function() {
+      this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
         return delViewInJobFlow(jobIds)
       }).then(() => {
         this.getList()
@@ -730,7 +1271,7 @@ export default {
     handleExport() {
       this.download('search/ViewInJobFlow/export', {
         ...this.queryParams
-      }, `入库作业流水_${new Date().getTime()}.xlsx`)
+      }, `ViewInJobFlow_${new Date().getTime()}.xlsx`)
     }
   }
 }
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index c7a364b..d0b45f8 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -1,256 +1,613 @@
 <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="请选择仓库名称" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="作业号" prop="jobId">
+      <el-form-item label="作业ID" prop="jobId">
         <el-input
           v-model="queryParams.jobId"
-          placeholder="请输入作业号"
+          placeholder="请输入作业ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="子作业ID" prop="jobDetailId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.jobDetailId"-->
-      <!--          placeholder="请输入子作业ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="status"> &lt;!&ndash; 状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.status" :placeholder="$t('searchViewOutJobFlow.selectStatus')" clearable>-->
+      <el-form-item label="子作业ID" prop="jobDetailId">
+        <el-input
+          v-model="queryParams.jobDetailId"
+          placeholder="请输入子作业ID"
+          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.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="任务号" prop="taskNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.taskNo"-->
+<!--          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="巷道ID" prop="roadwayId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.roadwayId"-->
+<!--          placeholder="请输入巷道ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceId"-->
+<!--          placeholder="请输入货位ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位名称" prop="cargoSpaceName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceName"-->
+<!--          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="theFloor">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theFloor"-->
+<!--          placeholder="请输入层"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="优先级" prop="priority">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.priority"-->
+<!--          placeholder="请输入优先级"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="执行阶段" prop="executionPhase">-->
+<!--        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
 <!--          <el-option-->
-<!--            v-for="dict in dict.type.mydo_job_status"-->
+<!--            v-for="dict in dict.type.execution_phase_type"-->
 <!--            :key="dict.value"-->
 <!--            :label="dict.label"-->
 <!--            :value="dict.value"-->
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="任务号" prop="taskNo">
-        <el-input
-          v-model="queryParams.taskNo"
-          placeholder="请输入任务号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="托盘号" prop="trayCode"> &lt;!&ndash; 托盘码 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          :placeholder="$t('searchViewOutJobFlow.inputTrayCode')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;
-        <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewOutJobFlow.selectStockStatus')" clearable>
+      <el-form-item label="作业类型" prop="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
           <el-option
-            v-for="dict in dict.type.stock_status"
+            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="巷道ID" prop="roadwayId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.roadwayId"-->
-      <!--          placeholder="请输入巷道ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.cargoSpaceId"-->
-      <!--          placeholder="请输入货位ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="货位名称" prop="cargoSpaceName">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.cargoSpaceName"-->
-      <!--          placeholder="请输入货位名称"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-<!--      <el-form-item label="排" prop="thePlatoon"> &lt;!&ndash; 排 &ndash;&gt;-->
+      </el-form-item>
+<!--      <el-form-item label="出口ID" prop="exitId">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.thePlatoon"-->
-<!--          :placeholder="$t('searchViewOutJobFlow.inputThePlatoon')"-->
+<!--          v-model="queryParams.exitId"-->
+<!--          placeholder="请输入出口ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="列" prop="theColumn"> &lt;!&ndash; 列 &ndash;&gt;-->
+<!--      <el-form-item label="物料ID" prop="wlbh">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.theColumn"-->
-<!--          :placeholder="$t('searchViewOutJobFlow.inputTheColumn')"-->
+<!--          v-model="queryParams.wlbh"-->
+<!--          placeholder="请输入物料ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="层" prop="theFloor"> &lt;!&ndash; 层 &ndash;&gt;-->
+<!--      <el-form-item label="批号" prop="lotNo">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.theFloor"-->
-<!--          :placeholder="$t('searchViewOutJobFlow.inputTheFloor')"-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <!--      <el-form-item label="优先级" prop="priority">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.priority"-->
-      <!--          placeholder="请输入优先级"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="执行阶段" prop="executionPhase">-->
-      <!--        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
-      <!--          <el-option-->
-      <!--            v-for="dict in dict.type.execution_phase_type"-->
-      <!--            :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="出口ID" prop="exitId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.exitId"-->
-      <!--          placeholder="请输入出口ID"-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <el-form-item label="物料编号" prop="productId">
+<!--      <el-form-item label="剁型ID" prop="stackingId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stackingId"-->
+<!--          placeholder="请输入剁型ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="出库数量" prop="outQuantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.outQuantity"-->
+<!--          placeholder="请输入出库数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="回流数量" prop="giveNum">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.giveNum"-->
+<!--          placeholder="请输入回流数量"-->
+<!--          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"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createTime"-->
+<!--          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="仓库ID" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="物料GUID" prop="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料GUID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="剁型ID" prop="stackingId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.stackingId"-->
-      <!--          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"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="创建时间" prop="createTime">-->
-      <!--        <el-date-picker clearable-->
-      <!--          v-model="queryParams.createTime"-->
-      <!--          type="date"-->
-      <!--          value-format="yyyy-MM-dd"-->
-      <!--          placeholder="请选择创建时间">-->
-      <!--        </el-date-picker>-->
-      <!--      </el-form-item>-->
-<!--      <el-form-item label="开始时间" prop="startTime"> &lt;!&ndash; 开始时间 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
-<!--                        v-model="queryParams.startTime"-->
-<!--                        type="date"-->
-<!--                        value-format="yyyy-MM-dd"-->
-<!--                        :placeholder="$t('searchViewOutJobFlow.selectStartTime')">-->
-<!--        </el-date-picker>-->
+<!--      <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="finishTime"> &lt;!&ndash; 结束时间 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
-<!--                        v-model="queryParams.finishTime"-->
-<!--                        type="date"-->
-<!--                        value-format="yyyy-MM-dd"-->
-<!--                        :placeholder="$t('searchViewOutJobFlow.selectFinishTime')">-->
-<!--        </el-date-picker>-->
+<!--      <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="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="型号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          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="spare8">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="插头" prop="spare11">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
+<!--          placeholder="请输入品牌"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          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="仓库ID" prop="warehouseId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.warehouseId"-->
-      <!--          placeholder="请输入仓库ID"-->
-      <!--          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="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="customerName">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.customerName"-->
-      <!--          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>
@@ -258,127 +615,159 @@
     </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="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"
           plain
           icon="el-icon-download"
           size="mini"
-          @click="confirmExport"
+          @click="handleExport"
           v-hasPermi="['search:ViewOutJobFlow:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="700">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="作业ID" align="left" prop="jobId" width="120"/>
-      <el-table-column label="子作业ID" align="left" prop="jobDetailId" width="120"/>
-      <el-table-column label="状态" align="left" prop="status" width="120">
+    <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="650">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+      <el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
+      <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"/>
         </template>
       </el-table-column>
-      <el-table-column label="任务号" align="left" prop="taskNo" width="120"/>
-      <el-table-column label="托盘码" align="left" prop="trayCode" width="120"/>
-      <el-table-column label="巷道ID" align="left" prop="roadwayId"/>
-      <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
-      <el-table-column label="排" align="left" prop="thePlatoon" width="120"/>
-      <el-table-column label="列" align="left" prop="theColumn" width="120"/>
-      <el-table-column label="层" align="left" prop="theFloor" width="120"/>
-      <el-table-column label="优先级" align="right" prop="priority" width="120"/>
-      <el-table-column label="执行阶段" align="left" prop="executionPhase">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="作业类型" align="left" prop="inOrOut" width="120">
+      <el-table-column width="120" label="任务号" align="left" prop="taskNo" />
+      <el-table-column width="120" label="托盘码" align="left" prop="trayCode" />
+      <el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
+<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+<!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
+<!--      <el-table-column label="列" align="center" prop="theColumn" />-->
+<!--      <el-table-column label="层" align="center" prop="theFloor" />-->
+<!--      <el-table-column label="优先级" align="center" prop="priority" />-->
+<!--      <el-table-column label="执行阶段" align="center" prop="executionPhase">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column width="120" label="作业类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column label="出口ID" align="left" prop="exitId" width="120"/>
-      <el-table-column label="物料ID" align="left" prop="productId" width="120"/>
-      <el-table-column label="批次号" align="left" prop="lotNo"/>
-      <el-table-column label="堆垛机ID" align="left" prop="stackingId"/>
-      <el-table-column label="库存状态" align="left" 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="right" prop="outQuantity" width="120"/>
-      <el-table-column label="发放数量" align="right" prop="giveNum"/>
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="120"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="120"/>
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
-      <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
-      <el-table-column label="完成时间" align="left" prop="finishTime" width="180"/>
-      <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>
-      <el-table-column label="物料名称" align="left" prop="productName" width="120"/>
-      <el-table-column label="规格" align="left" prop="spec"/>
-      <el-table-column label="货号" align="left" prop="cargoNo"/>
-      <el-table-column label="单位" align="left" prop="unit" width="120"/>
-      <el-table-column label="客户名称" align="left" prop="customerName" width="120"/>
-      <el-table-column label="英文名称" align="left" prop="spare1" width="120"/>
-      <el-table-column label="净重" align="right" width="120" prop="spare2" />
-      <el-table-column label="长度" align="right" prop="spare5" width="120"/>
-      <el-table-column label="宽度" align="right" prop="spare6" width="120"/>
-      <el-table-column label="高度" align="right" prop="spare7" width="120"/>
-      <el-table-column label="体积" align="right" prop="spare8" width="120"/>
-      <el-table-column label="价格" align="right" prop="price" width="120"/>
-      <el-table-column label="描述" align="left" prop="remark" width="120"/>
-      <!--      <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>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+      <el-table-column width="120" label="出口ID" align="left" prop="exitId" />
+<!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
+      <el-table-column width="120" label="批号" align="left" prop="lotNo" />
+<!--      <el-table-column label="剁型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
+      <el-table-column width="120" label="出库数量" align="right" prop="outQuantity" />
+      <el-table-column width="120" label="回流数量" align="right" prop="giveNum" />
+      <el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
+      <el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
+      <el-table-column width="150" label="创建时间" align="left" prop="createTime" />
+<!--      <el-table-column label="开始时间" align="center" prop="startTime" />-->
+<!--      <el-table-column label="结束时间" align="center" prop="finishTime" />-->
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="120" label="客户名称" align="left" prop="customerName" />
+      <el-table-column width="120" label="品号" align="left" prop="productId" />
+      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="120" label="规格" align="left" prop="spec" />
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
+<!--      <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>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -389,23 +778,14 @@
       @pagination="getList"
     />
 
-    <!-- 导出对话框 -->
-    <el-dialog title="导出" :visible.sync="exportOpen" width="400px" append-to-body>
-      <div class="el-message-box__status el-icon-question">是否确认导出数据?</div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="exportOpen = false">取消</el-button>
-        <el-button type="primary" @click="confirmExport">确定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 添加或修改出库做业务流水对话框 -->
+    <!-- 添加或修改出库作业流水对话框 -->
     <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="作业ID" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业ID"/>
+          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
         </el-form-item>
         <el-form-item label="子作业ID" prop="jobDetailId">
-          <el-input v-model="form.jobDetailId" placeholder="请输入子作业ID"/>
+          <el-input v-model="form.jobDetailId" placeholder="请输入子作业ID" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
@@ -418,31 +798,31 @@
           </el-select>
         </el-form-item>
         <el-form-item label="任务号" prop="taskNo">
-          <el-input v-model="form.taskNo" placeholder="请输入任务号"/>
+          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
         </el-form-item>
         <el-form-item label="托盘码" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘码"/>
+          <el-input v-model="form.trayCode" placeholder="请输入托盘码" />
         </el-form-item>
-        <el-form-item label="巷道号" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道号"/>
+        <el-form-item label="巷道ID" prop="roadwayId">
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
         </el-form-item>
-        <el-form-item label="货位号" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位号"/>
+        <el-form-item label="货位ID" prop="cargoSpaceId">
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
         </el-form-item>
         <el-form-item label="货位名称" prop="cargoSpaceName">
-          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称"/>
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
         </el-form-item>
         <el-form-item label="排" prop="thePlatoon">
-          <el-input v-model="form.thePlatoon" placeholder="请输入排"/>
+          <el-input v-model="form.thePlatoon" placeholder="请输入排" />
         </el-form-item>
         <el-form-item label="列" prop="theColumn">
-          <el-input v-model="form.theColumn" placeholder="请输入列"/>
+          <el-input v-model="form.theColumn" placeholder="请输入列" />
         </el-form-item>
         <el-form-item label="层" prop="theFloor">
-          <el-input v-model="form.theFloor" placeholder="请输入层"/>
+          <el-input v-model="form.theFloor" placeholder="请输入层" />
         </el-form-item>
         <el-form-item label="优先级" prop="priority">
-          <el-input v-model="form.priority" placeholder="请输入优先级"/>
+          <el-input v-model="form.priority" placeholder="请输入优先级" />
         </el-form-item>
         <el-form-item label="执行阶段" prop="executionPhase">
           <el-select v-model="form.executionPhase" placeholder="请选择执行阶段">
@@ -455,98 +835,214 @@
           </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="exitId">
-          <el-input v-model="form.exitId" placeholder="请输入出口号"/>
-        </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)"/>
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号"/>
-        </el-form-item>
-        <el-form-item label="堆垛机号" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入堆垛机号"/>
-        </el-form-item>
-        <el-form-item label="库存状态" prop="stockStatus">
-          <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
+          <el-select v-model="form.inOrOut" placeholder="请选择作业类型">
             <el-option
-              v-for="dict in dict.type.stock_status"
+              v-for="dict in dict.type.out_job_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="单据号" prop="inOrOutId">
-          <el-input v-model="form.inOrOutId" placeholder="请输入单据号"/>
+        <el-form-item label="出口ID" prop="exitId">
+          <el-input v-model="form.exitId" placeholder="请输入出口ID" />
         </el-form-item>
-        <el-form-item label="子单据号" prop="inOrOutDId">
-          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据号"/>
+        <el-form-item label="物料ID" prop="wlbh">
+          <el-input v-model="form.wlbh" 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="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入剁型ID" />
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outQuantity">
+          <el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
+        </el-form-item>
+        <el-form-item label="回流数量" prop="giveNum">
+          <el-input v-model="form.giveNum" placeholder="请输入回流数量" />
+        </el-form-item>
+        <el-form-item label="单据ID" prop="inOrOutId">
+          <el-input v-model="form.inOrOutId" placeholder="请输入单据ID" />
+        </el-form-item>
+        <el-form-item label="子单据ID" prop="inOrOutDId">
+          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据ID" />
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-                          v-model="form.startTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择开始时间">
-          </el-date-picker>
+          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
         </el-form-item>
-        <el-form-item label="完成时间" prop="finishTime">
-          <el-date-picker clearable
-                          v-model="form.finishTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择完成时间">
-          </el-date-picker>
+        <el-form-item label="结束时间" prop="finishTime">
+          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
         </el-form-item>
-        <el-form-item label="仓库名称" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库名称"/>
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称"/>
+        <el-form-item label="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        </el-form-item>
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" 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-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 label="描述" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位(件/箱/包)"/>
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        </el-form-item>
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
+        </el-form-item>
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" 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="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
         </el-form-item>
         <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
+          <el-input v-model="form.customerName" 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>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  listViewOutJobFlow,
-  getViewOutJobFlow,
-  delViewOutJobFlow,
-  addViewOutJobFlow,
-  updateViewOutJobFlow
-} from "@/api/search/ViewOutJobFlow"
-import { listWarehouse } from "@/api/bas/warehouse"
+import { listViewOutJobFlow, getViewOutJobFlow, delViewOutJobFlow, addViewOutJobFlow, updateViewOutJobFlow } from "@/api/search/ViewOutJobFlow"
 
 export default {
   name: "ViewOutJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','out_job_type'],
+  dicts: ['execution_phase_type', 'mydo_job_status', 'out_job_type'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -557,14 +1053,12 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 出库做业务流水表格数据
+      // 出库作业流水表格数据
       ViewOutJobFlowList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      // 是否显示导出弹出层
-      exportOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -584,7 +1078,7 @@ export default {
         executionPhase: null,
         inOrOut: null,
         exitId: null,
-        productId: null,
+        wlbh: null,
         lotNo: null,
         stackingId: null,
         stockStatus: null,
@@ -596,10 +1090,54 @@ export default {
         startTime: null,
         finishTime: null,
         warehouseId: null,
-        productName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
         unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         customerName: null
       },
       // 表单参数
@@ -607,28 +1145,16 @@ export default {
       // 表单校验
       rules: {
         jobId: [
-          {required: true, message: "请输入作业ID", trigger: "blur"}
+          { 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
       listViewOutJobFlow(this.queryParams).then(response => {
@@ -660,7 +1186,7 @@ export default {
         executionPhase: null,
         inOrOut: null,
         exitId: null,
-        productId: null,
+        wlbh: null,
         lotNo: null,
         stackingId: null,
         stockStatus: null,
@@ -672,10 +1198,54 @@ export default {
         startTime: null,
         finishTime: null,
         warehouseId: null,
-        productName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
         unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         customerName: null
       }
       this.resetForm("form")
@@ -693,7 +1263,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.jobId)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -724,7 +1294,7 @@ export default {
             })
           } else {
             addViewOutJobFlow(this.form).then(response => {
-              this.$modal.msgSuccess("添加成功")
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -735,36 +1305,19 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobIds = row.jobId || this.ids
-      this.$modal.confirm('是否确认删除作业ID为"' + jobIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除出库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
         return delViewOutJobFlow(jobIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {
-      })
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
-      handleExport() {
-        this.exportOpen = true;
-      },
-      /** 确认导出 */
-      confirmExport() {
-        this.download('search/ViewOutJobFlow/export', {
-          ...this.queryParams
-        }, `ViewOutJobFlow_${new Date().getTime()}.xlsx`)
-        this.$modal.msgSuccess("导出成功");
-        this.exportOpen = false;
-      }
+    handleExport() {
+      this.download('search/ViewOutJobFlow/export', {
+        ...this.queryParams
+      }, `ViewOutJobFlow_${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/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
index 178b804..47f5097 100644
--- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
@@ -1,7 +1,7 @@
 <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-form-item label="仓库名称" prop="warehouseId">
         <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
           <el-option
             v-for="dict in warehouseOptions"
@@ -10,183 +10,62 @@
             :value="dict.warehouseId"
           />
         </el-select>
-      </el-form-item>
-<!--      <el-form-item label="id" prop="onlyIdentity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.onlyIdentity"-->
-<!--          placeholder="请输入id"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="库存号" prop="stockId">
+      </el-form-item> -->
+
+      <el-form-item label="库存ID" prop="stockId">
         <el-input
           v-model="queryParams.stockId"
-          placeholder="请输入库存号"
+          placeholder="请输入库存ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
+      <!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
         <el-input
           v-model="queryParams.stockinDetailId"
           placeholder="请输入入库单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockDetail.cargoSpaceId')" prop="cargoSpaceId"> &lt;!&ndash; 货位ID &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoSpaceId"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputCargoSpaceId')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputTrayCode')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.quantity')" prop="quantity"> &lt;!&ndash; 数量 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputQuantity')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.jobId"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputJobId')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputLotNo')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      </el-form-item> -->
 
-<!--      <el-form-item :label="$t('searchViewStockDetail.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.inDate"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputInDate')"-->
-<!--          clearable-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          @keyup.enter.native="handleQuery">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputWarehouseId')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.stackingId')" prop="stackingId"> &lt;!&ndash; 剁型ID &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stackingId"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputStackingId')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.cargoSpaceName')" prop="cargoSpaceName"> &lt;!&ndash; 货位名称 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoSpaceName"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputCargoSpaceName')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.roadwayId')" prop="roadwayId"> &lt;!&ndash; 巷道ID &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.roadwayId"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputRoadwayId')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.locked')" prop="locked"> &lt;!&ndash; 是否锁定 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.locked"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputLocked')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="物料编号" prop="productId">
+      <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号(SKU)"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockDetail.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputSpec')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.unit')" prop="unit"> &lt;!&ndash; 单位 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputUnit')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockDetail.price')" prop="price"> &lt;!&ndash; 价格 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          :placeholder="$t('searchViewStockDetail.inputPrice')"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
 
-<!--      <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus">&lt;!&ndash; 物料状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" 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="$t('stockManagement.stockStatus')" prop="stockStatus">&lt;!&ndash; 库存状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>-->
-<!--          <el-option-->
-<!--            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="productStatus">
+        <el-select v-model="queryParams.productStatus" 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="stockStatus">
+        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
+          <el-option
+            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>
         <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>
@@ -239,19 +118,22 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="700">
+    <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="id" align="center" prop="onlyIdentity" />-->
-      <el-table-column label="库存号" align="left" prop="stockId" width="120"/>
-      <el-table-column label="货位号" align="left" prop="cargoSpaceId" width="120"/>
-      <el-table-column label="托盘号" align="left" prop="trayCode" width="120"/>
-      <el-table-column label="数量(件)" align="right" prop="quantity" width="120"/>
-      <el-table-column label="作业号" align="left" prop="jobId" width="120"/>
-      <el-table-column label="入库单号" align="left" prop="stockinDetailId" width="120"/>
+      <!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
+      <el-table-column label="库存ID" align="left" prop="stockId" width="120"/>
+      <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>
+      <el-table-column label="托盘条码" align="left" prop="trayCode" width="120"/>
+      <el-table-column label="数量" align="right" prop="quantity" width="120"/>
+      <el-table-column label="作业ID" align="left" prop="jobId" width="120"/>
+      <el-table-column label="批号" align="left" prop="lotNo" width="120"/>
+      <el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="120"/>
       <el-table-column label="入库时间" align="left" prop="inDate" width="120"/>
+      <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>
       <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>
+      <el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
-      <el-table-column label="巷道编号" align="left" prop="roadwayId" width="120"/>
+      <el-table-column label="巷道ID" align="left" prop="roadwayId" width="120"/>
       <el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
@@ -267,22 +149,59 @@
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="锁定状态" align="left" prop="locked" width="120">
+      <el-table-column label="是否锁定" align="left" prop="locked" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料编号" align="left" prop="productId" width="120"/>
-      <el-table-column label="物料名称" align="left" prop="productName" width="120"/>
-      <el-table-column label="计量单位" align="left" prop="unit" width="120"/>
+      <!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> -->
+      <el-table-column label="品名" align="left" prop="productId" width="120"/>
+      <el-table-column label="品号" align="left" prop="productName" width="120"/>
+      <el-table-column label="规格" align="left" prop="spec" width="120"/>
+      <!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
+      <el-table-column label="价格" align="right" prop="price" width="120"/>
+      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
+      <el-table-column label="品号描述" align="left" prop="cargoNo" width="120"/>
       <el-table-column label="英文名称" align="left" prop="spare1" width="120"/>
-      <el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
-      <el-table-column label="长度(mm)" align="right" prop="spare5" width="120"/>
-      <el-table-column label="宽度(mm)" align="right" prop="spare6" width="120"/>
-      <el-table-column label="高度(mm)" align="right" prop="spare7" width="120"/>
-      <el-table-column label="体积(m³)" align="right" prop="spare8" width="120"/>
-      <el-table-column label="单价(元)" align="right" prop="price" width="120"/>
-      <el-table-column label="备注" align="left" prop="remark" width="120"/>
+      <!-- <el-table-column label="单件净重" align="right" prop="spare2" width="120"/> -->
+      <!-- <el-table-column label="颜色" align="left" prop="spare3" width="120"/> -->
+      <!-- <el-table-column label="序列号" align="left" prop="spare4" width="120"/> -->
+      <!-- <el-table-column label="电压" align="left" prop="spare5" width="120"/> -->
+      <!-- <el-table-column label="功率" align="left" prop="spare6" width="120"/> -->
+      <!-- <el-table-column label="相位" align="left" prop="spare7" width="120"/> -->
+      <!-- <el-table-column label="毛重" align="right" prop="spare8" width="120"/> -->
+      <el-table-column label="NC号" align="left" prop="spare9" width="120"/>
+      <el-table-column label="电源线" align="left" prop="spare10" width="120"/>
+      <el-table-column label="插头" align="left" prop="spare11" width="120"/>
+      <el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
+      <el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
+      <el-table-column label="品号群组" align="left" prop="spare16" width="120"/>
+      <el-table-column label="归类品" align="left" prop="spare17" width="120"/>
+      <el-table-column label="计量体系" align="left" prop="spare18" width="120"/>
+      <el-table-column label="群组名称" align="left" prop="spare19" width="120"/>
+      <el-table-column label="批号管理" align="left" prop="spare20" width="120"/>
+      <el-table-column label="状态" align="left" prop="spare21" width="120"/>
+      <el-table-column label="产品大类" align="left" prop="spare22" width="120"/>
+      <el-table-column label="产品二类" align="left" prop="spare23" width="120"/>
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120"/>
+      <el-table-column label="BOM状态" align="left" prop="spare25" width="120"/>
+      <el-table-column label="产品定位" align="left" prop="spare26" width="120"/>
+      <el-table-column label="电脑板型号" align="left" prop="spare27" width="120"/>
+      <el-table-column label="非标要求" align="left" prop="spare28" width="120"/>
+      <el-table-column label="品牌" align="left" prop="spare29" width="120"/>
+      <el-table-column label="非标颜色" align="left" prop="spare30" width="120"/>
+      <el-table-column label="主颜色" align="left" prop="spare31" width="120"/>
+      <el-table-column label="辅助颜色" align="left" prop="spare32" width="120"/>
+      <el-table-column label="是否标准款" align="left" prop="spare33" width="120"/>
+      <el-table-column label="包装方式" align="left" prop="spare34" width="120"/>
+      <el-table-column label="主要包装方式" align="left" prop="spare35" width="120"/>
+      <el-table-column label="长" align="right" prop="spare36" width="120"/>
+      <el-table-column label="宽" align="right" prop="spare37" width="120"/>
+      <el-table-column label="高" align="right" prop="spare38" width="120"/>
+      <el-table-column label="包装材积" align="right" prop="spare39" width="120"/>
+      <el-table-column label="描述" align="left" prop="remark" width="120"/>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -423,16 +342,62 @@ export default {
         stockinDetailId: null,
         inDate: null,
         warehouseId: null,
+        warehouseName: null,
         stackingId: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoSpaceStatus: null,
+        stockStatus: null,
+        productStatus: null,
         locked: null,
+        productGuid: null,
         productId: null,
         productName: null,
         spec: null,
         unit: null,
-        price: null
+        price: null,
+        parentId: null,
+        cargoNo: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
+        remark: null
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue
index 3dcbb3b..b27d2a6 100644
--- a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue
@@ -1,44 +1,707 @@
 <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="库存ID" prop="stockId">-->
+      <el-form-item label="库存ID" prop="stockId">
+        <el-input
+          v-model="queryParams.stockId"
+          placeholder="请输入库存ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.stockId"-->
-<!--          placeholder="请输入库存ID"-->
+<!--          v-model="queryParams.cargoSpaceId"-->
+<!--          placeholder="请输入货位ID"-->
+<!--          clearable-->
+<!--          @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="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="productStatus">-->
+<!--        <el-select v-model="queryParams.productStatus" 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="inDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.inDate"-->
+<!--          placeholder="请输入入库时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="回流时间" prop="backDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.backDate"-->
+<!--          placeholder="请输入回流时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </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="作业ID" prop="jobId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.jobId"-->
+<!--          placeholder="请输入作业ID"-->
+<!--          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="outQuantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.outQuantity"-->
+<!--          placeholder="请输入出库数量"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
 
-      <el-form-item label="仓库名称" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
+      <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="入库子单ID" prop="stockinDetailId">
+        <el-input
+          v-model="queryParams.stockinDetailId"
+          placeholder="请输入入库子单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库类型" prop="inType">
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
           <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
+            v-for="dict in dict.type.in_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="物料编号" prop="productId">
+<!--      <el-form-item label="入库班组ID" prop="inClassId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.inClassId"-->
+<!--          placeholder="请输入入库班组ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="垛型ID" prop="stackingId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stackingId"-->
+<!--          placeholder="请输入垛型ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库名称" prop="warehouseName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseName"-->
+<!--          placeholder="请输入仓库名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库地址" prop="address">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.address"-->
+<!--          placeholder="请输入仓库地址"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库描述" prop="cDesc">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cDesc"-->
+<!--          placeholder="请输入仓库描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库级别" prop="warehouseKind">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseKind"-->
+<!--          placeholder="请输入仓库级别"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库类型" prop="warehouseType">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseType"-->
+<!--          placeholder="请输入仓库类型"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否可用" prop="isCurrent">-->
+<!--        <el-select v-model="queryParams.isCurrent" placeholder="请选择是否可用" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.is_available"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="物料GUID" prop="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料GUID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="物料名称" prop="productName">
+<!--      <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="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="型号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          placeholder="请输入功率"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          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="spare8">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="插头" prop="spare11">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
+<!--          placeholder="请输入品牌"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          placeholder="请输入包装材积"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位名称" prop="cargoSpaceName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceName"-->
+<!--          placeholder="请输入货位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="巷道ID" prop="roadwayId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.roadwayId"-->
+<!--          placeholder="请输入巷道ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货区id" prop="cargoAreaId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoAreaId"-->
+<!--          placeholder="请输入货区id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位类型名称" prop="theTypeName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theTypeName"-->
+<!--          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="theFloor">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theFloor"-->
+<!--          placeholder="请输入层"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位状态" prop="cargoStatus">-->
+<!--        <el-select v-model="queryParams.cargoStatus" 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="locked">-->
+<!--        <el-select v-model="queryParams.locked" placeholder="请选择是否锁定" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.cargo_space_lock_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位高度" prop="cargoHight">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoHight"-->
+<!--          placeholder="请输入货位高度"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否双伸" prop="issDouble">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.issDouble"-->
+<!--          placeholder="请输入是否双伸"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位分组编码" prop="groupCodingNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupCodingNo"-->
+<!--          placeholder="请输入双货位分组编码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位分组编码1" prop="groupCoding">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupCoding"-->
+<!--          placeholder="请输入双货位分组编码1"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位标识" prop="cargoSpaceLogo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceLogo"-->
+<!--          placeholder="请输入双货位标识"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="本仓库区域" prop="thisCargoArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.thisCargoArea"-->
+<!--          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>
@@ -91,87 +754,121 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange" max-height="700">
+    <el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>
-      <el-table-column label="库存号" align="left" prop="stockId" width="120"/>
-      <el-table-column label="货位编号" align="left" prop="cargoSpaceId" width="120"/>
-      <el-table-column label="库存状态" align="center" prop="stockStatus" width="120">
-          <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="productStatus" width="120">
+      <el-table-column width="120" label="库存ID" align="left" prop="stockId" />
+<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+      <el-table-column width="120" 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 width="120" label="物料状态" align="center" prop="productStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="批次号" align="center" prop="lotNo" />-->
-      <el-table-column label="入库时间" align="left" prop="inDate" width="120"/>
-<!--      <el-table-column label="回流时间" align="center" prop="backDate" />-->
-<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column label="库存数量(件)" align="right" prop="quantity" width="120"/>
-      <el-table-column label="作业号" align="left" prop="jobId" width="120"/>
-      <el-table-column label="托盘号" align="left" prop="trayCode" width="120"/>
-<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
-      <el-table-column label="入库单号" align="left" prop="stockinDetailId" width="120"/>
-      <el-table-column label="入库主单号" align="left" prop="stockinId" width="120"/>
-      <el-table-column label="入库类型" align="left" prop="inType" width="120">
+      <el-table-column width="120" label="批次号" align="left" prop="lotNo" />
+      <el-table-column width="150" label="入库时间" align="left" prop="inDate" />
+      <el-table-column width="120" label="回流时间" align="left" prop="backDate" />
+      <el-table-column width="120" label="库存数量" align="right" prop="quantity" />
+      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+<!--      <el-table-column label="托盘条码" align="center" prop="trayCode" />-->
+<!--      <el-table-column width="120" label="出库数量" align="right" prop="outQuantity" />-->
+      <el-table-column width="120" label="入库主单" align="left" prop="stockinId" />
+      <el-table-column width="120" label="入库子单ID" align="left" prop="stockinDetailId" />
+      <el-table-column width="120" label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
-<!--      <el-table-column label="备用字段2" align="center" prop="spare2" />-->
-<!--      <el-table-column label="备用字段3" align="center" prop="spare3" />-->
-<!--      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
-<!--      <el-table-column label="备用字段5" align="center" prop="spare5" />-->
-<!--      <el-table-column label="备用字段6" align="center" prop="spare6" />-->
-      <el-table-column label="物料编号" align="left" prop="productId" width="120"/>
-      <el-table-column label="物料名称" align="left" prop="productName" width="120"/>
-      <el-table-column label="英文名称" align="left" prop="enName" width="120"/>
-<!--      <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
-      <el-table-column label="单价(元)" align="right" prop="price" width="120"/>
-      <el-table-column label="计量单位" align="left" prop="unit" width="120"/>
-<!--      <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
-
-      <el-table-column label="单件净重(kg)" align="right" prop="weight" width="120"/>
-      <el-table-column label="长度(mm)" align="right" prop="longMM" width="120"/>
-      <el-table-column label="宽度(mm)" align="right" prop="wide" width="120"/>
-      <el-table-column label="高度(mm)" align="right" prop="hight" width="120"/>
-      <el-table-column label="体积(m³)" align="right" prop="volume" width="120"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
-<!--      <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> &lt;!&ndash; 货位类型名称 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
-      <el-table-column label="货位状态" align="center" prop="cargoStatus" width="120">
+<!--      <el-table-column label="入库班组ID" align="center" prop="inClassId" />-->
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="仓库名称" align="center" prop="warehouseName" />-->
+<!--      <el-table-column label="仓库地址" align="center" prop="address" />-->
+<!--      <el-table-column label="仓库描述" align="center" prop="cDesc" />-->
+<!--      <el-table-column label="仓库级别" align="center" prop="warehouseKind" />-->
+<!--      <el-table-column label="仓库类型" align="center" prop="warehouseType" />-->
+<!--      <el-table-column label="是否可用" align="center" prop="isCurrent">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_available" :value="scope.row.isCurrent"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+      <el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
+      <!--      <el-table-column label="货区id" align="center" prop="cargoAreaId" />-->
+      <!--      <el-table-column label="货位类型" align="center" prop="theType" />-->
+      <!--      <el-table-column label="货位类型名称" align="center" prop="theTypeName" />-->
+      <!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
+      <!--      <el-table-column label="列" align="center" prop="theColumn" />-->
+      <!--      <el-table-column label="层" align="center" prop="theFloor" />-->
+      <el-table-column width="120" label="货位状态" align="center" prop="cargoStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否锁定" align="center" prop="locked" width="120">
+      <el-table-column width="120" label="是否锁定" align="center" prop="locked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
-<!--      <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--      <el-table-column label="货位高度" align="center" prop="cargoHight" />-->
+      <!--      <el-table-column label="是否双伸" align="center" prop="issDouble" />-->
+      <!--      <el-table-column label="双货位分组编码" align="center" prop="groupCodingNo" />-->
+      <!--      <el-table-column label="双货位分组编码1" align="center" prop="groupCoding" />-->
+      <!--      <el-table-column label="双货位标识" align="center" prop="cargoSpaceLogo" />-->
+      <!--      <el-table-column label="本仓库区域" align="center" prop="thisCargoArea" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="120" label="品号" align="left" prop="productId" />
+      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="120" label="规格" align="left" prop="spec" />
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
+
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -202,11 +899,31 @@
     <!-- 添加或修改安全库存查询对话框 -->
     <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="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存号" />
+        <el-form-item label="库存ID" prop="stockId">
+          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
         </el-form-item>
-        <el-form-item label="货位编号" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
+        <el-form-item label="货位ID" prop="cargoSpaceId">
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
+        </el-form-item>
+        <el-form-item label="库存状态" prop="stockStatus">
+          <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
+            <el-option
+              v-for="dict in dict.type.stock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料状态" prop="productStatus">
+          <el-select v-model="form.productStatus" 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="请输入批次号" />
@@ -217,50 +934,45 @@
         <el-form-item label="回流时间" prop="backDate">
           <el-input v-model="form.backDate" placeholder="请输入回流时间" />
         </el-form-item>
-        <el-form-item label="物料GUID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        <el-form-item label="库存数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
         </el-form-item>
-        <el-form-item label="作业号" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业号" />
+        <el-form-item label="作业ID" prop="jobId">
+          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
         </el-form-item>
-        <el-form-item label="托盘号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘号" />
+        <el-form-item label="托盘条码" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
         </el-form-item>
-        <el-form-item label="入库单号" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库单号" />
+        <el-form-item label="出库数量" prop="outQuantity">
+          <el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
         </el-form-item>
-        <el-form-item label="入库主单号" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入入库主单号" />
+        <el-form-item label="入库子单ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
         </el-form-item>
-        <el-form-item label="入库班组编号" prop="inClassId">
-          <el-input v-model="form.inClassId" placeholder="请输入入库班组编号" />
+        <el-form-item label="入库主单" prop="stockinId">
+          <el-input v-model="form.stockinId" placeholder="请输入入库主单" />
         </el-form-item>
-        <el-form-item label="仓库编号" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库编号" />
+        <el-form-item label="入库类型" prop="inType">
+          <el-select v-model="form.inType" placeholder="请选择入库类型">
+            <el-option
+              v-for="dict in dict.type.in_job_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="垛型编号" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入垛型编号" />
+        <el-form-item label="入库班组ID" prop="inClassId">
+          <el-input v-model="form.inClassId" placeholder="请输入入库班组ID" />
         </el-form-item>
-        <el-form-item label="库存预警标识" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入库存预警标识" />
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </el-form-item>
-<!--        <el-form-item label="备用字段2" prop="spare2">-->
-<!--          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备用字段3" prop="spare3">-->
-<!--          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备用字段4" prop="spare4">-->
-<!--          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备用字段5" prop="spare5">-->
-<!--          <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备用字段6" prop="spare6">-->
-<!--          <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="物料ID" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料ID" />
+        <el-form-item label="垛型ID" prop="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
         <el-form-item label="仓库地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入仓库地址" />
@@ -271,38 +983,162 @@
         <el-form-item label="仓库级别" prop="warehouseKind">
           <el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
         </el-form-item>
+        <el-form-item label="仓库类型" prop="warehouseType">
+          <el-input v-model="form.warehouseType" placeholder="请输入仓库类型" />
+        </el-form-item>
         <el-form-item label="是否可用" prop="isCurrent">
-          <el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
+          <el-select v-model="form.isCurrent" placeholder="请选择是否可用">
+            <el-option
+              v-for="dict in dict.type.is_available"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
+        <el-form-item label="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
         </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" 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="enName">
-          <el-input v-model="form.enName" placeholder="请输入英文名称" />
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="单件净重" prop="weight">
-          <el-input v-model="form.weight" placeholder="请输入单件净重" />
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="长MM" prop="longMM">
-          <el-input v-model="form.longMM" placeholder="请输入长MM" />
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
         </el-form-item>
-        <el-form-item label="宽MM" prop="wide">
-          <el-input v-model="form.wide" placeholder="请输入宽MM" />
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
         </el-form-item>
-        <el-form-item label="高MM" prop="hight">
-          <el-input v-model="form.hight" placeholder="请输入高MM" />
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入序列号" />
         </el-form-item>
-        <el-form-item label="体积m³" prop="volume">
-          <el-input v-model="form.volume" placeholder="请输入体积m³" />
+        <el-form-item label="电压" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入电压" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="功率" prop="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
         </el-form-item>
         <el-form-item label="货位名称" prop="cargoSpaceName">
           <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
@@ -310,8 +1146,8 @@
         <el-form-item label="巷道ID" prop="roadwayId">
           <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
         </el-form-item>
-        <el-form-item label="货区ID" prop="cargoAreaId">
-          <el-input v-model="form.cargoAreaId" placeholder="请输入货区ID" />
+        <el-form-item label="货区id" prop="cargoAreaId">
+          <el-input v-model="form.cargoAreaId" placeholder="请输入货区id" />
         </el-form-item>
         <el-form-item label="货位类型名称" prop="theTypeName">
           <el-input v-model="form.theTypeName" placeholder="请输入货位类型名称" />
@@ -325,8 +1161,28 @@
         <el-form-item label="层" prop="theFloor">
           <el-input v-model="form.theFloor" placeholder="请输入层" />
         </el-form-item>
+        <el-form-item label="货位状态" prop="cargoStatus">
+          <el-select v-model="form.cargoStatus" placeholder="请选择货位状态">
+            <el-option
+              v-for="dict in dict.type.cargo_space_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否锁定" prop="locked">
-          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
+          <el-select v-model="form.locked" placeholder="请选择是否锁定">
+            <el-option
+              v-for="dict in dict.type.cargo_space_lock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="货位高度" prop="cargoHight">
+          <el-input v-model="form.cargoHight" placeholder="请输入货位高度" />
         </el-form-item>
         <el-form-item label="是否双伸" prop="issDouble">
           <el-input v-model="form.issDouble" placeholder="请输入是否双伸" />
@@ -334,8 +1190,8 @@
         <el-form-item label="双货位分组编码" prop="groupCodingNo">
           <el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
         </el-form-item>
-        <el-form-item label="双货位分组编码" prop="groupCoding">
-          <el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码" />
+        <el-form-item label="双货位分组编码1" prop="groupCoding">
+          <el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码1" />
         </el-form-item>
         <el-form-item label="双货位标识" prop="cargoSpaceLogo">
           <el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识" />
@@ -345,8 +1201,8 @@
         </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>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -354,17 +1210,14 @@
 
 <script>
 import { listViewStockSecure, getViewStockSecure, delViewStockSecure, addViewStockSecure, updateViewStockSecure } from "@/api/search/ViewStockSecure"
-import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockSecure",
-  dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
+  dicts: ['in_job_type', 'product_status', 'cargo_space_status', 'cargo_space_lock_status', 'stock_status', 'is_available'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -392,7 +1245,6 @@ export default {
         lotNo: null,
         inDate: null,
         backDate: null,
-        productGuid: null,
         quantity: null,
         jobId: null,
         trayCode: null,
@@ -403,29 +1255,60 @@ export default {
         inClassId: null,
         warehouseId: null,
         stackingId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null,
-        productId: null,
         warehouseName: null,
         address: null,
         cDesc: null,
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
         price: null,
+        cargoNo: null,
         unit: null,
         spec: null,
-        enName: null,
-        weight: null,
-        longMM: null,
-        wide: null,
-        hight: null,
-        volume: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
         productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -448,27 +1331,15 @@ export default {
       // 表单校验
       rules: {
         stockId: [
-          { required: true, message: "库存号不能为空", trigger: "blur" }
+          { 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
@@ -493,7 +1364,6 @@ export default {
         lotNo: null,
         inDate: null,
         backDate: null,
-        productGuid: null,
         quantity: null,
         jobId: null,
         trayCode: null,
@@ -504,29 +1374,60 @@ export default {
         inClassId: null,
         warehouseId: null,
         stackingId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null,
-        productId: null,
         warehouseName: null,
         address: null,
         cDesc: null,
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
         price: null,
+        cargoNo: null,
         unit: null,
         spec: null,
-        enName: null,
-        weight: null,
-        longMM: null,
-        wide: null,
-        hight: null,
-        volume: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
         productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -566,7 +1467,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '新增安全库存查询'
+      this.title = "添加安全库存查询"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -575,7 +1476,7 @@ export default {
       getViewStockSecure(stockId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改安全库存查询'
+        this.title = "修改安全库存查询"
       })
     },
     /** 提交按钮 */
@@ -584,13 +1485,13 @@ export default {
         if (valid) {
           if (this.form.stockId != null) {
             updateViewStockSecure(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             addViewStockSecure(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -605,14 +1506,14 @@ export default {
         return delViewStockSecure(stockIds)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess('删除成功')
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('search/ViewStockSecure/export', {
         ...this.queryParams
-      }, `安全库存查询_${new Date().getTime()}.xlsx`)
+      }, `ViewStockSecure_${new Date().getTime()}.xlsx`)
     }
   }
 }
diff --git a/ruoyi-ui/src/views/search/ViewStockWarning/index.vue b/ruoyi-ui/src/views/search/ViewStockWarning/index.vue
index 2d5b2cc..7e97230 100644
--- a/ruoyi-ui/src/views/search/ViewStockWarning/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockWarning/index.vue
@@ -1,47 +1,717 @@
 <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="库存ID" prop="stockId">-->
+      <el-form-item label="库存ID" prop="stockId">
+        <el-input
+          v-model="queryParams.stockId"
+          placeholder="请输入库存ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.stockId"-->
-<!--          placeholder="请输入库存ID"-->
+<!--          v-model="queryParams.cargoSpaceId"-->
+<!--          placeholder="请输入货位ID"-->
+<!--          clearable-->
+<!--          @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="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="productStatus">-->
+<!--        <el-select v-model="queryParams.productStatus" 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="inDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.inDate"-->
+<!--          placeholder="请输入入库时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="回流时间" prop="backDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.backDate"-->
+<!--          placeholder="请输入回流时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </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="作业ID" prop="jobId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.jobId"-->
+<!--          placeholder="请输入作业ID"-->
+<!--          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="outQuantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.outQuantity"-->
+<!--          placeholder="请输入出库数量"-->
+<!--          clearable-->
+<!--          @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="入库子单ID" prop="stockinDetailId">
+        <el-input
+          v-model="queryParams.stockinDetailId"
+          placeholder="请输入入库子单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="入库类型" prop="inType">
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
+          <el-option
+            v-for="dict in dict.type.in_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="入库班组ID" prop="inClassId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.inClassId"-->
+<!--          placeholder="请输入入库班组ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="垛型ID" prop="stackingId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stackingId"-->
+<!--          placeholder="请输入垛型ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库名称" prop="warehouseName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseName"-->
+<!--          placeholder="请输入仓库名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库地址" prop="address">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.address"-->
+<!--          placeholder="请输入仓库地址"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库描述" prop="cDesc">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cDesc"-->
+<!--          placeholder="请输入仓库描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库级别" prop="warehouseKind">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseKind"-->
+<!--          placeholder="请输入仓库级别"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库类型" prop="warehouseType">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseType"-->
+<!--          placeholder="请输入仓库类型"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否可用" prop="isCurrent">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.isCurrent"-->
+<!--          placeholder="请输入是否可用"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="物料GUID" prop="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料GUID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="品号" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品名" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          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="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="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="型号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          placeholder="请输入功率"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
 
-      <el-form-item label="仓库名称" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="物料编号" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="物料名称" prop="productName">
-        <el-input
-          v-model="queryParams.productName"
-          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="spare8">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="插头" prop="spare11">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
+<!--          placeholder="请输入品牌"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          placeholder="请输入包装材积"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位名称" prop="cargoSpaceName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceName"-->
+<!--          placeholder="请输入货位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="巷道id" prop="roadwayId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.roadwayId"-->
+<!--          placeholder="请输入巷道id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货区id" prop="cargoAreaId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoAreaId"-->
+<!--          placeholder="请输入货区id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位类型" prop="theType">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theType"-->
+<!--          placeholder="请输入货位类型"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位类型名称" prop="theTypeName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theTypeName"-->
+<!--          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="theFloor">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.theFloor"-->
+<!--          placeholder="请输入层"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位状态" prop="cargoStatus">-->
+<!--        <el-select v-model="queryParams.cargoStatus" 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="locked">-->
+<!--        <el-select v-model="queryParams.locked" placeholder="请选择是否锁定" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.cargo_space_lock_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位高度" prop="cargoHight">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoHight"-->
+<!--          placeholder="请输入货位高度"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否双伸" prop="issDouble">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.issDouble"-->
+<!--          placeholder="请输入是否双伸"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位分组编码" prop="groupCodingNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupCodingNo"-->
+<!--          placeholder="请输入双货位分组编码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位分组编码1" prop="groupCoding">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupCoding"-->
+<!--          placeholder="请输入双货位分组编码1"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="双货位标识" prop="cargoSpaceLogo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cargoSpaceLogo"-->
+<!--          placeholder="请输入双货位标识"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="本仓库区域" prop="thisCargoArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.thisCargoArea"-->
+<!--          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>
 
@@ -86,109 +756,140 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewStockWarning:export']"
-        >导出Excel</el-button>
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange" max-height="700">
+    <el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120" />
-      <el-table-column label="库存号" align="left" prop="stockId" width="120" />
-      <el-table-column label="货位编号" align="left" prop="cargoSpaceId" width="120" />
-      <el-table-column label="库存状态" align="center" prop="stockStatus" width="120" >
+      <el-table-column width="120" label="库存ID" align="left" prop="stockId" />
+<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+      <el-table-column width="120" 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="productStatus" width="120" >
+      <el-table-column width="120" label="物料状态" align="center" prop="productStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="批次号" align="center" prop="lotNo" />-->
-      <el-table-column width=120 label="入库时间" align="left" prop="inDate" />
-      <!--      <el-table-column label="回流时间" align="center" prop="backDate" />-->
-      <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column width=120 label="库存数量(件)" align="right" prop="quantity" />
-      <el-table-column width=120 label="作业号" align="left" prop="jobId" />
-      <el-table-column width=120 label="托盘号" align="left" prop="trayCode" />
-      <!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
-      <el-table-column width=120 label="入库单号" align="left" prop="stockinDetailId" />
-      <el-table-column width=120 label="入库主单号" align="left" prop="stockinId" />
-      <el-table-column width=120 label="入库类型" align="center" prop="inType" >
+      <el-table-column width="120" label="批次号" align="left" prop="lotNo" />
+      <el-table-column width="120" label="入库时间" align="left" prop="inDate" />
+      <el-table-column width="120" label="回流时间" align="left" prop="backDate" />
+      <el-table-column width="120" label="库存数量" align="right" prop="quantity" />
+      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+<!--      <el-table-column label="托盘条码" align="center" prop="trayCode" />-->
+<!--      <el-table-column width="120" label="出库数量" align="left" prop="outQuantity" />-->
+      <el-table-column width="120" label="入库主单" align="left" prop="stockinId" />
+      <el-table-column width="120" label="入库子单ID" align="left" prop="stockinDetailId" />
+      <el-table-column width="120" label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
-      <!--      <el-table-column label="备用字段2" align="center" prop="spare2" />-->
-      <!--      <el-table-column label="备用字段3" align="center" prop="spare3" />-->
-      <!--      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
-      <!--      <el-table-column label="备用字段5" align="center" prop="spare5" />-->
-      <!--      <el-table-column label="备用字段6" align="center" prop="spare6" />-->
-      <el-table-column width=120 label="物料编号" align="left" prop="productId" />
-      <el-table-column width=120 label="物料名称" align="left" prop="productName" />
-      <el-table-column width=120 label="英文名称" align="left" prop="enName" />
-      <!--      <el-table-column label="仓库地址" align="center" prop="address" />-->
-      <!--      <el-table-column label="仓库描述" align="center" prop="cDesc" />-->
-      <!--      <el-table-column label="仓库级别" align="center" prop="warehouseKind" />-->
-      <!--      <el-table-column label="仓库类型" align="center" prop="warehouseType" />-->
-      <!--      <el-table-column label="是否可用" align="center" prop="isCurrent" />-->
-      <el-table-column width=120 label="单价(元)" align="right" prop="price" />
-      <el-table-column width=120 label="计量单位" align="left" prop="unit" />
-      <!--      <el-table-column label="规格" align="center" prop="spec" />-->
-
-      <el-table-column width=120 label="单件净重(kg)" align="right" prop="weight" />
-      <el-table-column width=120 label="长度(mm)" align="right" prop="longMM" />
-      <el-table-column width=120 label="宽度(mm)" align="right" prop="wide" />
-      <el-table-column width=120 label="高度(mm)" align="right" prop="hight" />
-      <el-table-column width=120 label="体积(m³)" align="right" prop="volume" />
-      <el-table-column width=120 label="货位名称" align="left" prop="cargoSpaceName" />
-      <!--      <el-table-column label="巷道ID" align="center" prop="roadwayId" />-->
-      <!--      <el-table-column label="货区ID" align="center" prop="cargoAreaId" />-->
+<!--      <el-table-column label="入库班组ID" align="center" prop="inClassId" />-->
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
+<!--      <el-table-column label="仓库名称" align="center" prop="warehouseName" />-->
+<!--      <el-table-column label="仓库地址" align="center" prop="address" />-->
+<!--      <el-table-column label="仓库描述" align="center" prop="cDesc" />-->
+<!--      <el-table-column label="仓库级别" align="center" prop="warehouseKind" />-->
+<!--      <el-table-column label="仓库类型" align="center" prop="warehouseType" />-->
+<!--      <el-table-column label="是否可用" align="center" prop="isCurrent" />-->
+      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+      <el-table-column width="120" label="巷道id" align="left" prop="roadwayId" />
+      <!--      <el-table-column label="货区id" align="center" prop="cargoAreaId" />-->
       <!--      <el-table-column label="货位类型" align="center" prop="theType" />-->
       <!--      <el-table-column label="货位类型名称" align="center" prop="theTypeName" />-->
       <!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
       <!--      <el-table-column label="列" align="center" prop="theColumn" />-->
       <!--      <el-table-column label="层" align="center" prop="theFloor" />-->
-      <el-table-column width=120 label="货位状态" align="center" prop="cargoStatus" >
+      <el-table-column width="120" label="货位状态" align="center" prop="cargoStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
         </template>
       </el-table-column>
-      <el-table-column width=120 label="是否锁定" align="center" prop="locked" >
+      <el-table-column width="120" label="是否锁定" align="center" prop="locked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
-      <!--      <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
-      <!--      <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:ViewStockSecure:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['search:ViewStockSecure:remove']"-->
-      <!--          >删除</el-button>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+      <!--      <el-table-column label="货位高度" align="center" prop="cargoHight" />-->
+      <!--      <el-table-column label="是否双伸" align="center" prop="issDouble" />-->
+      <!--      <el-table-column label="双货位分组编码" align="center" prop="groupCodingNo" />-->
+      <!--      <el-table-column label="双货位分组编码1" align="center" prop="groupCoding" />-->
+      <!--      <el-table-column label="双货位标识" align="center" prop="cargoSpaceLogo" />-->
+      <!--      <el-table-column label="本仓库区域" align="center" prop="thisCargoArea" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="120" label="品号" align="left" prop="productId" />
+      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="120" label="规格" align="left" prop="spec" />
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
+
+
+<!--      <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:ViewStockWarning:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['search:ViewStockWarning:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -199,14 +900,34 @@
       @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="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存号" />
+        <el-form-item label="库存ID" prop="stockId">
+          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
         </el-form-item>
-        <el-form-item label="货位编号" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
+        <el-form-item label="货位ID" prop="cargoSpaceId">
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
+        </el-form-item>
+        <el-form-item label="库存状态" prop="stockStatus">
+          <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
+            <el-option
+              v-for="dict in dict.type.stock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料状态" prop="productStatus">
+          <el-select v-model="form.productStatus" 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="请输入批次号" />
@@ -217,104 +938,216 @@
         <el-form-item label="回流时间" prop="backDate">
           <el-input v-model="form.backDate" placeholder="请输入回流时间" />
         </el-form-item>
-        <el-form-item label="物料GUID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        <el-form-item label="库存数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
         </el-form-item>
-        <el-form-item label="作业号" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业号" />
+        <el-form-item label="作业ID" prop="jobId">
+          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
         </el-form-item>
-        <el-form-item label="托盘号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘号" />
+        <el-form-item label="托盘条码" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
         </el-form-item>
-        <el-form-item label="入库单号" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库单号" />
+        <el-form-item label="出库数量" prop="outQuantity">
+          <el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
         </el-form-item>
-        <el-form-item label="入库主单号" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入入库主单号" />
+        <el-form-item label="入库子单ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
         </el-form-item>
-        <el-form-item label="入库班组编号" prop="inClassId">
-          <el-input v-model="form.inClassId" placeholder="请输入入库班组编号" />
+        <el-form-item label="入库主单" prop="stockinId">
+          <el-input v-model="form.stockinId" placeholder="请输入入库主单" />
         </el-form-item>
-        <el-form-item label="仓库编号" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库编号" />
+        <el-form-item label="入库类型" prop="inType">
+          <el-select v-model="form.inType" placeholder="请选择入库类型">
+            <el-option
+              v-for="dict in dict.type.in_job_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="垛型编号" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入垛型编号" />
+        <el-form-item label="入库班组ID" prop="inClassId">
+          <el-input v-model="form.inClassId" placeholder="请输入入库班组ID" />
         </el-form-item>
-        <el-form-item label="库存预警标识" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入库存预警标识" />
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </el-form-item>
-<!--        <el-form-item label="${comment}" prop="spare2">-->
-<!--          <el-input v-model="form.spare2" placeholder="请输入${comment}" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="${comment}" prop="spare3">-->
-<!--          <el-input v-model="form.spare3" placeholder="请输入${comment}" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="${comment}" prop="spare4">-->
-<!--          <el-input v-model="form.spare4" placeholder="请输入${comment}" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="${comment}" prop="spare5">-->
-<!--          <el-input v-model="form.spare5" placeholder="请输入${comment}" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="${comment}" prop="spare6">-->
-<!--          <el-input v-model="form.spare6" placeholder="请输入${comment}" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="物料编号(SKU)" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
+        <el-form-item label="垛型ID" prop="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
         </el-form-item>
         <el-form-item label="仓库名称" prop="warehouseName">
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
+        <el-form-item label="仓库地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入仓库地址" />
         </el-form-item>
         <el-form-item label="仓库描述" prop="cDesc">
           <el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
         </el-form-item>
-        <el-form-item label="仓库类型" prop="warehouseKind">
-          <el-input v-model="form.warehouseKind" placeholder="请输入仓库类型" />
+        <el-form-item label="仓库级别" prop="warehouseKind">
+          <el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
         </el-form-item>
-        <el-form-item label="是否当前" prop="isCurrent">
-          <el-input v-model="form.isCurrent" placeholder="请输入是否当前" />
+        <el-form-item label="仓库类型" prop="warehouseType">
+          <el-input v-model="form.warehouseType" placeholder="请输入仓库类型" />
         </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价(元)" />
+        <el-form-item label="是否可用" prop="isCurrent">
+          <el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
         </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位(件/箱/包)" />
+        <el-form-item label="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        </el-form-item>
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" 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="enName">
-          <el-input v-model="form.enName" placeholder="请输入英文名称" />
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="净重" prop="weight">
-          <el-input v-model="form.weight" placeholder="请输入净重" />
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="长度(mm)" prop="longMM">
-          <el-input v-model="form.longMM" placeholder="请输入长度(mm)" />
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
         </el-form-item>
-        <el-form-item label="宽度(mm)" prop="wide">
-          <el-input v-model="form.wide" placeholder="请输入宽度(mm)" />
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
         </el-form-item>
-        <el-form-item label="高度(mm)" prop="hight">
-          <el-input v-model="form.hight" placeholder="请输入高度(mm)" />
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入序列号" />
         </el-form-item>
-        <el-form-item label="体积(m³)" prop="volume">
-          <el-input v-model="form.volume" placeholder="请输入体积(m³)" />
+        <el-form-item label="电压" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入电压" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="功率" prop="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
         </el-form-item>
         <el-form-item label="货位名称" prop="cargoSpaceName">
           <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
         </el-form-item>
-        <el-form-item label="巷道号" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道号" />
+        <el-form-item label="巷道id" prop="roadwayId">
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道id" />
         </el-form-item>
-        <el-form-item label="货区编号" prop="cargoAreaId">
-          <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" />
+        <el-form-item label="货区id" prop="cargoAreaId">
+          <el-input v-model="form.cargoAreaId" placeholder="请输入货区id" />
+        </el-form-item>
+        <el-form-item label="货位类型" prop="theType">
+          <el-input v-model="form.theType" placeholder="请输入货位类型" />
         </el-form-item>
         <el-form-item label="货位类型名称" prop="theTypeName">
           <el-input v-model="form.theTypeName" placeholder="请输入货位类型名称" />
@@ -328,28 +1161,48 @@
         <el-form-item label="层" prop="theFloor">
           <el-input v-model="form.theFloor" placeholder="请输入层" />
         </el-form-item>
+        <el-form-item label="货位状态" prop="cargoStatus">
+          <el-select v-model="form.cargoStatus" placeholder="请选择货位状态">
+            <el-option
+              v-for="dict in dict.type.cargo_space_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否锁定" prop="locked">
-          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
+          <el-select v-model="form.locked" placeholder="请选择是否锁定">
+            <el-option
+              v-for="dict in dict.type.cargo_space_lock_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="是否双深" prop="issDouble">
-          <el-input v-model="form.issDouble" placeholder="请输入是否双深" />
+        <el-form-item label="货位高度" prop="cargoHight">
+          <el-input v-model="form.cargoHight" placeholder="请输入货位高度" />
         </el-form-item>
-        <el-form-item label="分组编号" prop="groupCodingNo">
-          <el-input v-model="form.groupCodingNo" placeholder="请输入分组编号" />
+        <el-form-item label="是否双伸" prop="issDouble">
+          <el-input v-model="form.issDouble" placeholder="请输入是否双伸" />
         </el-form-item>
-        <el-form-item label="分组编码" prop="groupCoding">
-          <el-input v-model="form.groupCoding" placeholder="请输入分组编码" />
+        <el-form-item label="双货位分组编码" prop="groupCodingNo">
+          <el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
         </el-form-item>
-        <el-form-item label="货位标识" prop="cargoSpaceLogo">
-          <el-input v-model="form.cargoSpaceLogo" placeholder="请输入货位标识" />
+        <el-form-item label="双货位分组编码1" prop="groupCoding">
+          <el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码1" />
         </el-form-item>
-        <el-form-item label="所属货区" prop="thisCargoArea">
-          <el-input v-model="form.thisCargoArea" placeholder="请输入所属货区" />
+        <el-form-item label="双货位标识" prop="cargoSpaceLogo">
+          <el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识" />
+        </el-form-item>
+        <el-form-item label="本仓库区域" prop="thisCargoArea">
+          <el-input v-model="form.thisCargoArea" 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>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -357,31 +1210,29 @@
 
 <script>
 import { listViewStockWarning, getViewStockWarning, delViewStockWarning, addViewStockWarning, updateViewStockWarning } from "@/api/search/ViewStockWarning"
-import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "ViewStockWarning",
-  dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
+  dicts: ['in_job_type', 'product_status', 'cargo_space_status', 'cargo_space_lock_status', 'stock_status'],
   data() {
     return {
-      // Loading layer
+      // 遮罩层
       loading: true,
-      // Selected array
+      // 选中数组
       ids: [],
-      warehouseOptions:[],
-      // Single selection disabled
+      // 非单个禁用
       single: true,
-      // Multiple selection disabled
+      // 非多个禁用
       multiple: true,
-      // Show search conditions
+      // 显示搜索条件
       showSearch: true,
-      // Total count
+      // 总条数
       total: 0,
-      // Stock warning report table data
+      // 库存预警查询表格数据
       ViewStockWarningList: [],
-      // Dialog title
-      title: "库存预警报表",
-      // Whether to show dialog
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
@@ -394,7 +1245,6 @@ export default {
         lotNo: null,
         inDate: null,
         backDate: null,
-        productGuid: null,
         quantity: null,
         jobId: null,
         trayCode: null,
@@ -405,29 +1255,60 @@ export default {
         inClassId: null,
         warehouseId: null,
         stackingId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null,
-        productId: null,
         warehouseName: null,
         address: null,
         cDesc: null,
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
         price: null,
+        cargoNo: null,
         unit: null,
         spec: null,
-        enName: null,
-        weight: null,
-        longMM: null,
-        wide: null,
-        hight: null,
-        volume: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
         productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -450,28 +1331,16 @@ export default {
       // 表单校验
       rules: {
         stockId: [
-          { required: true, message: "库存号不能为空", trigger: "blur" }
+          { 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
       listViewStockWarning(this.queryParams).then(response => {
@@ -495,7 +1364,6 @@ export default {
         lotNo: null,
         inDate: null,
         backDate: null,
-        productGuid: null,
         quantity: null,
         jobId: null,
         trayCode: null,
@@ -506,29 +1374,60 @@ export default {
         inClassId: null,
         warehouseId: null,
         stackingId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null,
-        productId: null,
         warehouseName: null,
         address: null,
         cDesc: null,
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
         price: null,
+        cargoNo: null,
         unit: null,
         spec: null,
-        enName: null,
-        weight: null,
-        longMM: null,
-        wide: null,
-        hight: null,
-        volume: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
         productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -568,7 +1467,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "新增库存预警报表"
+      this.title = "添加库存预警查询"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -577,7 +1476,7 @@ export default {
       getViewStockWarning(stockId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改库存预警报表"
+        this.title = "修改库存预警查询"
       })
     },
     /** 提交按钮 */
@@ -603,7 +1502,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm('是否确认删除库存预警报表编号为"' + stockIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除库存预警查询编号为"' + stockIds + '"的数据项？').then(function() {
         return delViewStockWarning(stockIds)
       }).then(() => {
         this.getList()
@@ -614,7 +1513,7 @@ export default {
     handleExport() {
       this.download('search/ViewStockWarning/export', {
         ...this.queryParams
-      }, `库存预警报表_${new Date().getTime()}.xlsx`)
+      }, `ViewStockWarning_${new Date().getTime()}.xlsx`)
     }
   }
 }
diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
index 1287aa6..b582e63 100644
--- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
@@ -1,16 +1,6 @@
 <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="请选择仓库名称" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
 <!--      <el-form-item label="入库单guid" prop="stockinGuid">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockinGuid"-->
@@ -37,6 +27,22 @@
           />
         </el-select>
       </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="createManId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createManId"-->
+<!--          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
@@ -47,59 +53,30 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> &lt;!&ndash; 创建时间 &ndash;&gt;-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.createDate"-->
-<!--          type="date"-->
-<!--          :placeholder="$t('searchViewStockinHistory.selectCreateDate')"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          clearable-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> &lt;!&ndash; 完成时间 &ndash;&gt;-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.finishDate"-->
-<!--          type="date"-->
-<!--          :placeholder="$t('searchViewStockinHistory.selectFinishDate')"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          clearable-->
-<!--        />-->
-<!--      </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="status">-->
-<!--        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.in_bill_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库ID &ndash;&gt;-->
+<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.warehouseId"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputWarehouseId')"-->
+<!--          placeholder="请输入仓库ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-
-<!--      <el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill" style="white-space: nowrap"> &lt;!&ndash; ERP单号 &ndash;&gt;-->
+<!--      <el-form-item label="完成时间" prop="finishDate">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.erpBill"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputErpBill')"-->
+<!--          v-model="queryParams.finishDate"-->
+<!--          placeholder="请输入完成时间"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </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="stockSource">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockSource"-->
@@ -116,18 +93,18 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.supplierNo')" prop="supplierNo" style="white-space: nowrap"> &lt;!&ndash; 供应商编号 &ndash;&gt;-->
+<!--      <el-form-item label="供应商编号" prop="supplierNo">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.supplierNo"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputSupplierNo')"-->
+<!--          placeholder="请输入供应商编号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.supplierName')" prop="supplierName" style="white-space: nowrap"> &lt;!&ndash; 供应商名称 &ndash;&gt;-->
+<!--      <el-form-item label="供应商名称" prop="supplierName">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.supplierName"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputSupplierName')"-->
+<!--          placeholder="请输入供应商名称"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -164,7 +141,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="入库明细ID" prop="stockinDetailId" style="white-space: nowrap">-->
+<!--      <el-form-item label="入库明细ID" prop="stockinDetailId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockinDetailId"-->
 <!--          placeholder="请输入入库明细ID"-->
@@ -172,84 +149,492 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
+<!--      <el-form-item label="批次号" prop="lotNo">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.lotNo"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputLotNo')"-->
+<!--          placeholder="请输入批次号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.printDate')" prop="printDate"> &lt;!&ndash; 入库日期 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
+<!--      <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="quantityX">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.quantityX"-->
+<!--          placeholder="请输入计划箱数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计划件数" prop="quantityJ">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.quantityJ"-->
+<!--          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="assignNumX">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.assignNumX"-->
+<!--          placeholder="请输入实际箱数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="实际件数" prop="assignNumJ">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.assignNumJ"-->
+<!--          placeholder="请输入实际件数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="扫码数量" prop="scanNum">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.scanNum"-->
+<!--          placeholder="请输入扫码数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="扫码箱数" prop="scanNumX">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.scanNumX"-->
+<!--          placeholder="请输入扫码箱数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="扫码件数" prop="scanNumJ">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.scanNumJ"-->
+<!--          placeholder="请输入扫码件数"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="入库日期" prop="printDate">-->
+<!--        <el-input-->
 <!--          v-model="queryParams.printDate"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          :placeholder="$t('searchViewStockinHistory.selectPrintDate')">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>-->
-<!--          <el-option-->
-<!--            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="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入单价"-->
+<!--          placeholder="请输入入库日期"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="备注" prop="remark">-->
+      <el-form-item label="库存状态" prop="stockStatus">
+        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
+          <el-option
+            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="productGuid">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入备注"-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料主键"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料编号" prop="productId">
+      <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号"
+          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="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="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="型号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          placeholder="请输入功率"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="品牌" prop="cargoNo">-->
+<!--      <el-form-item label="相位" prop="spare7">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
+<!--          v-model="queryParams.spare7"-->
+<!--          placeholder="请输入相位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="毛重" prop="spare8">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="插头" prop="spare11">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
 <!--          placeholder="请输入品牌"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="单位" prop="unit">-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入单位"-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockinHistory.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          :placeholder="$t('searchViewStockinHistory.inputSpec')"-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          placeholder="请输入包装材积"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库名称" prop="warehouseName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseName"-->
+<!--          placeholder="请输入仓库名称"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -309,64 +694,97 @@
     <el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="入库单guid" align="center" prop="stockinGuid" />-->
-      <el-table-column label="入库单号" align="left" prop="stockinId" width="120" />
-      <el-table-column label="入库类型" align="left" prop="inType" width="120">
+      <el-table-column label="入库单号" align="left"  prop="stockinId" width="120"/>
+      <el-table-column label="入库子单号" align="left" prop="stockinDetailId"  width="120"/>
+      <el-table-column label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="left" prop="createDate" width="120" />
-      <el-table-column label="创建人" align="left" prop="createManId" width="120" />
-      <el-table-column label="单据状态" align="left" prop="status" width="120">
+      <el-table-column label="创建时间" align="center" prop="createDate" width="150"/>
+<!--      <el-table-column label="创建人" align="center" prop="createManId" />-->
+      <el-table-column 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="left" prop="warehouseId" width="120" />
-      <el-table-column label="完成时间" align="left" prop="finishDate" width="120" />
-      <!-- <el-table-column label="ERP单号" align="left" prop="erpBill" /> -->
-      <el-table-column label="单据来源" align="left" prop="stockSource" width="120" />
-      <el-table-column label="部门编码" align="left" prop="departmentNo" width="120" />
-      <!-- <el-table-column label="班组编码" align="left" prop="classNo" /> -->
-      <el-table-column label="供应商编号" align="left" prop="supplierNo" width="120" />
-      <el-table-column label="供应商名称" align="left" prop="supplierName" width="120" />
-      <el-table-column label="供应商简称" align="left" prop="simpleName" width="120" />
-      <el-table-column label="联系人" align="left" prop="contactName" width="120" />
-      <el-table-column label="联系电话" align="left" prop="contactNumber" width="120" />
-      <el-table-column label="供应商地址" align="left" prop="address" width="120" />
-      <el-table-column label="入库子单号" align="left" prop="stockinDetailId" width="120" />
-      <!-- <el-table-column label="批次号" align="left" prop="lotNo" /> -->
-      <el-table-column label="数量(件)" align="right" prop="quantity" width="120" />
-      <!-- <el-table-column label="数量(箱)" align="right" prop="quantityX" /> -->
-      <!-- <el-table-column label="数量(件)" align="right" prop="quantityJ" /> -->
-      <el-table-column label="分配数量" align="right" prop="assignNum" width="120" />
-      <!-- <el-table-column label="分配数量(箱)" align="right" prop="assignNumX" /> -->
-      <!-- <el-table-column label="分配数量(件)" align="right" prop="assignNumJ" /> -->
-      <el-table-column label="扫描数量" align="right" prop="scanNum" width="120" />
-      <!-- <el-table-column label="扫描数量(箱)" align="right" prop="scanNumX" /> -->
-      <!-- <el-table-column label="扫描数量(件)" align="right" prop="scanNumJ" /> -->
-      <!-- <el-table-column label="入库日期" align="left" prop="printDate" width="180">
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="完成时间" align="center" prop="finishDate" />-->
+      <el-table-column label="ERP单号" align="left" prop="erpBill" width="120"/>
+<!--      <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="supplierNo" />-->
+      <el-table-column label="供应商名称" align="left" prop="supplierName" width="120"/>
+<!--      <el-table-column label="供应商简称" align="center" prop="simpleName" />-->
+<!--      <el-table-column label="联系人" align="center" prop="contactName" />-->
+<!--      <el-table-column label="联系电话" align="center" prop="contactNumber" />-->
+<!--      <el-table-column label="供应商地址" align="center" prop="address" />-->
+<!--      <el-table-column label="批次号" align="center" prop="lotNo" />-->
+<!--      <el-table-column label="计划数量" align="center" prop="quantity" />-->
+<!--      <el-table-column label="计划箱数" align="center" prop="quantityX" />-->
+<!--      <el-table-column label="计划件数" align="center" prop="quantityJ" />-->
+<!--      <el-table-column label="实际数量" align="center" prop="assignNum" />-->
+<!--      <el-table-column label="实际箱数" align="center" prop="assignNumX" />-->
+<!--      <el-table-column label="实际件数" align="center" prop="assignNumJ" />-->
+<!--      <el-table-column label="扫码数量" align="center" prop="scanNum" />-->
+<!--      <el-table-column label="扫码箱数" align="center" prop="scanNumX" />-->
+<!--      <el-table-column label="扫码件数" align="center" prop="scanNumJ" />-->
+<!--      <el-table-column label="入库日期" align="center" prop="printDate" />-->
+      <el-table-column label="库存状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
-      </el-table-column> -->
-<!--      <el-table-column label="库存状态" align="left" 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="left" prop="productId" width="120" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="120" />
-      <el-table-column label="单位" align="left" prop="unit" width="120" />
-      <!-- <el-table-column label="规格" align="left" prop="spec" /> -->
-      <el-table-column label="英文名称" align="left" prop="spare1" width="120" />
-      <el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
-      <el-table-column label="长度(mm)" align="right" prop="spare5" width="120" />
-      <el-table-column label="宽度(mm)" align="right" prop="spare6" width="120" />
-      <el-table-column label="高度(mm)" align="right" prop="spare7" width="120" />
-      <el-table-column label="体积(m³)" align="right" prop="spare8" width="120" />
-      <el-table-column label="单价(元)" align="right" prop="price" width="120" />
-      <el-table-column label="备注" align="left" prop="remark" width="120" />
+      </el-table-column>
+<!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
+      <el-table-column label="物料编码" align="left" prop="productId" width="120"/>
+      <el-table-column label="物料名称" align="left" prop="productName" width="120"/>
+      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
+      <el-table-column label="品号描述" align="left" prop="price" width="120"/>
+      <el-table-column label="英文描述" align="left" prop="cargoNo" width="120"/>
+      <el-table-column label="图号" align="left" prop="unit" width="120"/>
+      <el-table-column label="规格" align="left" prop="spec" width="120"/>
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column label="NC号" align="left" prop="spare9" width="120"/>
+      <el-table-column label="电源线" align="left" prop="spare10" width="120"/>
+      <el-table-column label="插头" align="left" prop="spare11" width="120"/>
+      <el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
+      <el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="120" label="仓库名称" align="left" prop="warehouseName" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -398,8 +816,8 @@
     <!-- 添加或修改入库单据历史对话框 -->
     <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="stockinGuid">
-          <el-input v-model="form.stockinGuid" placeholder="请输入入库子单号" />
+        <el-form-item label="入库单guid" prop="stockinGuid">
+          <el-input v-model="form.stockinGuid" placeholder="请输入入库单guid" />
         </el-form-item>
         <el-form-item label="入库单号" prop="stockinId">
           <el-input v-model="form.stockinId" placeholder="请输入入库单号" />
@@ -410,17 +828,12 @@
               v-for="dict in dict.type.in_job_type"
               :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="创建时间" prop="createDate">
-          <el-date-picker clearable
-            v-model="form.createDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择创建时间">
-          </el-date-picker>
+          <el-input v-model="form.createDate" placeholder="请输入创建时间" />
         </el-form-item>
         <el-form-item label="创建人" prop="createManId">
           <el-input v-model="form.createManId" placeholder="请输入创建人" />
@@ -431,20 +844,15 @@
               v-for="dict in dict.type.in_bill_status"
               :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="仓库编号" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库编号" />
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </el-form-item>
         <el-form-item label="完成时间" prop="finishDate">
-          <el-date-picker clearable
-            v-model="form.finishDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择完成时间">
-          </el-date-picker>
+          <el-input v-model="form.finishDate" placeholder="请输入完成时间" />
         </el-form-item>
         <el-form-item label="ERP单号" prop="erpBill">
           <el-input v-model="form.erpBill" placeholder="请输入ERP单号" />
@@ -453,7 +861,7 @@
           <el-input v-model="form.stockSource" placeholder="请输入单据来源" />
         </el-form-item>
         <el-form-item label="部门编码" prop="departmentNo">
-          <el-input v-model="form.departmentNo" placeholder="请输入部门编码" />
+          <el-input v-model="form.departmentNo" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="班组编码" prop="classNo">
           <el-input v-model="form.classNo" placeholder="请输入班组编码" />
@@ -476,19 +884,41 @@
         <el-form-item label="供应商地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入供应商地址" />
         </el-form-item>
-        <el-form-item label="入库子单号" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单号" />
+        <el-form-item label="入库明细ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" 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="计划数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入计划数量" />
+        </el-form-item>
+        <el-form-item label="计划箱数" prop="quantityX">
+          <el-input v-model="form.quantityX" placeholder="请输入计划箱数" />
+        </el-form-item>
+        <el-form-item label="计划件数" prop="quantityJ">
+          <el-input v-model="form.quantityJ" 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="assignNumX">
+          <el-input v-model="form.assignNumX" placeholder="请输入实际箱数" />
+        </el-form-item>
+        <el-form-item label="实际件数" prop="assignNumJ">
+          <el-input v-model="form.assignNumJ" placeholder="请输入实际件数" />
+        </el-form-item>
+        <el-form-item label="扫码数量" prop="scanNum">
+          <el-input v-model="form.scanNum" placeholder="请输入扫码数量" />
+        </el-form-item>
+        <el-form-item label="扫码箱数" prop="scanNumX">
+          <el-input v-model="form.scanNumX" placeholder="请输入扫码箱数" />
+        </el-form-item>
+        <el-form-item label="扫码件数" prop="scanNumJ">
+          <el-input v-model="form.scanNumJ" placeholder="请输入扫码件数" />
+        </el-form-item>
         <el-form-item label="入库日期" prop="printDate">
-          <el-date-picker clearable
-            v-model="form.printDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择入库日期">
-          </el-date-picker>
+          <el-input v-model="form.printDate" placeholder="请输入入库日期" />
         </el-form-item>
         <el-form-item label="库存状态" prop="stockStatus">
           <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
@@ -496,43 +926,168 @@
               v-for="dict in dict.type.stock_status"
               :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价(元)" />
+        <el-form-item label="物料主键" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料主键" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="物料编码" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料编码" />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
+        <el-form-item label="产品分类" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入产品分类" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <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 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 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="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        </el-form-item>
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
+        </el-form-item>
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" 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="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" placeholder="请输入包装材积" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" 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-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 { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockinHistory",
@@ -541,8 +1096,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -594,52 +1147,70 @@ export default {
         scanNumJ: null,
         printDate: null,
         stockStatus: null,
-        price: null,
-        remark: null,
+        productGuid: null,
         productId: null,
-        productName: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
         unit: null,
-        spec: null
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
+        warehouseName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         stockinGuid: [
-          { required: true, message: "入库子单号不能为空", trigger: "blur" }
+          { required: true, message: "入库单guid不能为空", trigger: "blur" }
         ],
-        productId: [
-          { required: true, message: "物料编号不能为空", trigger: "blur" },
-          { pattern: /^[A-Za-z0-9-]+$/, message: "物料编号只能包含字母、数字和连字符", trigger: "blur" }
-        ],
-        quantity: [
-          { required: true, message: "数量不能为空", trigger: "blur" },
-          { pattern: /^\d+(\.\d{1,2})?$/, message: "数量必须为整数或最多两位小数的正数", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "单位不能为空", trigger: "blur" },
-          { pattern: /^(件|箱|包)$/, message: "单位只能是件、箱或包", 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
@@ -688,13 +1259,55 @@ export default {
         scanNumJ: null,
         printDate: null,
         stockStatus: null,
-        price: null,
-        remark: null,
+        productGuid: null,
         productId: null,
-        productName: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
         unit: null,
-        spec: null
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null,
+        warehouseName: null
       }
       this.resetForm("form")
     },
@@ -716,19 +1329,19 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加入库单据历史";
+      this.reset()
+      this.open = true
+      this.title = "添加入库单据历史"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const stockinGuid = row.stockinGuid || this.ids
       getViewStockinHistory(stockinGuid).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改入库单据历史";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = "修改入库单据历史"
+      })
     },
     /** 提交按钮 */
     submitForm() {
@@ -736,13 +1349,13 @@ export default {
         if (valid) {
           if (this.form.stockinGuid != null) {
             updateViewStockinHistory(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             addViewStockinHistory(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -753,11 +1366,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockinGuids = row.stockinGuid || this.ids
-      this.$modal.confirm('是否确认删除入库单据历史编号为"' + stockinGuids + '"的入库记录？').then(function() {
+      this.$modal.confirm('是否确认删除入库单据历史编号为"' + stockinGuids + '"的数据项？').then(function() {
         return delViewStockinHistory(stockinGuids)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index 2542cd9..811e14c 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -1,149 +1,518 @@
 <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="请选择仓库名称" clearable>
+      <el-form-item label="出库单号" prop="stockoutId">
+        <el-input
+          v-model="queryParams.stockoutId"
+          placeholder="请输入出库单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出库类型" prop="outType">
+        <el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
           <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
+            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="stockoutDetailId">
-        <el-input
-          v-model="queryParams.stockoutDetailId"
-          placeholder="请输入出库子单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.stockoutId')" prop="stockoutId"> &lt;!&ndash; 出库单号 &ndash;&gt;-->
+<!--      <el-form-item label="创建日期" prop="createDate">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.stockoutId"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputStockoutId')"-->
+<!--          v-model="queryParams.createDate"-->
+<!--          placeholder="请输入创建日期"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.outType')" prop="outType"> &lt;!&ndash; 出库类型 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.outType" :placeholder="$t('searchViewStockoutHistory.selectOutType')" 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="$t('searchViewStockoutHistory.createDate')" prop="createDate"> &lt;!&ndash; 创建日期 &ndash;&gt;-->
-<!--        <el-date-picker clearable-->
-<!--          v-model="queryParams.createDate"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.selectCreateDate')">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.createManId')" prop="createManId">-->
+<!--      <el-form-item label="创建人ID" prop="createManId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.createManId"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputCreateManId')"-->
+<!--          placeholder="请输入创建人ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.status')" prop="status"> &lt;!&ndash; 出库状态 &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.status" :placeholder="$t('searchViewStockoutHistory.selectStatus')" 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="$t('searchViewStockoutHistory.stockoutSource')" prop="stockoutSource">-->
+      <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="stockoutSource">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockoutSource"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputStockoutSource')"-->
+<!--          placeholder="请输入出库来源"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.exitId')" prop="exitId"> &lt;!&ndash; 出口类型 &ndash;&gt;-->
+<!--      <el-form-item label="出口" prop="exitId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.exitId"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputExitId')"-->
+<!--          placeholder="请输入出口"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-
-      <el-form-item label="物料编号" prop="productId">
+<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="出库明细ID" prop="stockoutDetailId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockoutDetailId"-->
+<!--          placeholder="请输入出库明细ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </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="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="ERP出库单号" prop="erpStockoutId">
         <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编号(SKU)"
+          v-model="queryParams.erpStockoutId"
+          placeholder="请输入ERP出库单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="客户编号" prop="entryid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.entryid"-->
+<!--          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="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料主键"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="物料编码" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          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="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="remark">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.remark"-->
+<!--          placeholder="请输入描述"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="型号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单件净重" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入单件净重"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="颜色" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="序列号" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          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="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          placeholder="请输入功率"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item :label="$t('basproduct1.englishName')" prop="spare1"> &lt;!&ndash; 英文名称 &ndash;&gt;-->
+<!--      <el-form-item label="相位" prop="spare7">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputEnglishName')"-->
+<!--          v-model="queryParams.spare7"-->
+<!--          placeholder="请输入相位"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.quantity')" prop="quantity"> &lt;!&ndash; 出库数量 &ndash;&gt;-->
+<!--      <el-form-item label="毛重" prop="spare8">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputQuantity')"-->
+<!--          v-model="queryParams.spare8"-->
+<!--          placeholder="请输入毛重"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.allotQuantity')" prop="allotQuantity">-->
+<!--      <el-form-item label="NC号" prop="spare9">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.allotQuantity"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputAllotQuantity')"-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入NC号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.assignNum')" prop="assignNum">-->
+<!--      <el-form-item label="电源线" prop="spare10">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.assignNum"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputAssignNum')"-->
+<!--          v-model="queryParams.spare10"-->
+<!--          placeholder="请输入电源线"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-
-
-<!--      <el-form-item :label="$t('searchViewStockoutHistory.customerName')" prop="customerName"> &lt;!&ndash; 客户名称 &ndash;&gt;-->
+<!--      <el-form-item label="插头" prop="spare11">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.customerName"-->
-<!--          :placeholder="$t('searchViewStockoutHistory.inputCustomerName')"-->
+<!--          v-model="queryParams.spare11"-->
+<!--          placeholder="请输入插头"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-
-<!--      <el-form-item label="单位" prop="unit">-->
+<!--      <el-form-item label="接嘴" prop="spare12">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入单位"-->
+<!--          v-model="queryParams.spare12"-->
+<!--          placeholder="请输入接嘴"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="快捷码" prop="spare13">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare13"-->
+<!--          placeholder="请输入快捷码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位编号" prop="spare14">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare14"-->
+<!--          placeholder="请输入库存单位编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存单位名称" prop="spare15">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare15"-->
+<!--          placeholder="请输入库存单位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品号群组" prop="spare16">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare16"-->
+<!--          placeholder="请输入品号群组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="归类品" prop="spare17">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare17"-->
+<!--          placeholder="请输入归类品"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量体系" prop="spare18">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare18"-->
+<!--          placeholder="请输入计量体系"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="群组名称" prop="spare19">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare19"-->
+<!--          placeholder="请输入群组名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批号管理" prop="spare20">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare20"-->
+<!--          placeholder="请输入批号管理"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="spare21">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare21"-->
+<!--          placeholder="请输入状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品大类" prop="spare22">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare22"-->
+<!--          placeholder="请输入产品大类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品二类" prop="spare23">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare23"-->
+<!--          placeholder="请输入产品二类"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare24"-->
+<!--          placeholder="请输入产品线/产品系列"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="BOM状态" prop="spare25">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare25"-->
+<!--          placeholder="请输入BOM状态"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="产品定位" prop="spare26">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare26"-->
+<!--          placeholder="请输入产品定位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="电脑板型号" prop="spare27">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare27"-->
+<!--          placeholder="请输入电脑板型号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标要求" prop="spare28">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare28"-->
+<!--          placeholder="请输入非标要求"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="品牌" prop="spare29">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare29"-->
+<!--          placeholder="请输入品牌"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="非标颜色" prop="spare30">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare30"-->
+<!--          placeholder="请输入非标颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主颜色" prop="spare31">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare31"-->
+<!--          placeholder="请输入主颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="辅助颜色" prop="spare32">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare32"-->
+<!--          placeholder="请输入辅助颜色"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标准款" prop="spare33">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare33"-->
+<!--          placeholder="请输入是否标准款"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装方式" prop="spare34">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare34"-->
+<!--          placeholder="请输入包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="主要包装方式" prop="spare35">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare35"-->
+<!--          placeholder="请输入主要包装方式"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="长" prop="spare36">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare36"-->
+<!--          placeholder="请输入长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="宽" prop="spare37">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare37"-->
+<!--          placeholder="请输入宽"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="高" prop="spare38">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare38"-->
+<!--          placeholder="请输入高"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="包装材积" prop="spare39">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare39"-->
+<!--          placeholder="请输入包装材积"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -200,30 +569,81 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange" max-height="700">
+    <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width=120 label="出库子单号" align="left" prop="stockoutDetailId" />
-      <el-table-column width=120 label="物料编号(SKU)" align="left" prop="productId" />
-      <el-table-column width=120 label="物料名称" align="left" prop="productName" />
-<!--      <el-table-column label="批号" align="left" prop="lotNo" />-->
-      <el-table-column width=120 label="出口号" align="left" prop="exitId" />
-      <el-table-column width=120 label="出库数量(件)" align="right" prop="quantity" />
-      <el-table-column width=120 label="分配数量(件)" align="right" prop="allotQuantity" />
-      <el-table-column width=120 label="指派数量(件)" align="right" prop="assignNum" />
-<!--      <el-table-column label="ERP出库单号" align="left" prop="erpStockoutId" />-->
-<!--      <el-table-column label="分录号" align="left" prop="entryid" />-->
-      <el-table-column width=120 label="客户名称" align="left" prop="customerName" />
-<!--      <el-table-column label="规格" align="left" prop="spec" />-->
-      <el-table-column width=120 label="单位" align="left" prop="unit" />
-      <el-table-column width=120 label="英文名称" align="left" prop="spare1" />
-      <el-table-column width=120 label="单件净重(kg)" align="right"  prop="spare2" />
-      <el-table-column width=120 label="长度(mm)" align="right" prop="spare5" />
-      <el-table-column width=120 label="宽度(mm)" align="right" prop="spare6" />
-      <el-table-column width=120 label="高度(mm)" align="right" prop="spare7" />
-      <el-table-column width=120 label="体积(m³)" align="right" prop="spare8" />
-      <el-table-column width=120 label="单价(元)" align="right" prop="price" />
-      <el-table-column width=120 label="备注" align="left" prop="remark" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <el-table-column width="120" label="出库单号" align="left" prop="stockoutId" />
+      <el-table-column width="120" label="出库子单号" align="left" prop="stockoutDetailId" />
+      <el-table-column label="出库类型" align="center" prop="outType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建日期" align="center" prop="createDate" width="150"/>
+<!--      <el-table-column label="创建人ID" align="center" prop="createManId" />-->
+      <el-table-column 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="stockoutSource" />-->
+      <el-table-column width="120" label="出口" align="left" prop="exitId" />
+      <el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />
+      <el-table-column width="120" label="批次号" align="left" prop="lotNo" />
+      <el-table-column width="120" label="出库数量" align="right" prop="quantity" />
+      <el-table-column width="120" label="分配数量" align="right" prop="allotQuantity" />
+<!--      <el-table-column label="分配编号" align="center" prop="assignNum" />-->
+      <el-table-column width="120" label="ERP出库单号" align="left" prop="erpStockoutId" />
+<!--      <el-table-column label="客户编号" align="center" prop="entryid" />-->
+      <el-table-column width="120" label="客户名称" align="left" prop="customerName" />
+<!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
+      <el-table-column width="120" label="物料编码" align="left" prop="productId" />
+      <el-table-column width="120" label="物料名称" align="left" prop="productName" />
+      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="120" label="规格" align="left" prop="spec" />
+<!--      <el-table-column label="型号" align="center" prop="spare1" />-->
+<!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
+<!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
+<!--      <el-table-column label="序列号" align="center" prop="spare4" />-->
+<!--      <el-table-column label="电压" align="center" prop="spare5" />-->
+<!--      <el-table-column label="功率" align="center" prop="spare6" />-->
+<!--      <el-table-column label="相位" align="center" prop="spare7" />-->
+<!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
+      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="120" label="描述" align="left" prop="remark" />
+<!--      <el-table-column width="120" label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -268,55 +688,46 @@
           </el-select>
         </el-form-item>
         <el-form-item label="创建日期" prop="createDate">
-          <el-date-picker clearable
-            v-model="form.createDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择创建日期">
-          </el-date-picker>
+          <el-input v-model="form.createDate" placeholder="请输入创建日期" />
         </el-form-item>
-        <el-form-item label="创建人" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人" />
+        <el-form-item label="创建人ID" prop="createManId">
+          <el-input v-model="form.createManId" placeholder="请输入创建人ID" />
         </el-form-item>
         <el-form-item label="出库状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择出库状态">
-            <el-option
+          <el-radio-group v-model="form.status">
+            <el-radio
               v-for="dict in dict.type.out_bill_status"
               :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="出库来源" prop="stockoutSource">
           <el-input v-model="form.stockoutSource" placeholder="请输入出库来源" />
         </el-form-item>
-        <el-form-item label="出口类型" prop="exitId">
-          <el-input v-model="form.exitId" placeholder="请输入出口类型" />
+        <el-form-item label="出口" prop="exitId">
+          <el-input v-model="form.exitId" placeholder="请输入出口" />
         </el-form-item>
-        <el-form-item label="出库单号" prop="stockoutDetailId">
-          <el-input v-model="form.stockoutDetailId" placeholder="请输入出库单号" />
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
         </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 label="出库明细ID" prop="stockoutDetailId">
+          <el-input v-model="form.stockoutDetailId" 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="数量(件)" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入数量" />
+        <el-form-item label="出库数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入出库数量" />
         </el-form-item>
-        <el-form-item label="分配数量(件)" prop="allotQuantity">
+        <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="ERP单号" prop="erpStockoutId">
-          <el-input v-model="form.erpStockoutId" placeholder="请输入ERP单号" />
+        <el-form-item label="ERP出库单ID" prop="erpStockoutId">
+          <el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
         </el-form-item>
         <el-form-item label="客户编号" prop="entryid">
           <el-input v-model="form.entryid" placeholder="请输入客户编号" />
@@ -324,19 +735,154 @@
         <el-form-item label="客户名称" prop="customerName">
           <el-input v-model="form.customerName" placeholder="请输入客户名称" />
         </el-form-item>
+        <el-form-item label="物料主键" prop="productGuid">
+          <el-input v-model="form.productGuid" 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="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="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入品牌" />
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入描述" />
         </el-form-item>
-        <el-form-item label="计量单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入计量单位" />
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        </el-form-item>
+        <el-form-item label="单件净重" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
+        </el-form-item>
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
+        </el-form-item>
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" 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="spare6">
+          <el-input v-model="form.spare6" 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="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
+        </el-form-item>
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="NC号" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入NC号" />
+        </el-form-item>
+        <el-form-item label="电源线" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        </el-form-item>
+        <el-form-item label="插头" prop="spare11">
+          <el-input v-model="form.spare11" placeholder="请输入插头" />
+        </el-form-item>
+        <el-form-item label="接嘴" prop="spare12">
+          <el-input v-model="form.spare12" placeholder="请输入接嘴" />
+        </el-form-item>
+        <el-form-item label="快捷码" prop="spare13">
+          <el-input v-model="form.spare13" placeholder="请输入快捷码" />
+        </el-form-item>
+        <el-form-item label="库存单位编号" prop="spare14">
+          <el-input v-model="form.spare14" placeholder="请输入库存单位编号" />
+        </el-form-item>
+        <el-form-item label="库存单位名称" prop="spare15">
+          <el-input v-model="form.spare15" placeholder="请输入库存单位名称" />
+        </el-form-item>
+        <el-form-item label="品号群组" prop="spare16">
+          <el-input v-model="form.spare16" placeholder="请输入品号群组" />
+        </el-form-item>
+        <el-form-item label="归类品" prop="spare17">
+          <el-input v-model="form.spare17" placeholder="请输入归类品" />
+        </el-form-item>
+        <el-form-item label="计量体系" prop="spare18">
+          <el-input v-model="form.spare18" placeholder="请输入计量体系" />
+        </el-form-item>
+        <el-form-item label="群组名称" prop="spare19">
+          <el-input v-model="form.spare19" placeholder="请输入群组名称" />
+        </el-form-item>
+        <el-form-item label="批号管理" prop="spare20">
+          <el-input v-model="form.spare20" placeholder="请输入批号管理" />
+        </el-form-item>
+        <el-form-item label="状态" prop="spare21">
+          <el-input v-model="form.spare21" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="产品大类" prop="spare22">
+          <el-input v-model="form.spare22" placeholder="请输入产品大类" />
+        </el-form-item>
+        <el-form-item label="产品二类" prop="spare23">
+          <el-input v-model="form.spare23" placeholder="请输入产品二类" />
+        </el-form-item>
+        <el-form-item label="产品线/产品系列" prop="spare24">
+          <el-input v-model="form.spare24" placeholder="请输入产品线/产品系列" />
+        </el-form-item>
+        <el-form-item label="BOM状态" prop="spare25">
+          <el-input v-model="form.spare25" placeholder="请输入BOM状态" />
+        </el-form-item>
+        <el-form-item label="产品定位" prop="spare26">
+          <el-input v-model="form.spare26" placeholder="请输入产品定位" />
+        </el-form-item>
+        <el-form-item label="电脑板型号" prop="spare27">
+          <el-input v-model="form.spare27" placeholder="请输入电脑板型号" />
+        </el-form-item>
+        <el-form-item label="非标要求" prop="spare28">
+          <el-input v-model="form.spare28" placeholder="请输入非标要求" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="spare29">
+          <el-input v-model="form.spare29" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="非标颜色" prop="spare30">
+          <el-input v-model="form.spare30" placeholder="请输入非标颜色" />
+        </el-form-item>
+        <el-form-item label="主颜色" prop="spare31">
+          <el-input v-model="form.spare31" placeholder="请输入主颜色" />
+        </el-form-item>
+        <el-form-item label="辅助颜色" prop="spare32">
+          <el-input v-model="form.spare32" placeholder="请输入辅助颜色" />
+        </el-form-item>
+        <el-form-item label="是否标准款" prop="spare33">
+          <el-input v-model="form.spare33" placeholder="请输入是否标准款" />
+        </el-form-item>
+        <el-form-item label="包装方式" prop="spare34">
+          <el-input v-model="form.spare34" placeholder="请输入包装方式" />
+        </el-form-item>
+        <el-form-item label="主要包装方式" prop="spare35">
+          <el-input v-model="form.spare35" placeholder="请输入主要包装方式" />
+        </el-form-item>
+        <el-form-item label="长" prop="spare36">
+          <el-input v-model="form.spare36" placeholder="请输入长" />
+        </el-form-item>
+        <el-form-item label="宽" prop="spare37">
+          <el-input v-model="form.spare37" placeholder="请输入宽" />
+        </el-form-item>
+        <el-form-item label="高" prop="spare38">
+          <el-input v-model="form.spare38" placeholder="请输入高" />
+        </el-form-item>
+        <el-form-item label="包装材积" prop="spare39">
+          <el-input v-model="form.spare39" 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>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -344,7 +890,6 @@
 
 <script>
 import { listViewStockoutHistory, getViewStockoutHistory, delViewStockoutHistory, addViewStockoutHistory, updateViewStockoutHistory } from "@/api/search/ViewStockoutHistory"
-import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockoutHistory",
@@ -353,8 +898,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -382,9 +925,8 @@ export default {
         status: null,
         stockoutSource: null,
         exitId: null,
+        warehouseId: null,
         stockoutDetailId: null,
-        productId: null,
-        productName: null,
         lotNo: null,
         quantity: null,
         allotQuantity: null,
@@ -392,9 +934,54 @@ export default {
         erpStockoutId: null,
         entryid: null,
         customerName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        unit: null
+        unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null
       },
       // 表单参数
       form: {},
@@ -403,25 +990,25 @@ export default {
         stockoutId: [
           { required: true, message: "出库单号不能为空", trigger: "blur" }
         ],
+        outType: [
+          { required: true, message: "出库类型不能为空", trigger: "change" }
+        ],
+        createDate: [
+          { required: true, message: "创建日期不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "出库状态不能为空", trigger: "change" }
+        ],
+        stockoutDetailId: [
+          { 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
@@ -446,9 +1033,8 @@ export default {
         status: null,
         stockoutSource: null,
         exitId: null,
+        warehouseId: null,
         stockoutDetailId: null,
-        productId: null,
-        productName: null,
         lotNo: null,
         quantity: null,
         allotQuantity: null,
@@ -456,9 +1042,54 @@ export default {
         erpStockoutId: null,
         entryid: null,
         customerName: null,
-        spec: null,
+        productGuid: null,
+        productId: null,
+        parentId: null,
+        price: null,
         cargoNo: null,
-        unit: null
+        unit: null,
+        spec: null,
+        remark: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        productName: null,
+        spare7: null,
+        spare8: null,
+        spare9: null,
+        spare10: null,
+        spare11: null,
+        spare12: null,
+        spare13: null,
+        spare14: null,
+        spare15: null,
+        spare16: null,
+        spare17: null,
+        spare18: null,
+        spare19: null,
+        spare20: null,
+        spare21: null,
+        spare22: null,
+        spare23: null,
+        spare24: null,
+        spare25: null,
+        spare26: null,
+        spare27: null,
+        spare28: null,
+        spare29: null,
+        spare30: null,
+        spare31: null,
+        spare32: null,
+        spare33: null,
+        spare34: null,
+        spare35: null,
+        spare36: null,
+        spare37: null,
+        spare38: null,
+        spare39: null
       }
       this.resetForm("form")
     },