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 02d40d3..d80bcc9 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
@@ -25,234 +25,195 @@ public class StockSummary extends BaseEntity
 //    @Excel(name = "序号")
     private Long onlyIdentity;
 
-    @Excel(name = "订单号")
-    private String orderId;
-    /** 品号 */
-    @Excel(name = "品号")
+    /** 库存id */
+    @Excel(name = "库存id")
+    private String stockId;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
     private String productId;
 
-    /** 品名 */
-    @Excel(name = "品名")
+    /** 物料名称 */
+    @Excel(name = "物料名称")
     private String productName;
 
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 单位 */
-//    @Excel(name = "单位")
-    private String unit;
-
-    /** 批号 */
-    @Excel(name = "批号")
-    private String lotNo;
-
-    /** 仓库 */
-    private String warehouseId;
-//    @Excel(name = "仓库")
-    private String warehouseName;
-
-    @Excel(name = "货位")
-    private String cargoSpaceName;
-
-    /** 巷道 */
-    @Excel(name = "巷道")
-    private String roadwayId;
-
     /** 库存数量 */
     @Excel(name = "库存数量")
-    private Double quantity;
+    private java.math.BigDecimal quantity;
 
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
 
-    /** 价格 */
-//    @Excel(name = "价格")
-    private String price;
+    /** 是否满盘 */
+    @Excel(name = "是否满盘", readConverterExp = "0=否,1=是")
+    private String model;
 
-    /** 产品分类 */
-    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 型号 */
-    @Excel(name = "型号")
-    private String spare1;
-
-    /** 单件净重 */
-    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-    @Excel(name = "功率")
-    private String spare6;
-
-    /** 相位 */
-    @Excel(name = "相位")
+    /** 盘点记录 0-未盘点 1-已盘点 */
+    @Excel(name = "盘点记录", readConverterExp = "0=未盘点,1=已盘点")
     private String spare7;
 
-    /** 毛重 */
-    @Excel(name = "毛重")
+    /** 项目号546 */
+    @Excel(name = "项目号")
+    private String spare4;
+
+    /** 批号546 */
+    @Excel(name = "批号")
+    private String lotNo;
+
+    /** 层级关系546 */
+    @Excel(name = "层级关系")
+    private String spare1;
+
+    /** 上层物料546 */
+    @Excel(name = "上层物料")
+    private String spare2;
+
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料")
+    private String spare3;
+
+    /** 合同号546 */
+    @Excel(name = "合同号")
+    private String spare5;
+
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号")
+    private String spare6;
+
+    /** 供应商编码546 */
+    @Excel(name = "供应商编码")
+    private String voltage;
+
+    /** 供应商名称546 */
+    @Excel(name = "供应商名称")
+    private String stackingId;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号")
+    private String power;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位")
+    private String phase;
+
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
+    /** 货位状态 */
+    @Excel(name = "货位状态",dictType = "cargo_space_status")
+    private String cargoSpaceStatus;
+
+    /** 货位锁 */
+    @Excel(name = "货位锁",dictType = "cargo_space_lock_status")
+    private String locked;
+
+    /** 库存状态 */
+    @Excel(name = "库存状态",dictType = "stock_status")
+    private String stockStatus;
+
+    /** 物料状态 */
+    @Excel(name = "物料状态",dictType = "product_status")
+    private String productStatus;
+
+    /** 货位id */
+//    @Excel(name = "货位id")
+    private String cargoSpaceId;
+
+    /** 入库时间 */
+//    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 回流时间 */
+//    @Excel(name = "回流时间")
+    private String backDate;
+
+    /** 物料GUID */
+//    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 作业ID */
+//    @Excel(name = "作业ID")
+    private String jobId;
+
+    /** 出库数量 */
+//    @Excel(name = "出库数量")
+    private String outQuantity;
+
+    /** 入库子单id */
+//    @Excel(name = "入库子单id")
+    private String stockinDetailId;
+
+    /** 入库主单 */
+//    @Excel(name = "入库主单")
+    private String stockinId;
+
+    /** 入库类型 */
+//    @Excel(name = "入库类型")
+    private String inType;
+
+    /** 入库班组ID */
+//    @Excel(name = "入库班组ID")
+    private String inClassId;
+
+    /** 仓库 */
+//    @Excel(name = "仓库")
+    private String warehouseId;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String netWeight;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String grossWeight;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String distribution;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String orderId;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     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 = "备注")
-    private String remark;
-    private String cargoSpaceId;
 
 
 
 
 
     /** 分组字段控制 */
+    private Boolean groupByStockId;
+    private Boolean groupByCargoSpaceId;
+    private Boolean groupByStockStatus;
+    private Boolean groupByProductStatus;
+    private Boolean groupByLotNo;
+    private Boolean groupByInDate;
+    private Boolean groupByBackDate;
+    private Boolean groupByProductGuid;
+    private Boolean groupByJobId;
+    private Boolean groupByTrayCode;
+    private Boolean groupByOutQuantity;
+    private Boolean groupByStockinDetailId;
+    private Boolean groupByStockinId;
+    private Boolean groupByInType;
+    private Boolean groupByInClassId;
+    private Boolean groupByWarehouseId;
+    private Boolean groupByStackingId;
     private Boolean groupByProductId;
     private Boolean groupByProductName;
+    private Boolean groupByVoltage;
+    private Boolean groupByPower;
+    private Boolean groupByPhase;
     private Boolean groupByOrderId;
-    private Boolean groupBySpec;
-    private Boolean groupByUnit;
-    private Boolean groupByLotNo;
-    private Boolean groupByWarehouseId;
-    private Boolean groupByRoadwayId;
-    private Boolean groupByPrice;
-    private Boolean groupByParentId;
-    private Boolean groupByCargoNo;
+    private Boolean groupByCargoSpaceName;
+    private Boolean groupByCargoSpaceStatus;
+    private Boolean groupByLocked;
     private Boolean groupBySpare1;
     private Boolean groupBySpare2;
     private Boolean groupBySpare3;
@@ -261,38 +222,9 @@ public class StockSummary extends BaseEntity
     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;
-
+    private Boolean groupByNetWeight;
+    private Boolean groupByGrossWeight;
+    private Boolean groupByDistribution;
+    private Boolean groupByModel;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
index f9452a2..22ada7f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
@@ -40,7 +40,6 @@ public class StockSummaryServiceImpl implements IStockSummaryService
      * @return 库存汇总
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
     public List<StockSummary> selectStockSummaryList(StockSummary stockSummary)
     {
         return stockSummaryMapper.selectStockSummaryList(stockSummary);
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 89a024a..7edbc59 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
@@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 入库作业流水Controller
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 @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 92e1c01..3ebecc5 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,118 +1,155 @@
 package com.ruoyi.search.ViewInJobFlow.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
-import java.util.Date;
-
 /**
  * 入库作业流水对象 view_in_job_flow
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public class ViewInJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 作业ID */
-    @Excel(name = "作业ID")
+    /** 任务ID */
+    @Excel(name = "作业编码")
     private String jobId;
 
-    /** 子作业ID */
-    @Excel(name = "子作业ID")
+    /** 子任务ID */
+    @Excel(name = "子作业编码")
     private String jobDetailId;
 
-    /** 作业类型 */
-    @Excel(name = "作业类型",dictType = "in_job_type")
-    private String inOrOut;
+    /** 项目号546 */
+    @Excel(name = "项目号")
+    private String lineId;
 
     /** 任务号 */
     @Excel(name = "任务号")
     private String taskNo;
 
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String lineId;
+    /** 任务类型 */
+    @Excel(name = "任务类型",dictType = "in_job_type")
+    private Long inOrOut;
 
-    /** 品号 */
-    @Excel(name = "品号")
+    /** 物料编码546 */
+    @Excel(name = "物料编码")
     private String productId;
 
-    /** 品名 */
-    @Excel(name = "品名")
+    /** 物料名称546 */
+    @Excel(name = "物料名称")
     private String productName;
 
-    /** 巷道ID */
-    @Excel(name = "巷道ID")
-    private String roadwayId;
-
-    /** 货位名称 */
-    @Excel(name = "货位名称")
-    private String cargoSpaceName;
-
-    /** 状态 */
-    @Excel(name = "状态",dictType = "mydo_job_status")
-    private String status;
-
-    /** 入口ID */
-    @Excel(name = "入口ID")
-    private String entranceId;
-
-    /** 批号 */
-    @Excel(name = "批号")
-    private String lotNo;
-
-    /** 单据ID */
-    @Excel(name = "单据ID")
-    private String inOrOutId;
-
-    /** 子单据ID */
-    @Excel(name = "子单据ID")
-    private String inOrOutDId;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+    /** 托盘码 */
+    @Excel(name = "托盘码")
+    private String trayCode;
 
     /** 入库数量 */
     @Excel(name = "入库数量")
     private String inQuantity;
 
-    /** 托盘号 */
-//    @Excel(name = "托盘号")
-    private String trayCode;
+    /** 入口ID */
+    @Excel(name = "入口ID")
+    private String entranceId;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 层级关系546 */
+    @Excel(name = "层级关系")
+    private String spare1;
+
+    /** 上层物料546 */
+    @Excel(name = "上层物料")
+    private String spare2;
+
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料")
+    private String spare3;
+
+    /** 合同号546 */
+    @Excel(name = "合同号")
+    private String spare5;
+
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号")
+    private String spare6;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号")
+    private String spec;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位")
+    private String unit;
+
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
+    /** 追溯入库单ID */
+    @Excel(name = "追溯入库单ID")
+    private String stockinId;
+
+    /** 追溯入库子单ID */
+    @Excel(name = "追溯入库子单ID")
+    private String stockinDetailId;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierId;
+
+    /** 客户ID */
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    /** 供应商名称546/客户名称546 */
+    @Excel(name = "供应商名称/客户名称")
+    private String stackingId;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+
+    /** 任务状态 */
+//    @Excel(name = "任务状态")
+    private String status;
+
+    /** 上线类型 */
+//    @Excel(name = "上线类型")
+    private String onLineType;
+
+    /** 部门ID */
+//    @Excel(name = "部门ID")
+    private String departmentId;
+
+    /** 巷道ID */
+//    @Excel(name = "巷道ID")
+    private String roadwayId;
 
     /** 货位ID */
 //    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
-    /** 排 */
-//    @Excel(name = "排")
-    private Long thePlatoon;
+    /** 目标巷道ID */
+//    @Excel(name = "目标巷道ID")
+    private String targetRoadwayId;
 
-    /** 列 */
-//    @Excel(name = "列")
-    private Long theColumn;
+    /** 目标货位ID */
+//    @Excel(name = "目标货位ID")
+    private String targetCargoSpaceId;
 
-    /** 层 */
-//    @Excel(name = "层")
-    private Long theFloor;
+    /** 517补码标志 */
+//    @Excel(name = "517补码标志")
+    private String workshopId;
 
     /** 优先级 */
 //    @Excel(name = "优先级")
@@ -122,890 +159,587 @@ public class ViewInJobFlow extends BaseEntity
 //    @Excel(name = "执行阶段")
     private String executionPhase;
 
-    /** 物料ID */
-//    @Excel(name = "物料ID")
-    private String wlbh;
+    /** 出口ID */
+//    @Excel(name = "出口ID")
+    private String exitId;
 
-    /** 垛型ID */
-//    @Excel(name = "垛型ID")
-    private String stackingId;
-
-    /** 库存状态 */
-//    @Excel(name = "库存状态")
-    private String stockStatus;
-
-    /** 开始时间 */
-//    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-//    @Excel(name = "结束时间")
-    private String finishTime;
+    /** 层数 */
+//    @Excel(name = "层数")
+    private String classId;
 
     /** 仓库ID */
 //    @Excel(name = "仓库ID")
     private String warehouseId;
 
+    /** 重分标记 */
+//    @Excel(name = "重分标记")
+    private String faultFlag;
+
+    /** 库存ID */
+//    @Excel(name = "库存ID")
+    private String stockId;
+
+    /** 入库时间 */
+//    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 单据ID */
+//    @Excel(name = "单据ID")
+    private String inOrOutId;
+
+    /** 子单据ID */
+//    @Excel(name = "子单据ID")
+    private String inOrOutDId;
+
     /** 物料GUID */
 //    @Excel(name = "物料GUID")
     private String productGuid;
 
+    /** 库存状态 */
+//    @Excel(name = "库存状态")
+    private String stockStatus;
+
+    /** 库存数量 */
+//    @Excel(name = "库存数量")
+    private String stockQuantity;
+
+    /** 出库数量 */
+//    @Excel(name = "出库数量")
+    private String outQuantity;
 
 
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 型号 */
-    @Excel(name = "型号")
-    private String spare1;
-
-    /** 单件净重 */
-    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-    @Excel(name = "功率")
-    private String spare6;
-
-
-
-    /** 相位 */
-    @Excel(name = "相位")
-    private String spare7;
-
-    /** 毛重 */
-    @Excel(name = "毛重")
-    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 = "描述")
-    private String remark;
-
-
-    public String getJobId() {
-        return jobId;
-    }
-
-    public void setJobId(String jobId) {
+    public void setJobId(String jobId) 
+    {
         this.jobId = jobId;
     }
 
-    public String getJobDetailId() {
-        return jobDetailId;
+    public String getJobId() 
+    {
+        return jobId;
     }
 
-    public void setJobDetailId(String jobDetailId) {
-        this.jobDetailId = jobDetailId;
-    }
-
-    public String getInOrOut() {
-        return inOrOut;
-    }
-
-    public void setInOrOut(String inOrOut) {
-        this.inOrOut = inOrOut;
-    }
-
-    public String getTaskNo() {
-        return taskNo;
-    }
-
-    public void setTaskNo(String taskNo) {
-        this.taskNo = taskNo;
-    }
-
-    public String getLineId() {
-        return lineId;
-    }
-
-    public void setLineId(String lineId) {
-        this.lineId = lineId;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getRoadwayId() {
-        return roadwayId;
-    }
-
-    public void setRoadwayId(String roadwayId) {
-        this.roadwayId = roadwayId;
-    }
-
-    public String getCargoSpaceName() {
-        return cargoSpaceName;
-    }
-
-    public void setCargoSpaceName(String cargoSpaceName) {
-        this.cargoSpaceName = cargoSpaceName;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
+    public void setStatus(String status) 
+    {
         this.status = status;
     }
 
-    public String getEntranceId() {
-        return entranceId;
+    public String getStatus() 
+    {
+        return status;
     }
 
-    public void setEntranceId(String entranceId) {
-        this.entranceId = entranceId;
+    public void setOnLineType(String onLineType) 
+    {
+        this.onLineType = onLineType;
     }
 
-    public String getLotNo() {
-        return lotNo;
+    public String getOnLineType() 
+    {
+        return onLineType;
     }
 
-    public void setLotNo(String lotNo) {
-        this.lotNo = lotNo;
+    public void setTaskNo(String taskNo) 
+    {
+        this.taskNo = taskNo;
     }
 
-    public String getInOrOutId() {
-        return inOrOutId;
+    public String getTaskNo() 
+    {
+        return taskNo;
     }
 
-    public void setInOrOutId(String inOrOutId) {
-        this.inOrOutId = inOrOutId;
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
     }
 
-    public String getInOrOutDId() {
-        return inOrOutDId;
+    public String getSupplierId() 
+    {
+        return supplierId;
     }
 
-    public void setInOrOutDId(String inOrOutDId) {
-        this.inOrOutDId = inOrOutDId;
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
     }
 
-
-    public String getInQuantity() {
-        return inQuantity;
+    public String getCustomerId() 
+    {
+        return customerId;
     }
 
-    public void setInQuantity(String inQuantity) {
-        this.inQuantity = inQuantity;
+    public void setDepartmentId(String departmentId) 
+    {
+        this.departmentId = departmentId;
     }
 
-    public String getTrayCode() {
-        return trayCode;
+    public String getDepartmentId() 
+    {
+        return departmentId;
     }
 
-    public void setTrayCode(String trayCode) {
+    public void setTrayCode(String trayCode) 
+    {
         this.trayCode = trayCode;
     }
 
-    public String getCargoSpaceId() {
-        return cargoSpaceId;
+    public String getTrayCode() 
+    {
+        return trayCode;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId) {
+    public void setRoadwayId(String roadwayId) 
+    {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getRoadwayId() 
+    {
+        return roadwayId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public Long getThePlatoon() {
-        return thePlatoon;
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
     }
 
-    public void setThePlatoon(Long thePlatoon) {
-        this.thePlatoon = thePlatoon;
+    public void setTargetRoadwayId(String targetRoadwayId) 
+    {
+        this.targetRoadwayId = targetRoadwayId;
     }
 
-    public Long getTheColumn() {
-        return theColumn;
+    public String getTargetRoadwayId() 
+    {
+        return targetRoadwayId;
     }
 
-    public void setTheColumn(Long theColumn) {
-        this.theColumn = theColumn;
+    public void setTargetCargoSpaceId(String targetCargoSpaceId) 
+    {
+        this.targetCargoSpaceId = targetCargoSpaceId;
     }
 
-    public Long getTheFloor() {
-        return theFloor;
+    public String getTargetCargoSpaceId() 
+    {
+        return targetCargoSpaceId;
     }
 
-    public void setTheFloor(Long theFloor) {
-        this.theFloor = theFloor;
+    public void setLineId(String lineId) 
+    {
+        this.lineId = lineId;
     }
 
-    public Long getPriority() {
-        return priority;
+    public String getLineId() 
+    {
+        return lineId;
     }
 
-    public void setPriority(Long priority) {
+    public void setWorkshopId(String workshopId) 
+    {
+        this.workshopId = workshopId;
+    }
+
+    public String getWorkshopId() 
+    {
+        return workshopId;
+    }
+
+    public void setPriority(Long priority) 
+    {
         this.priority = priority;
     }
 
-    public String getExecutionPhase() {
-        return executionPhase;
+    public Long getPriority() 
+    {
+        return priority;
     }
 
-    public void setExecutionPhase(String executionPhase) {
+    public void setExecutionPhase(String executionPhase) 
+    {
         this.executionPhase = executionPhase;
     }
 
-    public String getWlbh() {
-        return wlbh;
+    public String getExecutionPhase() 
+    {
+        return executionPhase;
     }
 
-    public void setWlbh(String wlbh) {
-        this.wlbh = wlbh;
+    public void setInOrOut(Long inOrOut) 
+    {
+        this.inOrOut = inOrOut;
     }
 
-    public String getStackingId() {
-        return stackingId;
+    public Long getInOrOut() 
+    {
+        return inOrOut;
     }
 
-    public void setStackingId(String stackingId) {
-        this.stackingId = stackingId;
-    }
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
+    public void setStartTime(String startTime) 
+    {
         this.startTime = startTime;
     }
 
-    public String getFinishTime() {
-        return finishTime;
+    public String getStartTime() 
+    {
+        return startTime;
     }
 
-    public void setFinishTime(String finishTime) {
+    public void setFinishTime(String finishTime) 
+    {
         this.finishTime = finishTime;
     }
 
-    public String getWarehouseId() {
-        return warehouseId;
+    public String getFinishTime() 
+    {
+        return finishTime;
     }
 
-    public void setWarehouseId(String warehouseId) {
+    public void setEntranceId(String entranceId) 
+    {
+        this.entranceId = entranceId;
+    }
+
+    public String getEntranceId() 
+    {
+        return entranceId;
+    }
+
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
+    }
+
+    public String getExitId() 
+    {
+        return exitId;
+    }
+
+    public void setClassId(String classId) 
+    {
+        this.classId = classId;
+    }
+
+    public String getClassId() 
+    {
+        return classId;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
         this.warehouseId = warehouseId;
     }
 
-    public String getProductGuid() {
-        return productGuid;
+    public String getWarehouseId() 
+    {
+        return warehouseId;
     }
 
-    public void setProductGuid(String productGuid) {
+    public void setFaultFlag(String faultFlag) 
+    {
+        this.faultFlag = faultFlag;
+    }
+
+    public String getFaultFlag() 
+    {
+        return faultFlag;
+    }
+
+    public void setJobDetailId(String jobDetailId) 
+    {
+        this.jobDetailId = jobDetailId;
+    }
+
+    public String getJobDetailId() 
+    {
+        return jobDetailId;
+    }
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setInDate(String inDate) 
+    {
+        this.inDate = inDate;
+    }
+
+    public String getInDate() 
+    {
+        return inDate;
+    }
+
+    public void setInOrOutId(String inOrOutId) 
+    {
+        this.inOrOutId = inOrOutId;
+    }
+
+    public String getInOrOutId() 
+    {
+        return inOrOutId;
+    }
+
+    public void setInOrOutDId(String inOrOutDId) 
+    {
+        this.inOrOutDId = inOrOutDId;
+    }
+
+    public String getInOrOutDId() 
+    {
+        return inOrOutDId;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
         this.productGuid = productGuid;
     }
 
-    public String getParentId() {
-        return parentId;
+    public String getProductGuid() 
+    {
+        return productGuid;
     }
 
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
     }
 
-    public String getPrice() {
-        return price;
+    public String getStockStatus() 
+    {
+        return stockStatus;
     }
 
-    public void setPrice(String price) {
-        this.price = price;
+    public void setInQuantity(String inQuantity) 
+    {
+        this.inQuantity = inQuantity;
     }
 
-    public String getCargoNo() {
-        return cargoNo;
+    public String getInQuantity() 
+    {
+        return inQuantity;
     }
 
-    public void setCargoNo(String cargoNo) {
-        this.cargoNo = cargoNo;
+    public void setStockQuantity(String stockQuantity) 
+    {
+        this.stockQuantity = stockQuantity;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getStockQuantity() 
+    {
+        return stockQuantity;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setOutQuantity(String outQuantity) 
+    {
+        this.outQuantity = outQuantity;
     }
 
-    public String getSpec() {
-        return spec;
+    public String getOutQuantity() 
+    {
+        return outQuantity;
     }
 
-    public void setSpec(String spec) {
-        this.spec = spec;
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
     }
 
-    public String getSpare1() {
-        return spare1;
+    public String getStockinId() 
+    {
+        return stockinId;
     }
 
-    public void setSpare1(String spare1) {
+    public void setStackingId(String stackingId) 
+    {
+        this.stackingId = stackingId;
+    }
+
+    public String getStackingId() 
+    {
+        return stackingId;
+    }
+
+    public void setSpare1(String spare1) 
+    {
         this.spare1 = spare1;
     }
 
-    public String getSpare2() {
-        return spare2;
+    public String getSpare1() 
+    {
+        return spare1;
     }
 
-    public void setSpare2(String spare2) {
+    public void setSpare2(String spare2) 
+    {
         this.spare2 = spare2;
     }
 
-    public String getSpare3() {
-        return spare3;
+    public String getSpare2() 
+    {
+        return spare2;
     }
 
-    public void setSpare3(String spare3) {
+    public void setSpare3(String spare3) 
+    {
         this.spare3 = spare3;
     }
 
-    public String getSpare4() {
-        return spare4;
+    public String getSpare3() 
+    {
+        return spare3;
     }
 
-    public void setSpare4(String spare4) {
-        this.spare4 = spare4;
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
     }
 
-    public String getSpare5() {
-        return spare5;
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
     }
 
-    public void setSpare5(String spare5) {
+    public void setSpare5(String spare5) 
+    {
         this.spare5 = spare5;
     }
 
-    public String getSpare6() {
-        return spare6;
+    public String getSpare5() 
+    {
+        return spare5;
     }
 
-    public void setSpare6(String spare6) {
+    public void setSpare6(String spare6) 
+    {
         this.spare6 = spare6;
     }
 
-    public String getSpare7() {
-        return spare7;
+    public String getSpare6() 
+    {
+        return spare6;
     }
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
     }
 
-    public String getSpare8() {
-        return spare8;
+    public String getSpec() 
+    {
+        return spec;
     }
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
     }
 
-    public String getSpare9() {
-        return spare9;
+    public String getUnit() 
+    {
+        return unit;
     }
 
-    public void setSpare9(String spare9) {
-        this.spare9 = spare9;
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
     }
 
-    public String getSpare10() {
-        return spare10;
+    public String getProductId() 
+    {
+        return productId;
     }
 
-    public void setSpare10(String spare10) {
-        this.spare10 = spare10;
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
     }
 
-    public String getSpare11() {
-        return spare11;
+    public String getProductName() 
+    {
+        return productName;
     }
 
-    public void setSpare11(String spare11) {
-        this.spare11 = spare11;
+    public void setCargoSpaceName(String cargoSpaceName) 
+    {
+        this.cargoSpaceName = cargoSpaceName;
     }
 
-    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 getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public String getCargoSpaceName() 
+    {
+        return cargoSpaceName;
     }
 
     @Override
     public String toString() {
-        return "ViewInJobFlow{" +
-                "jobId='" + jobId + '\'' +
-                ", jobDetailId='" + jobDetailId + '\'' +
-                ", inOrOut='" + inOrOut + '\'' +
-                ", taskNo='" + taskNo + '\'' +
-                ", lineId='" + lineId + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", status='" + status + '\'' +
-                ", entranceId='" + entranceId + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", inOrOutId='" + inOrOutId + '\'' +
-                ", inOrOutDId='" + inOrOutDId + '\'' +
-                ", inQuantity='" + inQuantity + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                ", priority=" + priority +
-                ", executionPhase='" + executionPhase + '\'' +
-                ", wlbh='" + wlbh + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", finishTime='" + finishTime + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", parentId='" + parentId + '\'' +
-                ", price='" + price + '\'' +
-                ", cargoNo='" + cargoNo + '\'' +
-                ", unit='" + unit + '\'' +
-                ", spec='" + spec + '\'' +
-                ", 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 + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("status", getStatus())
+            .append("onLineType", getOnLineType())
+            .append("taskNo", getTaskNo())
+            .append("supplierId", getSupplierId())
+            .append("customerId", getCustomerId())
+            .append("departmentId", getDepartmentId())
+            .append("trayCode", getTrayCode())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("targetRoadwayId", getTargetRoadwayId())
+            .append("targetCargoSpaceId", getTargetCargoSpaceId())
+            .append("lineId", getLineId())
+            .append("workshopId", getWorkshopId())
+            .append("priority", getPriority())
+            .append("executionPhase", getExecutionPhase())
+            .append("inOrOut", getInOrOut())
+            .append("createTime", getCreateTime())
+            .append("startTime", getStartTime())
+            .append("finishTime", getFinishTime())
+            .append("entranceId", getEntranceId())
+            .append("exitId", getExitId())
+            .append("classId", getClassId())
+            .append("warehouseId", getWarehouseId())
+            .append("faultFlag", getFaultFlag())
+            .append("jobDetailId", getJobDetailId())
+            .append("stockId", getStockId())
+            .append("lotNo", getLotNo())
+            .append("inDate", getInDate())
+            .append("inOrOutId", getInOrOutId())
+            .append("inOrOutDId", getInOrOutDId())
+            .append("productGuid", getProductGuid())
+            .append("stockStatus", getStockStatus())
+            .append("inQuantity", getInQuantity())
+            .append("stockQuantity", getStockQuantity())
+            .append("outQuantity", getOutQuantity())
+            .append("stockinId", getStockinId())
+            .append("stackingId", getStackingId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spec", getSpec())
+            .append("unit", getUnit())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .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 a825e0e..09db220 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
 /**
  * 入库作业流水Mapper接口
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public interface ViewInJobFlowMapper 
 {
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 5091f11..4e36d41 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow;
 /**
  * 入库作业流水Service接口
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public interface IViewInJobFlowService 
 {
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 c7e48dc..4228be2 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
@@ -11,8 +11,8 @@ import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
 /**
  * 入库作业流水Service业务层处理
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 @Service
 public class ViewInJobFlowServiceImpl implements IViewInJobFlowService 
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 3ebb940..12c2912 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
@@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 出库作业流水Controller
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 @RestController
 @RequestMapping("/search/ViewOutJobFlow")
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 34c5c90..b5dfcac 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,110 +1,155 @@
 package com.ruoyi.search.ViewOutJobFlow.domain;
 
-import lombok.Data;
 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
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public class ViewOutJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 作业ID */
-    @Excel(name = "作业ID")
+    /** 任务ID */
+    @Excel(name = "作业编码")
     private String jobId;
 
-    /** 子作业ID */
-    @Excel(name = "子作业ID")
+    /** 子任务ID */
+    @Excel(name = "子作业编码")
     private String jobDetailId;
 
-    /** 作业类型 */
-    @Excel(name = "作业类型",dictType = "out_job_type")
-    private String inOrOut;
+    /** 项目号546 */
+    @Excel(name = "项目号")
+    private String lineId;
 
     /** 任务号 */
     @Excel(name = "任务号")
     private String taskNo;
 
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String lineId;
+    /** 任务类型 */
+    @Excel(name = "任务类型",dictType = "out_job_type")
+    private Long inOrOut;
 
-    /** 品号 */
-    @Excel(name = "品号")
+    /** 物料编号546 */
+    @Excel(name = "物料编号")
     private String productId;
 
-    /** 品名 */
-    @Excel(name = "品名")
+    /** 物料名称546 */
+    @Excel(name = "物料名称")
     private String productName;
 
     /** 托盘码 */
     @Excel(name = "托盘码")
     private String trayCode;
 
-    /** 巷道ID */
-    @Excel(name = "巷道ID")
-    private String roadwayId;
-
-    /** 货位名称 */
-    @Excel(name = "货位名称")
-    private String cargoSpaceName;
-
-    /** 状态 */
-    @Excel(name = "状态",dictType = "mydo_job_status")
-    private String status;
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
 
     /** 出口ID */
     @Excel(name = "出口ID")
     private String exitId;
 
-    /** 批号 */
-    @Excel(name = "批号")
+    /** 批次号 */
+    @Excel(name = "批次号")
     private String lotNo;
 
-    /** 单据ID */
-    @Excel(name = "单据ID")
-    private String inOrOutId;
+    /** 层级关系546 */
+    @Excel(name = "层级关系")
+    private String spare1;
 
-    /** 子单据ID */
-    @Excel(name = "子单据ID")
-    private String inOrOutDId;
+    /** 上层物料546 */
+    @Excel(name = "上层物料")
+    private String spare2;
 
-    /** 创建时间 */
-    @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料")
+    private String spare3;
 
-    /** 出库数量 */
-    @Excel(name = "出库数量")
-    private String outQuantity;
+    /** 合同号546 */
+    @Excel(name = "合同号")
+    private String spare5;
 
-    /** 客户名称 */
-    @Excel(name = "客户名称")
-    private String customerName;
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号")
+    private String spare6;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号")
+    private String spec;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位")
+    private String unit;
+
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
+    /** 追溯入库单ID */
+    @Excel(name = "追溯入库单ID")
+    private String stockinId;
+
+    /** 追溯入库子单ID */
+    @Excel(name = "追溯入库子单ID")
+    private String stockinDetailId;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierId;
+
+    /** 客户ID */
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    /** 供应商名称546/客户名称546 */
+    @Excel(name = "供应商名称/客户名称")
+    private String stackingId;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+
+    /** 任务状态 */
+//    @Excel(name = "任务状态")
+    private String status;
+
+    /** 上线类型 */
+//    @Excel(name = "上线类型")
+    private String onLineType;
+
+    /** 部门ID */
+//    @Excel(name = "部门ID")
+    private String departmentId;
+
+    /** 巷道ID */
+//    @Excel(name = "巷道ID")
+    private String roadwayId;
 
     /** 货位ID */
 //    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
-    /** 排 */
-//    @Excel(name = "排")
-    private Long thePlatoon;
+    /** 目标巷道ID */
+//    @Excel(name = "目标巷道ID")
+    private String targetRoadwayId;
 
-    /** 列 */
-//    @Excel(name = "列")
-    private Long theColumn;
+    /** 目标货位ID */
+//    @Excel(name = "目标货位ID")
+    private String targetCargoSpaceId;
 
-    /** 层 */
-//    @Excel(name = "层")
-    private Long theFloor;
+    /** 517补码标志 */
+//    @Excel(name = "517补码标志")
+    private String workshopId;
 
     /** 优先级 */
 //    @Excel(name = "优先级")
@@ -114,918 +159,586 @@ public class ViewOutJobFlow extends BaseEntity
 //    @Excel(name = "执行阶段")
     private String executionPhase;
 
-    /** 物料ID */
-//    @Excel(name = "物料ID")
-    private String wlbh;
+    /** 入口ID */
+//    @Excel(name = "入口ID")
+    private String entranceId;
 
-    /** 剁型ID */
-//    @Excel(name = "剁型ID")
-    private String stackingId;
-
-    /** 库存状态 */
-//    @Excel(name = "库存状态")
-    private String stockStatus;
-
-    /** 回流数量 */
-//    @Excel(name = "回流数量")
-    private String giveNum;
-
-    /** 开始时间 */
-//    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-//    @Excel(name = "结束时间")
-    private String finishTime;
+    /** 层数 */
+//    @Excel(name = "层数")
+    private String classId;
 
     /** 仓库ID */
 //    @Excel(name = "仓库ID")
     private String warehouseId;
 
+    /** 重分标记 */
+//    @Excel(name = "重分标记")
+    private String faultFlag;
+
+    /** 库存ID */
+//    @Excel(name = "库存ID")
+    private String stockId;
+
+    /** 入库时间 */
+//    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 单据ID */
+//    @Excel(name = "单据ID")
+    private String inOrOutId;
+
+    /** 子单据ID */
+//    @Excel(name = "子单据ID")
+    private String inOrOutDId;
+
     /** 物料GUID */
 //    @Excel(name = "物料GUID")
     private String productGuid;
 
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
+    /** 库存状态 */
+//    @Excel(name = "库存状态")
+    private String stockStatus;
 
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
+    /** 入库数量 */
+//    @Excel(name = "入库数量")
+    private String inQuantity;
 
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
+    /** 库存数量 */
+//    @Excel(name = "库存数量")
+    private String stockQuantity;
 
-    /** 图号 */
-    @Excel(name = "图号")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 型号 */
-//    @Excel(name = "型号")
-    private String spare1;
-
-    /** 单件净重 */
-//    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-//    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-//    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-//    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-//    @Excel(name = "功率")
-    private String spare6;
-
-    /** 相位 */
-//    @Excel(name = "相位")
-    private String spare7;
-
-    /** 毛重 */
-//    @Excel(name = "毛重")
-    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 = "描述")
-    private String remark;
-
-
-
-    public String getJobId() {
-        return jobId;
-    }
-
-    public void setJobId(String jobId) {
+    public void setJobId(String jobId) 
+    {
         this.jobId = jobId;
     }
 
-    public String getJobDetailId() {
-        return jobDetailId;
+    public String getJobId() 
+    {
+        return jobId;
     }
 
-    public void setJobDetailId(String jobDetailId) {
-        this.jobDetailId = jobDetailId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
+    public void setStatus(String status) 
+    {
         this.status = status;
     }
 
-    public String getTaskNo() {
-        return taskNo;
+    public String getStatus() 
+    {
+        return status;
     }
 
-    public void setTaskNo(String taskNo) {
+    public void setOnLineType(String onLineType) 
+    {
+        this.onLineType = onLineType;
+    }
+
+    public String getOnLineType() 
+    {
+        return onLineType;
+    }
+
+    public void setTaskNo(String taskNo) 
+    {
         this.taskNo = taskNo;
     }
 
-    public String getTrayCode() {
-        return trayCode;
+    public String getTaskNo() 
+    {
+        return taskNo;
     }
 
-    public void setTrayCode(String trayCode) {
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierId() 
+    {
+        return supplierId;
+    }
+
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+
+    public void setDepartmentId(String departmentId) 
+    {
+        this.departmentId = departmentId;
+    }
+
+    public String getDepartmentId() 
+    {
+        return departmentId;
+    }
+
+    public void setTrayCode(String trayCode) 
+    {
         this.trayCode = trayCode;
     }
 
-    public String getRoadwayId() {
-        return roadwayId;
+    public String getTrayCode() 
+    {
+        return trayCode;
     }
 
-    public void setRoadwayId(String roadwayId) {
+    public void setRoadwayId(String roadwayId) 
+    {
         this.roadwayId = roadwayId;
     }
 
-    public String getCargoSpaceId() {
-        return cargoSpaceId;
+    public String getRoadwayId() 
+    {
+        return roadwayId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId) {
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceName() {
-        return cargoSpaceName;
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName) {
-        this.cargoSpaceName = cargoSpaceName;
+    public void setTargetRoadwayId(String targetRoadwayId) 
+    {
+        this.targetRoadwayId = targetRoadwayId;
     }
 
-    public Long getThePlatoon() {
-        return thePlatoon;
+    public String getTargetRoadwayId() 
+    {
+        return targetRoadwayId;
     }
 
-    public void setThePlatoon(Long thePlatoon) {
-        this.thePlatoon = thePlatoon;
+    public void setTargetCargoSpaceId(String targetCargoSpaceId) 
+    {
+        this.targetCargoSpaceId = targetCargoSpaceId;
     }
 
-    public Long getTheColumn() {
-        return theColumn;
+    public String getTargetCargoSpaceId() 
+    {
+        return targetCargoSpaceId;
     }
 
-    public void setTheColumn(Long theColumn) {
-        this.theColumn = theColumn;
-    }
-
-    public Long getTheFloor() {
-        return theFloor;
-    }
-
-    public void setTheFloor(Long theFloor) {
-        this.theFloor = theFloor;
-    }
-
-    public Long getPriority() {
-        return priority;
-    }
-
-    public void setPriority(Long priority) {
-        this.priority = priority;
-    }
-
-    public String getExecutionPhase() {
-        return executionPhase;
-    }
-
-    public void setExecutionPhase(String executionPhase) {
-        this.executionPhase = executionPhase;
-    }
-
-    public String getInOrOut() {
-        return inOrOut;
-    }
-
-    public void setInOrOut(String inOrOut) {
-        this.inOrOut = inOrOut;
-    }
-
-    public String getExitId() {
-        return exitId;
-    }
-
-    public void setExitId(String exitId) {
-        this.exitId = exitId;
-    }
-
-    public String getWlbh() {
-        return wlbh;
-    }
-
-    public void setWlbh(String wlbh) {
-        this.wlbh = wlbh;
-    }
-
-    public String getLotNo() {
-        return lotNo;
-    }
-
-    public void setLotNo(String lotNo) {
-        this.lotNo = lotNo;
-    }
-
-    public String getStackingId() {
-        return stackingId;
-    }
-
-    public void setStackingId(String stackingId) {
-        this.stackingId = stackingId;
-    }
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getOutQuantity() {
-        return outQuantity;
-    }
-
-    public void setOutQuantity(String outQuantity) {
-        this.outQuantity = outQuantity;
-    }
-
-    public String getGiveNum() {
-        return giveNum;
-    }
-
-    public void setGiveNum(String giveNum) {
-        this.giveNum = giveNum;
-    }
-
-    public String getInOrOutId() {
-        return inOrOutId;
-    }
-
-    public void setInOrOutId(String inOrOutId) {
-        this.inOrOutId = inOrOutId;
-    }
-
-    public String getInOrOutDId() {
-        return inOrOutDId;
-    }
-
-    public void setInOrOutDId(String inOrOutDId) {
-        this.inOrOutDId = inOrOutDId;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(String finishTime) {
-        this.finishTime = finishTime;
-    }
-
-    public String getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getProductGuid() {
-        return productGuid;
-    }
-
-    public void setProductGuid(String productGuid) {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getCargoNo() {
-        return cargoNo;
-    }
-
-    public void setCargoNo(String cargoNo) {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    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 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 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 getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    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;
-    }
-
-    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;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getLineId() {
-        return lineId;
-    }
-
-    public void setLineId(String lineId) {
+    public void setLineId(String lineId) 
+    {
         this.lineId = lineId;
     }
 
-    @Override
-    public String getRemark() {
-        return remark;
+    public String getLineId() 
+    {
+        return lineId;
     }
 
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public void setWorkshopId(String workshopId) 
+    {
+        this.workshopId = workshopId;
     }
 
-    @Override
-    public Date getCreateTime() {
-        return createTime;
+    public String getWorkshopId() 
+    {
+        return workshopId;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setPriority(Long priority) 
+    {
+        this.priority = priority;
     }
+
+    public Long getPriority() 
+    {
+        return priority;
+    }
+
+    public void setExecutionPhase(String executionPhase) 
+    {
+        this.executionPhase = executionPhase;
+    }
+
+    public String getExecutionPhase() 
+    {
+        return executionPhase;
+    }
+
+    public void setInOrOut(Long inOrOut) 
+    {
+        this.inOrOut = inOrOut;
+    }
+
+    public Long getInOrOut() 
+    {
+        return inOrOut;
+    }
+
+    public void setStartTime(String startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public String getStartTime() 
+    {
+        return startTime;
+    }
+
+    public void setFinishTime(String finishTime) 
+    {
+        this.finishTime = finishTime;
+    }
+
+    public String getFinishTime() 
+    {
+        return finishTime;
+    }
+
+    public void setEntranceId(String entranceId) 
+    {
+        this.entranceId = entranceId;
+    }
+
+    public String getEntranceId() 
+    {
+        return entranceId;
+    }
+
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
+    }
+
+    public String getExitId() 
+    {
+        return exitId;
+    }
+
+    public void setClassId(String classId) 
+    {
+        this.classId = classId;
+    }
+
+    public String getClassId() 
+    {
+        return classId;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setFaultFlag(String faultFlag) 
+    {
+        this.faultFlag = faultFlag;
+    }
+
+    public String getFaultFlag() 
+    {
+        return faultFlag;
+    }
+
+    public void setJobDetailId(String jobDetailId) 
+    {
+        this.jobDetailId = jobDetailId;
+    }
+
+    public String getJobDetailId() 
+    {
+        return jobDetailId;
+    }
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setInDate(String inDate) 
+    {
+        this.inDate = inDate;
+    }
+
+    public String getInDate() 
+    {
+        return inDate;
+    }
+
+    public void setInOrOutId(String inOrOutId) 
+    {
+        this.inOrOutId = inOrOutId;
+    }
+
+    public String getInOrOutId() 
+    {
+        return inOrOutId;
+    }
+
+    public void setInOrOutDId(String inOrOutDId) 
+    {
+        this.inOrOutDId = inOrOutDId;
+    }
+
+    public String getInOrOutDId() 
+    {
+        return inOrOutDId;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    public void setInQuantity(String inQuantity) 
+    {
+        this.inQuantity = inQuantity;
+    }
+
+    public String getInQuantity() 
+    {
+        return inQuantity;
+    }
+
+    public void setStockQuantity(String stockQuantity) 
+    {
+        this.stockQuantity = stockQuantity;
+    }
+
+    public String getStockQuantity() 
+    {
+        return stockQuantity;
+    }
+
+    public void setOutQuantity(String outQuantity) 
+    {
+        this.outQuantity = outQuantity;
+    }
+
+    public String getOutQuantity() 
+    {
+        return outQuantity;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setStackingId(String stackingId) 
+    {
+        this.stackingId = stackingId;
+    }
+
+    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 setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    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 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 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 setCargoSpaceName(String cargoSpaceName) 
+    {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getCargoSpaceName() 
+    {
+        return cargoSpaceName;
+    }
+
     @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 + '\'' +
-                ", wlbh='" + wlbh + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", outQuantity='" + outQuantity + '\'' +
-                ", giveNum='" + giveNum + '\'' +
-                ", inOrOutId='" + inOrOutId + '\'' +
-                ", inOrOutDId='" + inOrOutDId + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", finishTime='" + finishTime + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", productId='" + productId + '\'' +
-                ", parentId='" + parentId + '\'' +
-                ", price='" + price + '\'' +
-                ", cargoNo='" + cargoNo + '\'' +
-                ", unit='" + unit + '\'' +
-                ", spec='" + spec + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare3='" + spare3 + '\'' +
-                ", spare4='" + spare4 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", productName='" + productName + '\'' +
-                ", 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 + '\'' +
-                ", customerName='" + customerName + '\'' +
-                ", lineId='" + lineId + '\'' +
-                ", remark='" + remark + '\'' +
-                ", creatTime='" + createTime + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("status", getStatus())
+            .append("onLineType", getOnLineType())
+            .append("taskNo", getTaskNo())
+            .append("supplierId", getSupplierId())
+            .append("customerId", getCustomerId())
+            .append("departmentId", getDepartmentId())
+            .append("trayCode", getTrayCode())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("targetRoadwayId", getTargetRoadwayId())
+            .append("targetCargoSpaceId", getTargetCargoSpaceId())
+            .append("lineId", getLineId())
+            .append("workshopId", getWorkshopId())
+            .append("priority", getPriority())
+            .append("executionPhase", getExecutionPhase())
+            .append("inOrOut", getInOrOut())
+            .append("createTime", getCreateTime())
+            .append("startTime", getStartTime())
+            .append("finishTime", getFinishTime())
+            .append("entranceId", getEntranceId())
+            .append("exitId", getExitId())
+            .append("classId", getClassId())
+            .append("warehouseId", getWarehouseId())
+            .append("faultFlag", getFaultFlag())
+            .append("jobDetailId", getJobDetailId())
+            .append("stockId", getStockId())
+            .append("lotNo", getLotNo())
+            .append("inDate", getInDate())
+            .append("inOrOutId", getInOrOutId())
+            .append("inOrOutDId", getInOrOutDId())
+            .append("productGuid", getProductGuid())
+            .append("stockStatus", getStockStatus())
+            .append("inQuantity", getInQuantity())
+            .append("stockQuantity", getStockQuantity())
+            .append("outQuantity", getOutQuantity())
+            .append("stockinId", getStockinId())
+            .append("stackingId", getStackingId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("spec", getSpec())
+            .append("unit", getUnit())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .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 dd6c4d6..425aa08 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 /**
  * 出库作业流水Mapper接口
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public interface ViewOutJobFlowMapper 
 {
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 97d05da..8a42194 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow;
 /**
  * 出库作业流水Service接口
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 public interface IViewOutJobFlowService 
 {
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 2fad341..2f84fd8 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
@@ -11,8 +11,8 @@ import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
 /**
  * 出库作业流水Service业务层处理
  * 
- * @author gw
- * @date 2025-09-22
+ * @author ruoyi
+ * @date 2026-01-04
  */
 @Service
 public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
index 0602669..ead9350 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/controller/ViewStockDetailController.java
@@ -1,25 +1,31 @@
 package com.ruoyi.search.ViewStockDetail.controller;
 
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 库存明细查询Controller
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-30
  */
 @RestController
 @RequestMapping("/search/ViewStockDetail")
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 12f3097..a8f03af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -1,872 +1,625 @@
 package com.ruoyi.search.ViewStockDetail.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 lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 /**
  * 库存明细查询对象 view_stock_detail
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-30
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
 public class ViewStockDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
-//    @Excel(name = "序号")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long onlyIdentity;
 
-    /** 库存ID */
-    @Excel(name = "库存ID")
+    /** 库存id */
+    @Excel(name = "库存id")
     private String stockId;
 
-    @Excel(name = "订单号")
-    private String orderId;
-
-    /** 品号 */
-    @Excel(name = "品号")
+    /** 物料编码 */
+    @Excel(name = "物料编码")
     private String productId;
 
-    /** 品名 */
-    @Excel(name = "品名")
+    /** 物料名称 */
+    @Excel(name = "物料名称")
     private String productName;
 
-    /** 货位ID */
-//    @Excel(name = "货位ID")
-    private String cargoSpaceId;
-
-    /** 货位名称 */
-    @Excel(name = "货位名称")
-    private String cargoSpaceName;
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String quantity;
 
     /** 托盘条码 */
     @Excel(name = "托盘条码")
     private String trayCode;
 
-    /** 数量 */
-//    @Excel(name = "数量")
-    private String quantity;
+    /** 是否满盘 */
+    @Excel(name = "是否满盘", readConverterExp = "0=否,1=是")
+    private String model;
 
-    /** 作业ID */
-    @Excel(name = "作业ID")
-    private String jobId;
+    /** 盘点记录 */
+    @Excel(name = "盘点记录",readConverterExp = "0=未盘点,1=已盘点")
+    private String spare7;
+
+    /** 项目号 */
+    @Excel(name = "项目号")
+    private String spare4;
 
     /** 批号 */
-//    @Excel(name = "批号")
+    @Excel(name = "批号")
     private String lotNo;
 
-    /** 入库子单ID */
-    @Excel(name = "入库子单ID")
-    private String stockinDetailId;
+    /** 层级关系 */
+    @Excel(name = "层级关系")
+    private String spare1;
+
+    /** 上层物料 */
+    @Excel(name = "上层物料")
+    private String spare2;
+
+    /** 顶层物料 */
+    @Excel(name = "顶层物料")
+    private String spare3;
+
+    /** 合同号 */
+    @Excel(name = "合同号")
+    private String spare5;
+
+    /** 销售订单号 */
+    @Excel(name = "销售订单号")
+    private String spare6;
+
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String voltage;
+
+    /** 供应商名称546 */
+    @Excel(name = "供应商名称")
+    private String stackingId;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号")
+    private String power;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位")
+    private String phase;
+
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
+    /** 货位状态 */
+    @Excel(name = "货位状态", dictType = "cargo_space_status")
+    private String cargoSpaceStatus;
+
+    /** 货位锁 */
+    @Excel(name = "货位锁", dictType = "cargo_space_lock_status")
+    private String locked;
+
+    /** 库存状态 */
+    @Excel(name = "库存状态", dictType = "stock_status")
+    private String stockStatus;
+
+    /** 物料状态 */
+    @Excel(name = "物料状态", dictType = "product_status")
+    private String productStatus;
 
     /** 入库时间 */
     @Excel(name = "入库时间")
     private String inDate;
 
-    /** 仓库ID */
-//    @Excel(name = "仓库ID")
-    private String warehouseId;
+    /** 作业ID */
+    @Excel(name = "作业ID")
+    private String jobId;
 
-    /** 仓库名称 */
-//    @Excel(name = "仓库名称")
-    private String warehouseName;
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
 
-    /** 垛型ID */
-//    @Excel(name = "垛型ID")
-    private String stackingId;
+    /** 入库子单id */
+    @Excel(name = "入库子单id")
+    private String stockinDetailId;
 
-    /** 巷道ID */
-    @Excel(name = "巷道ID")
-    private String roadwayId;
+    /** 入库主单 */
+    @Excel(name = "入库主单")
+    private String stockinId;
 
-    /** 货位状态 1空2满 3入库分配 4出库分配 5入库盘点 6出库盘点 */
-    @Excel(name = "货位状态", dictType = "cargo_space_status")
-    private String cargoSpaceStatus;
+    /** 入库类型 */
+    @Excel(name = "入库类型", dictType = "in_bill_type")
+    private String inType;
 
-    /** 库存状态 1正常 2冻结 */
-    @Excel(name = "库存状态", dictType = "stock_status")
-    private String stockStatus;
+    /** 货位id */
+//    @Excel(name = "货位id")
+    private String cargoSpaceId;
 
-    /** 物料状态 1正常 2盘点待审批 3异常 */
-    @Excel(name = "物料状态", dictType = "product_status")
-    private String productStatus;
-
-    /** 是否锁定 Y锁、N开 */
-//    @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
-    private String locked;
+    /** 回流时间 */
+//    @Excel(name = "回流时间")
+    private String backDate;
 
     /** 物料GUID */
-    @Excel(name = "物料GUID")
+//    @Excel(name = "物料GUID")
     private String productGuid;
 
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
+    /** 入库班组ID */
+//    @Excel(name = "入库班组ID")
+    private String inClassId;
 
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
+    /** 仓库 */
+//    @Excel(name = "仓库")
+    private String warehouseId;
 
-    /** 价格 */
-    @Excel(name = "价格")
-    private String price;
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String netWeight;
 
-    /** 产品分类 */
-    @Excel(name = "产品分类")
-    private String parentId;
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String grossWeight;
 
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String cargoNo;
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String distribution;
 
-    /** 英文名称 */
-    @Excel(name = "英文名称")
-    private String spare1;
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String orderId;
 
-    /** 单件净重 */
-    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-    @Excel(name = "功率")
-    private String spare6;
-
-    /** 相位 */
-    @Excel(name = "相位")
-    private String spare7;
-
-    /** 毛重 */
-    @Excel(name = "毛重")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     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 = "描述")
-    private String remark;
-
-    private String thePlatoon;
-    private String theColumn;
-    private String theFloor;
-    private String startTime;
-    private String finishTime;
-
-    public Long getOnlyIdentity() {
-        return onlyIdentity;
-    }
-
-    public void setOnlyIdentity(Long onlyIdentity) {
+    public void setOnlyIdentity(Long onlyIdentity) 
+    {
         this.onlyIdentity = onlyIdentity;
     }
 
-    public String getStockId() {
-        return stockId;
+    public Long getOnlyIdentity() 
+    {
+        return onlyIdentity;
     }
 
-    public void setStockId(String stockId) {
+    public void setStockId(String stockId) 
+    {
         this.stockId = stockId;
     }
 
-    public String getOrderId() {
-        return orderId;
+    public String getStockId() 
+    {
+        return stockId;
     }
 
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getCargoSpaceId() {
-        return cargoSpaceId;
-    }
-
-    public void setCargoSpaceId(String cargoSpaceId) {
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
         this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getCargoSpaceName() {
-        return cargoSpaceName;
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName) {
-        this.cargoSpaceName = cargoSpaceName;
-    }
-
-    public String getTrayCode() {
-        return trayCode;
-    }
-
-    public void setTrayCode(String trayCode) {
-        this.trayCode = trayCode;
-    }
-
-    public String getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(String quantity) {
-        this.quantity = quantity;
-    }
-
-    public String getJobId() {
-        return jobId;
-    }
-
-    public void setJobId(String jobId) {
-        this.jobId = jobId;
-    }
-
-    public String getLotNo() {
-        return lotNo;
-    }
-
-    public void setLotNo(String lotNo) {
-        this.lotNo = lotNo;
-    }
-
-    public String getStockinDetailId() {
-        return stockinDetailId;
-    }
-
-    public void setStockinDetailId(String stockinDetailId) {
-        this.stockinDetailId = stockinDetailId;
-    }
-
-    public String getInDate() {
-        return inDate;
-    }
-
-    public void setInDate(String inDate) {
-        this.inDate = inDate;
-    }
-
-    public String getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getStackingId() {
-        return stackingId;
-    }
-
-    public void setStackingId(String stackingId) {
-        this.stackingId = stackingId;
-    }
-
-    public String getRoadwayId() {
-        return roadwayId;
-    }
-
-    public void setRoadwayId(String roadwayId) {
-        this.roadwayId = roadwayId;
-    }
-
-    public String getCargoSpaceStatus() {
-        return cargoSpaceStatus;
-    }
-
-    public void setCargoSpaceStatus(String cargoSpaceStatus) {
-        this.cargoSpaceStatus = cargoSpaceStatus;
-    }
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
+    public void setStockStatus(String stockStatus) 
+    {
         this.stockStatus = stockStatus;
     }
 
-    public String getProductStatus() {
-        return productStatus;
+    public String getStockStatus() 
+    {
+        return stockStatus;
     }
 
-    public void setProductStatus(String productStatus) {
+    public void setProductStatus(String productStatus) 
+    {
         this.productStatus = productStatus;
     }
 
-    public String getLocked() {
-        return locked;
+    public String getProductStatus() 
+    {
+        return productStatus;
     }
 
-    public void setLocked(String locked) {
-        this.locked = locked;
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
     }
 
-    public String getProductGuid() {
-        return productGuid;
+    public String getLotNo() 
+    {
+        return lotNo;
     }
 
-    public void setProductGuid(String productGuid) {
+    public void setInDate(String inDate) 
+    {
+        this.inDate = inDate;
+    }
+
+    public String getInDate() 
+    {
+        return inDate;
+    }
+
+    public void setBackDate(String backDate) 
+    {
+        this.backDate = backDate;
+    }
+
+    public String getBackDate() 
+    {
+        return backDate;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
         this.productGuid = productGuid;
     }
 
-    public String getSpec() {
-        return spec;
+    public String getProductGuid() 
+    {
+        return productGuid;
     }
 
-    public void setSpec(String spec) {
-        this.spec = spec;
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getQuantity() 
+    {
+        return quantity;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setJobId(String jobId) 
+    {
+        this.jobId = jobId;
     }
 
-    public String getPrice() {
-        return price;
+    public String getJobId() 
+    {
+        return jobId;
     }
 
-    public void setPrice(String price) {
-        this.price = price;
+    public void setTrayCode(String trayCode) 
+    {
+        this.trayCode = trayCode;
     }
 
-    public String getParentId() {
-        return parentId;
+    public String getTrayCode() 
+    {
+        return trayCode;
     }
 
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
+    public void setOutQuantity(String outQuantity) 
+    {
+        this.outQuantity = outQuantity;
     }
 
-    public String getCargoNo() {
-        return cargoNo;
+    public String getOutQuantity() 
+    {
+        return outQuantity;
     }
 
-    public void setCargoNo(String cargoNo) {
-        this.cargoNo = cargoNo;
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
     }
 
-    public String getSpare1() {
-        return spare1;
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
     }
 
-    public void setSpare1(String spare1) {
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setInType(String inType) 
+    {
+        this.inType = inType;
+    }
+
+    public String getInType() 
+    {
+        return inType;
+    }
+
+    public void setInClassId(String inClassId) 
+    {
+        this.inClassId = inClassId;
+    }
+
+    public String getInClassId() 
+    {
+        return inClassId;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setStackingId(String stackingId) 
+    {
+        this.stackingId = stackingId;
+    }
+
+    public String getStackingId() 
+    {
+        return stackingId;
+    }
+
+    public void setSpare1(String spare1) 
+    {
         this.spare1 = spare1;
     }
 
-    public String getSpare2() {
-        return spare2;
+    public String getSpare1() 
+    {
+        return spare1;
     }
 
-    public void setSpare2(String spare2) {
+    public void setSpare2(String spare2) 
+    {
         this.spare2 = spare2;
     }
 
-    public String getSpare3() {
-        return spare3;
+    public String getSpare2() 
+    {
+        return spare2;
     }
 
-    public void setSpare3(String spare3) {
+    public void setSpare3(String spare3) 
+    {
         this.spare3 = spare3;
     }
 
-    public String getSpare4() {
-        return spare4;
+    public String getSpare3() 
+    {
+        return spare3;
     }
 
-    public void setSpare4(String spare4) {
+    public void setSpare4(String spare4) 
+    {
         this.spare4 = spare4;
     }
 
-    public String getSpare5() {
-        return spare5;
+    public String getSpare4() 
+    {
+        return spare4;
     }
 
-    public void setSpare5(String spare5) {
+    public void setSpare5(String spare5) 
+    {
         this.spare5 = spare5;
     }
 
-    public String getSpare6() {
-        return spare6;
+    public String getSpare5() 
+    {
+        return spare5;
     }
 
-    public void setSpare6(String spare6) {
+    public void setSpare6(String spare6) 
+    {
         this.spare6 = spare6;
     }
 
-    public String getSpare7() {
-        return spare7;
+    public String getSpare6() 
+    {
+        return spare6;
     }
 
-    public void setSpare7(String spare7) {
+    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 setVoltage(String voltage) 
+    {
+        this.voltage = voltage;
+    }
+
+    public String getVoltage() 
+    {
+        return voltage;
+    }
+
+    public void setPower(String power) 
+    {
+        this.power = power;
+    }
+
+    public String getPower() 
+    {
+        return power;
+    }
+
+    public void setPhase(String phase) 
+    {
+        this.phase = phase;
+    }
+
+    public String getPhase() 
+    {
+        return phase;
+    }
+
+    public void setNetWeight(String netWeight) 
+    {
+        this.netWeight = netWeight;
+    }
+
+    public String getNetWeight() 
+    {
+        return netWeight;
+    }
+
+    public void setGrossWeight(String grossWeight) 
+    {
+        this.grossWeight = grossWeight;
+    }
+
+    public String getGrossWeight() 
+    {
+        return grossWeight;
+    }
+
+    public void setDistribution(String distribution) 
+    {
+        this.distribution = distribution;
+    }
+
+    public String getDistribution() 
+    {
+        return distribution;
+    }
+
+    public void setModel(String model) 
+    {
+        this.model = model;
+    }
+
+    public String getModel() 
+    {
+        return model;
+    }
+
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
+    public void setSpare7(String spare7) 
+    {
         this.spare7 = spare7;
     }
 
-    public String getSpare8() {
-        return spare8;
+    public String getSpare7() 
+    {
+        return spare7;
     }
 
-    public void setSpare8(String spare8) {
+    public void setSpare8(String spare8) 
+    {
         this.spare8 = spare8;
     }
 
-    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;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getThePlatoon() {
-        return thePlatoon;
-    }
-
-    public void setThePlatoon(String thePlatoon) {
-        this.thePlatoon = thePlatoon;
-    }
-
-    public String getTheColumn() {
-        return theColumn;
-    }
-
-    public void setTheColumn(String theColumn) {
-        this.theColumn = theColumn;
-    }
-
-    public String getTheFloor() {
-        return theFloor;
-    }
-
-    public void setTheFloor(String theFloor) {
-        this.theFloor = theFloor;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(String finishTime) {
-        this.finishTime = finishTime;
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) 
+    {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getCargoSpaceName() 
+    {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceStatus(String cargoSpaceStatus) 
+    {
+        this.cargoSpaceStatus = cargoSpaceStatus;
+    }
+
+    public String getCargoSpaceStatus() 
+    {
+        return cargoSpaceStatus;
+    }
+
+    public void setLocked(String locked) 
+    {
+        this.locked = locked;
+    }
+
+    public String getLocked() 
+    {
+        return locked;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("onlyIdentity", getOnlyIdentity())
+            .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("productName", getProductName())
+            .append("voltage", getVoltage())
+            .append("power", getPower())
+            .append("phase", getPhase())
+            .append("netWeight", getNetWeight())
+            .append("grossWeight", getGrossWeight())
+            .append("distribution", getDistribution())
+            .append("model", getModel())
+            .append("orderId", getOrderId())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .append("cargoSpaceStatus", getCargoSpaceStatus())
+            .append("locked", getLocked())
+            .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
index 69dcf19..02fd9a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/mapper/ViewStockDetailMapper.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockDetail.mapper;
 
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 
 /**
  * 库存明细查询Mapper接口
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-30
  */
-public interface ViewStockDetailMapper
+public interface ViewStockDetailMapper 
 {
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -22,7 +21,7 @@ public interface ViewStockDetailMapper
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询集合
      */
@@ -30,7 +29,7 @@ public interface ViewStockDetailMapper
 
     /**
      * 新增库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface ViewStockDetailMapper
 
     /**
      * 修改库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface ViewStockDetailMapper
 
     /**
      * 删除库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface ViewStockDetailMapper
 
     /**
      * 批量删除库存明细查询
-     *
+     * 
      * @param onlyIdentitys 需要删除的数据主键集合
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
index abe24ab..59af22a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/IViewStockDetailService.java
@@ -1,20 +1,19 @@
 package com.ruoyi.search.ViewStockDetail.service;
 
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-
 import java.util.List;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
 
 /**
  * 库存明细查询Service接口
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-30
  */
-public interface IViewStockDetailService
+public interface IViewStockDetailService 
 {
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -22,7 +21,7 @@ public interface IViewStockDetailService
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询集合
      */
@@ -30,7 +29,7 @@ public interface IViewStockDetailService
 
     /**
      * 新增库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface IViewStockDetailService
 
     /**
      * 修改库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface IViewStockDetailService
 
     /**
      * 批量删除库存明细查询
-     *
+     * 
      * @param onlyIdentitys 需要删除的库存明细查询主键集合
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface IViewStockDetailService
 
     /**
      * 删除库存明细查询信息
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
index 44a1509..23c0dc0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
@@ -1,29 +1,27 @@
 package com.ruoyi.search.ViewStockDetail.service.impl;
 
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
-import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper;
-import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper;
+import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail;
+import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService;
 
 /**
  * 库存明细查询Service业务层处理
- *
- * @author gw
- * @date 2025-05-26
+ * 
+ * @author ruoyi
+ * @date 2025-12-30
  */
 @Service
-public class ViewStockDetailServiceImpl implements IViewStockDetailService
+public class ViewStockDetailServiceImpl implements IViewStockDetailService 
 {
     @Autowired
     private ViewStockDetailMapper viewStockDetailMapper;
 
     /**
      * 查询库存明细查询
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 库存明细查询
      */
@@ -35,12 +33,11 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 查询库存明细查询列表
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 库存明细查询
      */
     @Override
-    @DataScope(warehouseAlias = "vsd")
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail)
     {
         return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail);
@@ -48,7 +45,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 新增库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -60,7 +57,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 修改库存明细查询
-     *
+     * 
      * @param viewStockDetail 库存明细查询
      * @return 结果
      */
@@ -72,7 +69,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 批量删除库存明细查询
-     *
+     * 
      * @param onlyIdentitys 需要删除的库存明细查询主键
      * @return 结果
      */
@@ -84,7 +81,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
 
     /**
      * 删除库存明细查询信息
-     *
+     * 
      * @param onlyIdentity 库存明细查询主键
      * @return 结果
      */
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 1dc9fc3..246b18e 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
@@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 入库单据历史Controller
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-12-31
  */
 @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 5692027..2dfdb46 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,9 +1,5 @@
 package com.ruoyi.search.ViewStockinHistory.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,993 +8,588 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 入库单据历史对象 view_stockin_history
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-12-31
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
 public class ViewStockinHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 入库单guid */
-//    @Excel(name = "入库单guid")
+    /** GUID */
+//    @Excel(name = "GUID")
     private String stockinGuid;
 
-    /** 入库单号 */
-    @Excel(name = "入库单号")
+    /** 入库订单ID */
+    @Excel(name = "入库订单ID")
     private String stockinId;
 
-    /** 入库明细ID */
-    @Excel(name = "入库子单号")
+    /** 子单ID */
+    @Excel(name = "子单ID")
     private String stockinDetailId;
-    /** 入库类型 */
-    @Excel(name = "入库类型", dictType = "in_job_type")
-    private String inType;
 
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String createDate;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createManId;
-    /** ERP单号 */
-    @Excel(name = "订单号")
-    private String erpBill;
-
-    /** 品号 */
-    @Excel(name = "品号")
-    private String productId;
-    /** 品名 */
-    @Excel(name = "品名")
-    private String productName;
-    /** 供应商名称 */
-    @Excel(name = "供应商名称")
-    private String supplierName;
-    /** 单据状态 */
-    @Excel(name = "单据状态")
-    private String status;
-
-    /** 仓库ID */
-//    @Excel(name = "仓库ID")
-    private String warehouseId;
-
-    /** 完成时间 */
-//    @Excel(name = "完成时间")
-    private String finishDate;
-
-    /** 单据来源 */
-//    @Excel(name = "单据来源")
-    private String stockSource;
-
-    /** 部门编码 */
-//    @Excel(name = "部门编码")
+    /** 项目号546 */
+    @Excel(name = "项目号")
     private String departmentNo;
 
-    /** 班组编码 */
-//    @Excel(name = "班组编码")
-    private String classNo;
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
 
-    /** 供应商编号 */
-//    @Excel(name = "供应商编号")
-    private String supplierNo;
+    /** 物料名称546 */
+    @Excel(name = "物料名称")
+    private String productName;
 
-
-
-    /** 供应商简称 */
-//    @Excel(name = "供应商简称")
-    private String simpleName;
-
-    /** 联系人 */
-//    @Excel(name = "联系人")
-    private String contactName;
-
-    /** 联系电话 */
-//    @Excel(name = "联系电话")
-    private String contactNumber;
-
-    /** 供应商地址 */
-//    @Excel(name = "供应商地址")
-    private String address;
-
-
-
-    /** 批次号 */
+    /** 批次号546 */
     @Excel(name = "批次号")
     private String lotNo;
 
     /** 计划数量 */
-//    @Excel(name = "计划数量")
+    @Excel(name = "计划数量")
     private String quantity;
 
-    /** 计划箱数 */
-//    @Excel(name = "计划箱数")
-    private String quantityX;
-
-    /** 计划件数 */
-//    @Excel(name = "计划件数")
-    private String quantityJ;
-
-    /** 实际数量 */
-//    @Excel(name = "实际数量")
-    private String assignNum;
-
-    /** 实际箱数 */
-//    @Excel(name = "实际箱数")
-    private String assignNumX;
-
-    /** 实际件数 */
-//    @Excel(name = "实际件数")
-    private String assignNumJ;
-
     /** 扫码数量 */
-//    @Excel(name = "扫码数量")
+    @Excel(name = "扫码数量")
     private String scanNum;
 
-    /** 扫码箱数 */
-//    @Excel(name = "扫码箱数")
-    private String scanNumX;
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private String assignNum;
 
-    /** 扫码件数 */
-//    @Excel(name = "扫码件数")
+    /** 入库类型546 */
+    @Excel(name = "入库类型",dictType = "in_bill_type")
+    private String inType;
+
+    /** 单据状态 */
+    @Excel(name = "单据状态",dictType = "in_bill_status")
+    private String status;
+
+    /** 审核人546 */
+    @Excel(name = "审核人")
+    private String spare4;
+
+    /** 审核时间546 */
+    @Excel(name = "审核时间")
+    private String spare3;
+
+    /** 完成日期 */
+    @Excel(name = "完成日期")
+    private String finishDate;
+
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号")
+    private String spare2;
+
+    /** 合同号546 */
+    @Excel(name = "合同号")
+    private String spare1;
+
+    /** 供应商编码546 */
+    @Excel(name = "供应商编码")
+    private String supplierNo;
+
+    /** 供应商名称546 */
+    @Excel(name = "供应商名称")
+    private String classNo;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位")
+    private String unit;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号")
+    private String spec;
+
+    /** 层级关系546 */
+    @Excel(name = "层级关系")
+    private String cjgx;
+
+    /** 上层物料546 */
+    @Excel(name = "上层物料")
+    private String scwl;
+
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料")
+    private String dcwl;
+
+    /** 单据时间546 */
+    @Excel(name = "单据时间")
+    private String createDate;
+
+    /** 制单人546 */
+    @Excel(name = "制单人")
+    private String createManId;
+
+    /** 仓库ID546 */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /** 备注546 */
+    @Excel(name = "备注")
+    private String spare5;
+
+    /** 单据来源 */
+    @Excel(name = "单据来源")
+    private String stockSource;
+
+    /** 计划数量(件) */
+    @Excel(name = "计划数量(件)")
+    private String quantityJ;
+
+    /** 计划数量(箱) */
+    @Excel(name = "计划数量(箱)")
+    private String quantityX;
+
+    /** 实际数量(件) */
+    @Excel(name = "实际数量(件)")
+    private String assignNumJ;
+
+    /** 实际数量(箱) */
+    @Excel(name = "实际数量(箱)")
+    private String assignNumX;
+
+    /** 扫码数量(件) */
+    @Excel(name = "扫码数量(件)")
     private String scanNumJ;
 
-    /** 入库日期 */
-//    @Excel(name = "入库日期")
-    private String printDate;
+    /** 扫码数量(箱) */
+    @Excel(name = "扫码数量(箱)")
+    private String scanNumX;
 
-    /** 库存状态 */
-    @Excel(name = "库存状态" ,dictType = "stock_status")
-    private String stockStatus;
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String erpBill;
 
-    /** 物料主键 */
-//    @Excel(name = "物料主键")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String customerNo;
+
+    /** 主单GUID */
+//    @Excel(name = "主单GUID")
     private String productGuid;
 
 
-
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 型号 */
-//    @Excel(name = "型号")
-    private String spare1;
-
-    /** 单件净重 */
-//    @Excel(name = "单件净重")
-    private String spare2;
-
-    /** 颜色 */
-//    @Excel(name = "颜色")
-    private String spare3;
-
-    /** 序列号 */
-//    @Excel(name = "序列号")
-    private String spare4;
-
-    /** 电压 */
-//    @Excel(name = "电压")
-    private String spare5;
-
-    /** 功率 */
-//    @Excel(name = "功率")
-    private String spare6;
-
-
-
-    /** 相位 */
-//    @Excel(name = "相位")
-    private String spare7;
-
-    /** 毛重 */
-//    @Excel(name = "毛重")
-    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 = "描述")
-    private String remark;
-    /** 仓库名称 */
-//    @Excel(name = "仓库名称")
-    private String warehouseName;
-
-    private String startTime;
-    private String finishTime;
-
-    public String getStockinGuid() {
-        return stockinGuid;
-    }
-
-    public void setStockinGuid(String stockinGuid) {
+    public void setStockinGuid(String stockinGuid) 
+    {
         this.stockinGuid = stockinGuid;
     }
 
-    public String getStockinId() {
-        return stockinId;
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
     }
 
-    public void setStockinId(String stockinId) {
+    public void setStockinId(String stockinId) 
+    {
         this.stockinId = stockinId;
     }
 
-    public String getStockinDetailId() {
-        return stockinDetailId;
+    public String getStockinId() 
+    {
+        return stockinId;
     }
 
-    public void setStockinDetailId(String stockinDetailId) {
-        this.stockinDetailId = stockinDetailId;
-    }
-
-    public String getInType() {
-        return inType;
-    }
-
-    public void setInType(String inType) {
+    public void setInType(String inType) 
+    {
         this.inType = inType;
     }
 
-    public String getCreateDate() {
-        return createDate;
+    public String getInType() 
+    {
+        return inType;
     }
 
-    public void setCreateDate(String createDate) {
+    public void setCreateDate(String createDate) 
+    {
         this.createDate = createDate;
     }
 
-    public String getCreateManId() {
-        return createManId;
+    public String getCreateDate() 
+    {
+        return createDate;
     }
 
-    public void setCreateManId(String createManId) {
+    public void setCreateManId(String createManId) 
+    {
         this.createManId = createManId;
     }
 
-    public String getErpBill() {
-        return erpBill;
+    public String getCreateManId() 
+    {
+        return createManId;
     }
 
-    public void setErpBill(String erpBill) {
-        this.erpBill = erpBill;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
+    public void setStatus(String status) 
+    {
         this.status = status;
     }
 
-    public String getWarehouseId() {
-        return warehouseId;
+    public String getStatus() 
+    {
+        return status;
     }
 
-    public void setWarehouseId(String warehouseId) {
+    public void setWarehouseId(String warehouseId) 
+    {
         this.warehouseId = warehouseId;
     }
 
-    public String getFinishDate() {
-        return finishDate;
+    public String getWarehouseId() 
+    {
+        return warehouseId;
     }
 
-    public void setFinishDate(String finishDate) {
-        this.finishDate = finishDate;
-    }
-
-    public String getStockSource() {
-        return stockSource;
-    }
-
-    public void setStockSource(String stockSource) {
-        this.stockSource = stockSource;
-    }
-
-    public String getDepartmentNo() {
-        return departmentNo;
-    }
-
-    public void setDepartmentNo(String departmentNo) {
-        this.departmentNo = departmentNo;
-    }
-
-    public String getClassNo() {
-        return classNo;
-    }
-
-    public void setClassNo(String classNo) {
-        this.classNo = classNo;
-    }
-
-    public String getSupplierNo() {
-        return supplierNo;
-    }
-
-    public void setSupplierNo(String supplierNo) {
-        this.supplierNo = supplierNo;
-    }
-
-    public String getSimpleName() {
-        return simpleName;
-    }
-
-    public void setSimpleName(String simpleName) {
-        this.simpleName = simpleName;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public String getContactNumber() {
-        return contactNumber;
-    }
-
-    public void setContactNumber(String contactNumber) {
-        this.contactNumber = contactNumber;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getLotNo() {
-        return lotNo;
-    }
-
-    public void setLotNo(String lotNo) {
-        this.lotNo = lotNo;
-    }
-
-    public String getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(String quantity) {
-        this.quantity = quantity;
-    }
-
-    public String getQuantityX() {
-        return quantityX;
-    }
-
-    public void setQuantityX(String quantityX) {
-        this.quantityX = quantityX;
-    }
-
-    public String getQuantityJ() {
-        return quantityJ;
-    }
-
-    public void setQuantityJ(String quantityJ) {
-        this.quantityJ = quantityJ;
-    }
-
-    public String getAssignNum() {
-        return assignNum;
-    }
-
-    public void setAssignNum(String assignNum) {
-        this.assignNum = assignNum;
-    }
-
-    public String getAssignNumX() {
-        return assignNumX;
-    }
-
-    public void setAssignNumX(String assignNumX) {
-        this.assignNumX = assignNumX;
-    }
-
-    public String getAssignNumJ() {
-        return assignNumJ;
-    }
-
-    public void setAssignNumJ(String assignNumJ) {
-        this.assignNumJ = assignNumJ;
-    }
-
-    public String getScanNum() {
-        return scanNum;
-    }
-
-    public void setScanNum(String scanNum) {
-        this.scanNum = scanNum;
-    }
-
-    public String getScanNumX() {
-        return scanNumX;
-    }
-
-    public void setScanNumX(String scanNumX) {
-        this.scanNumX = scanNumX;
-    }
-
-    public String getScanNumJ() {
-        return scanNumJ;
-    }
-
-    public void setScanNumJ(String scanNumJ) {
-        this.scanNumJ = scanNumJ;
-    }
-
-    public String getPrintDate() {
-        return printDate;
-    }
-
-    public void setPrintDate(String printDate) {
-        this.printDate = printDate;
-    }
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getProductGuid() {
-        return productGuid;
-    }
-
-    public void setProductGuid(String productGuid) {
-        this.productGuid = productGuid;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getCargoNo() {
-        return cargoNo;
-    }
-
-    public void setCargoNo(String cargoNo) {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    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 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 getSpare5() {
-        return spare5;
-    }
-
-    public void setSpare5(String spare5) {
+    public void setSpare5(String spare5) 
+    {
         this.spare5 = spare5;
     }
 
-    public String getSpare6() {
-        return spare6;
+    public String getSpare5() 
+    {
+        return spare5;
     }
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
     }
 
-    public String getSpare7() {
-        return spare7;
+    public String getSpare4() 
+    {
+        return spare4;
     }
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
     }
 
-    public String getSpare8() {
-        return spare8;
+    public String getSpare3() 
+    {
+        return spare3;
     }
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
+    public void setFinishDate(String finishDate) 
+    {
+        this.finishDate = finishDate;
     }
 
-    public String getSpare9() {
-        return spare9;
+    public String getFinishDate() 
+    {
+        return finishDate;
     }
 
-    public void setSpare9(String spare9) {
-        this.spare9 = spare9;
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
     }
 
-    public String getSpare10() {
-        return spare10;
+    public String getSpare2() 
+    {
+        return spare2;
     }
 
-    public void setSpare10(String spare10) {
-        this.spare10 = spare10;
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
     }
 
-    public String getSpare11() {
-        return spare11;
+    public String getSpare1() 
+    {
+        return spare1;
     }
 
-    public void setSpare11(String spare11) {
-        this.spare11 = spare11;
+    public void setErpBill(String erpBill) 
+    {
+        this.erpBill = erpBill;
     }
 
-    public String getSpare12() {
-        return spare12;
+    public String getErpBill() 
+    {
+        return erpBill;
     }
 
-    public void setSpare12(String spare12) {
-        this.spare12 = spare12;
+    public void setStockSource(String stockSource) 
+    {
+        this.stockSource = stockSource;
     }
 
-    public String getSpare13() {
-        return spare13;
+    public String getStockSource() 
+    {
+        return stockSource;
     }
 
-    public void setSpare13(String spare13) {
-        this.spare13 = spare13;
+    public void setDepartmentNo(String departmentNo) 
+    {
+        this.departmentNo = departmentNo;
     }
 
-    public String getSpare14() {
-        return spare14;
+    public String getDepartmentNo() 
+    {
+        return departmentNo;
     }
 
-    public void setSpare14(String spare14) {
-        this.spare14 = spare14;
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
     }
 
-    public String getSpare15() {
-        return spare15;
+    public String getCustomerNo() 
+    {
+        return customerNo;
     }
 
-    public void setSpare15(String spare15) {
-        this.spare15 = spare15;
+    public void setClassNo(String classNo) 
+    {
+        this.classNo = classNo;
     }
 
-    public String getSpare16() {
-        return spare16;
+    public String getClassNo() 
+    {
+        return classNo;
     }
 
-    public void setSpare16(String spare16) {
-        this.spare16 = spare16;
+    public void setSupplierNo(String supplierNo) 
+    {
+        this.supplierNo = supplierNo;
     }
 
-    public String getSpare17() {
-        return spare17;
+    public String getSupplierNo() 
+    {
+        return supplierNo;
     }
 
-    public void setSpare17(String spare17) {
-        this.spare17 = spare17;
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
     }
 
-    public String getSpare18() {
-        return spare18;
+    public String getLotNo() 
+    {
+        return lotNo;
     }
 
-    public void setSpare18(String spare18) {
-        this.spare18 = spare18;
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
     }
 
-    public String getSpare19() {
-        return spare19;
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
     }
 
-    public void setSpare19(String spare19) {
-        this.spare19 = spare19;
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
     }
 
-    public String getSpare20() {
-        return spare20;
+    public String getProductGuid() 
+    {
+        return productGuid;
     }
 
-    public void setSpare20(String spare20) {
-        this.spare20 = spare20;
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
     }
 
-    public String getSpare21() {
-        return spare21;
+    public String getProductId() 
+    {
+        return productId;
     }
 
-    public void setSpare21(String spare21) {
-        this.spare21 = spare21;
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
     }
 
-    public String getSpare22() {
-        return spare22;
+    public String getQuantity() 
+    {
+        return quantity;
     }
 
-    public void setSpare22(String spare22) {
-        this.spare22 = spare22;
+    public void setQuantityJ(String quantityJ) 
+    {
+        this.quantityJ = quantityJ;
     }
 
-    public String getSpare23() {
-        return spare23;
+    public String getQuantityJ() 
+    {
+        return quantityJ;
     }
 
-    public void setSpare23(String spare23) {
-        this.spare23 = spare23;
+    public void setQuantityX(String quantityX) 
+    {
+        this.quantityX = quantityX;
     }
 
-    public String getSpare24() {
-        return spare24;
+    public String getQuantityX() 
+    {
+        return quantityX;
     }
 
-    public void setSpare24(String spare24) {
-        this.spare24 = spare24;
+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
     }
 
-    public String getSpare25() {
-        return spare25;
+    public String getAssignNum() 
+    {
+        return assignNum;
     }
 
-    public void setSpare25(String spare25) {
-        this.spare25 = spare25;
+    public void setAssignNumJ(String assignNumJ) 
+    {
+        this.assignNumJ = assignNumJ;
     }
 
-    public String getSpare26() {
-        return spare26;
+    public String getAssignNumJ() 
+    {
+        return assignNumJ;
     }
 
-    public void setSpare26(String spare26) {
-        this.spare26 = spare26;
+    public void setAssignNumX(String assignNumX) 
+    {
+        this.assignNumX = assignNumX;
     }
 
-    public String getSpare27() {
-        return spare27;
+    public String getAssignNumX() 
+    {
+        return assignNumX;
     }
 
-    public void setSpare27(String spare27) {
-        this.spare27 = spare27;
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
     }
 
-    public String getSpare28() {
-        return spare28;
+    public String getUnit() 
+    {
+        return unit;
     }
 
-    public void setSpare28(String spare28) {
-        this.spare28 = spare28;
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
     }
 
-    public String getSpare29() {
-        return spare29;
+    public String getSpec() 
+    {
+        return spec;
     }
 
-    public void setSpare29(String spare29) {
-        this.spare29 = spare29;
+    public void setCjgx(String cjgx) 
+    {
+        this.cjgx = cjgx;
     }
 
-    public String getSpare30() {
-        return spare30;
+    public String getCjgx() 
+    {
+        return cjgx;
     }
 
-    public void setSpare30(String spare30) {
-        this.spare30 = spare30;
+    public void setScwl(String scwl) 
+    {
+        this.scwl = scwl;
     }
 
-    public String getSpare31() {
-        return spare31;
+    public String getScwl() 
+    {
+        return scwl;
     }
 
-    public void setSpare31(String spare31) {
-        this.spare31 = spare31;
+    public void setDcwl(String dcwl) 
+    {
+        this.dcwl = dcwl;
     }
 
-    public String getSpare32() {
-        return spare32;
+    public String getDcwl() 
+    {
+        return dcwl;
     }
 
-    public void setSpare32(String spare32) {
-        this.spare32 = spare32;
+    public void setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
     }
 
-    public String getSpare33() {
-        return spare33;
+    public String getScanNum() 
+    {
+        return scanNum;
     }
 
-    public void setSpare33(String spare33) {
-        this.spare33 = spare33;
+    public void setScanNumJ(String scanNumJ) 
+    {
+        this.scanNumJ = scanNumJ;
     }
 
-    public String getSpare34() {
-        return spare34;
+    public String getScanNumJ() 
+    {
+        return scanNumJ;
     }
 
-    public void setSpare34(String spare34) {
-        this.spare34 = spare34;
+    public void setScanNumX(String scanNumX) 
+    {
+        this.scanNumX = scanNumX;
     }
 
-    public String getSpare35() {
-        return spare35;
+    public String getScanNumX() 
+    {
+        return scanNumX;
     }
 
-    public void setSpare35(String spare35) {
-        this.spare35 = spare35;
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
     }
 
-    public String getSpare36() {
-        return spare36;
+    public String getProductName() 
+    {
+        return productName;
     }
 
-    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;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(String finishTime) {
-        this.finishTime = finishTime;
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("createDate", getCreateDate())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("warehouseId", getWarehouseId())
+            .append("spare5", getSpare5())
+            .append("spare4", getSpare4())
+            .append("spare3", getSpare3())
+            .append("finishDate", getFinishDate())
+            .append("spare2", getSpare2())
+            .append("spare1", getSpare1())
+            .append("erpBill", getErpBill())
+            .append("stockSource", getStockSource())
+            .append("departmentNo", getDepartmentNo())
+            .append("customerNo", getCustomerNo())
+            .append("classNo", getClassNo())
+            .append("supplierNo", getSupplierNo())
+            .append("lotNo", getLotNo())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("quantityJ", getQuantityJ())
+            .append("quantityX", getQuantityX())
+            .append("remark", getRemark())
+            .append("assignNum", getAssignNum())
+            .append("assignNumJ", getAssignNumJ())
+            .append("assignNumX", getAssignNumX())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("cjgx", getCjgx())
+            .append("scwl", getScwl())
+            .append("dcwl", getDcwl())
+            .append("scanNum", getScanNum())
+            .append("scanNumJ", getScanNumJ())
+            .append("scanNumX", getScanNumX())
+            .append("productName", getProductName())
+            .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 3f72368..14edbdd 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 /**
  * 入库单据历史Mapper接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-12-31
  */
 public interface ViewStockinHistoryMapper 
 {
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 46c3e7a..651e545 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
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory;
 /**
  * 入库单据历史Service接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-12-31
  */
 public interface IViewStockinHistoryService 
 {
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 d03b66d..13cd0f0 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
@@ -10,8 +10,8 @@ import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService;
 /**
  * 入库单据历史Service业务层处理
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-12-31
  */
 @Service
 public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService 
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 eed510c..c177426 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
@@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 出库单据历史Controller
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2026-01-06
  */
 @RestController
 @RequestMapping("/search/ViewStockoutHistory")
@@ -63,10 +63,10 @@ public class ViewStockoutHistoryController extends BaseController
      * 获取出库单据历史详细信息
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:query')")
-    @GetMapping(value = "/{stockoutId}")
-    public AjaxResult getInfo(@PathVariable("stockoutId") String stockoutId)
+    @GetMapping(value = "/{stockoutGuid}")
+    public AjaxResult getInfo(@PathVariable("stockoutGuid") String stockoutGuid)
     {
-        return success(viewStockoutHistoryService.selectViewStockoutHistoryByStockoutId(stockoutId));
+        return success(viewStockoutHistoryService.selectViewStockoutHistoryByStockoutGuid(stockoutGuid));
     }
 
     /**
@@ -96,9 +96,9 @@ public class ViewStockoutHistoryController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:remove')")
     @Log(title = "出库单据历史", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockoutIds}")
-    public AjaxResult remove(@PathVariable String[] stockoutIds)
+	@DeleteMapping("/{stockoutGuids}")
+    public AjaxResult remove(@PathVariable String[] stockoutGuids)
     {
-        return toAjax(viewStockoutHistoryService.deleteViewStockoutHistoryByStockoutIds(stockoutIds));
+        return toAjax(viewStockoutHistoryService.deleteViewStockoutHistoryByStockoutGuids(stockoutGuids));
     }
 }
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 608c8a3..19f5c3b 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,11 +1,6 @@
 package com.ruoyi.search.ViewStockoutHistory.domain;
 
 import java.math.BigDecimal;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,804 +9,467 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 出库单据历史对象 view_stockout_history
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2026-01-06
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
 public class ViewStockoutHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 出库单号 */
-    @Excel(name = "出库单号")
+    /** 546 guid */
+    @Excel(name = "546 guid")
+    private String stockoutGuid;
+
+    /** 546 单据编码 */
+    @Excel(name = "546 单据编码")
     private String stockoutId;
 
-    /** 出库子单号 */
-    @Excel(name = "出库子单号")
-    private String stockoutDetailId;
-
-    /** 出库类型 */
-    @Excel(name = "出库类型",dictType = "out_bill_type")
+    /** 546 出库类型 */
+    @Excel(name = "546 出库类型")
     private String outType;
 
-    /** 创建日期 */
-    @Excel(name = "创建日期")
+    /** 546 单据时间 */
+    @Excel(name = "546 单据时间")
     private String createDate;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
+    /** 项目号546 */
+    @Excel(name = "项目号546")
+    private String departmentNo;
+
+    /** 客户编码546 */
+    @Excel(name = "客户编码546")
+    private String customerNo;
+
+    /** 制单人546 */
+    @Excel(name = "制单人546")
     private String createManId;
 
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String erpStockoutId;
+    /** 546 单据状态 */
+    @Excel(name = "546 单据状态")
+    private String status;
 
-    /** 品号 */
-    @Excel(name = "品号")
-    private String productId;
+    /** 单据来源0自建单1接口 */
+    @Excel(name = "单据来源0自建单1接口")
+    private String stockoutSource;
 
-    /** 品名 */
-    @Excel(name = "品名")
-    private String productName;
+    /** 仓库ID546 */
+    @Excel(name = "仓库ID546")
+    private String warehouseId;
+
+    /** 客户名称546 */
+    @Excel(name = "客户名称546")
+    private String classNowId;
 
     /** 出口 */
     @Excel(name = "出口")
     private String exitId;
 
-    /** 出库状态 */
-    @Excel(name = "出库状态",dictType = "out_bill_status")
-    private String status;
-
-    /** 出库数量 */
-    @Excel(name = "出库数量")
-    private BigDecimal quantity;
-
-    /** 分配数量 */
-    @Excel(name = "分配数量")
-    private BigDecimal allotQuantity;
-
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
-
-    /** 出库来源 */
-//    @Excel(name = "出库来源")
-    private String stockoutSource;
-
-
-    /** 仓库ID */
-//    @Excel(name = "仓库ID")
-    private String warehouseId;
-
-    /** 分配编号 */
-//    @Excel(name = "分配编号")
-    private BigDecimal assignNum;
-
-
-    /** 客户编号 */
-//    @Excel(name = "客户编号")
-    private String entryid;
-
-    /** 客户名称 */
-    @Excel(name = "客户名称")
-    private String customerName;
-
-    /** 物料主键 */
-//    @Excel(name = "物料主键")
-    private String productGuid;
-
-
-
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String unit;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
-
-    /** 型号 */
-    @Excel(name = "型号")
+    /** 合同号546 */
+    @Excel(name = "合同号546")
     private String spare1;
 
-    /** 单件净重 */
-    @Excel(name = "单件净重")
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号546")
     private String spare2;
 
-    /** 颜色 */
-    @Excel(name = "颜色")
+    /** 审核时间546 */
+    @Excel(name = "审核时间546")
     private String spare3;
 
-    /** 序列号 */
-    @Excel(name = "序列号")
+    /** 审核人546 */
+    @Excel(name = "审核人546")
     private String spare4;
 
-    /** 电压 */
-    @Excel(name = "电压")
+    /** 备注546 */
+    @Excel(name = "备注546")
     private String spare5;
 
-    /** 功率 */
-    @Excel(name = "功率")
-    private String spare6;
+    /** 546 子单 */
+    @Excel(name = "546 子单")
+    private String stockoutDetailId;
 
-    /** 相位 */
-    @Excel(name = "相位")
-    private String spare7;
+    /** 546 批次 */
+    @Excel(name = "546 批次")
+    private String lotNo;
 
-    /** 毛重 */
-    @Excel(name = "毛重")
-    private String spare8;
+    /** 546 资材编码 */
+    @Excel(name = "546 资材编码")
+    private String productId;
 
-    /** NC号 */
-    @Excel(name = "NC号")
+    /** 546 数量 */
+    @Excel(name = "546 数量")
+    private BigDecimal quantity;
+
+    /** 货位实际数量 */
+    @Excel(name = "货位实际数量")
+    private BigDecimal assignNum;
+
+    /** 货位分配数量 */
+    @Excel(name = "货位分配数量")
+    private BigDecimal allotQuantity;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位546")
+    private String unit;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号546")
+    private String spec;
+
+    /** 546品名 */
+    @Excel(name = "546品名")
+    private String productName;
+
+    /** 层级关系546 */
+    @Excel(name = "层级关系546")
+    private String cjgx;
+
+    /** 上层物料546 */
+    @Excel(name = "上层物料546")
+    private String scwl;
+
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料546")
+    private String dcwl;
+
+    /** 货位，托盘加数量按逗号分开546 */
+    @Excel(name = "货位，托盘加数量按逗号分开546")
     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 = "产品定位", 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 remark;
-
-    private String startTime;
-    private String finishTime;
-
-    public String getStockoutId() {
-        return stockoutId;
+    public void setStockoutGuid(String stockoutGuid) 
+    {
+        this.stockoutGuid = stockoutGuid;
     }
 
-    public void setStockoutId(String stockoutId) {
+    public String getStockoutGuid() 
+    {
+        return stockoutGuid;
+    }
+
+    public void setStockoutId(String stockoutId) 
+    {
         this.stockoutId = stockoutId;
     }
 
-    public String getStockoutDetailId() {
-        return stockoutDetailId;
+    public String getStockoutId() 
+    {
+        return stockoutId;
     }
 
-    public void setStockoutDetailId(String stockoutDetailId) {
-        this.stockoutDetailId = stockoutDetailId;
-    }
-
-    public String getOutType() {
-        return outType;
-    }
-
-    public void setOutType(String outType) {
+    public void setOutType(String outType) 
+    {
         this.outType = outType;
     }
 
-    public String getCreateDate() {
-        return createDate;
+    public String getOutType() 
+    {
+        return outType;
     }
 
-    public void setCreateDate(String createDate) {
+    public void setCreateDate(String createDate) 
+    {
         this.createDate = createDate;
     }
 
-    public String getCreateManId() {
-        return createManId;
+    public String getCreateDate() 
+    {
+        return createDate;
     }
 
-    public void setCreateManId(String createManId) {
+    public void setDepartmentNo(String departmentNo) 
+    {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getDepartmentNo() 
+    {
+        return departmentNo;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
         this.createManId = createManId;
     }
 
-    public String getErpStockoutId() {
-        return erpStockoutId;
+    public String getCreateManId() 
+    {
+        return createManId;
     }
 
-    public void setErpStockoutId(String erpStockoutId) {
-        this.erpStockoutId = erpStockoutId;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getExitId() {
-        return exitId;
-    }
-
-    public void setExitId(String exitId) {
-        this.exitId = exitId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
+    public void setStatus(String status) 
+    {
         this.status = status;
     }
 
-    public BigDecimal getQuantity() {
-        return quantity;
+    public String getStatus() 
+    {
+        return status;
     }
 
-    public void setQuantity(BigDecimal quantity) {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getAllotQuantity() {
-        return allotQuantity;
-    }
-
-    public void setAllotQuantity(BigDecimal allotQuantity) {
-        this.allotQuantity = allotQuantity;
-    }
-
-    public String getLotNo() {
-        return lotNo;
-    }
-
-    public void setLotNo(String lotNo) {
-        this.lotNo = lotNo;
-    }
-
-    public String getStockoutSource() {
-        return stockoutSource;
-    }
-
-    public void setStockoutSource(String stockoutSource) {
+    public void setStockoutSource(String stockoutSource) 
+    {
         this.stockoutSource = stockoutSource;
     }
 
-    public String getWarehouseId() {
-        return warehouseId;
+    public String getStockoutSource() 
+    {
+        return stockoutSource;
     }
 
-    public void setWarehouseId(String warehouseId) {
+    public void setWarehouseId(String warehouseId) 
+    {
         this.warehouseId = warehouseId;
     }
 
-    public BigDecimal getAssignNum() {
-        return assignNum;
+    public String getWarehouseId() 
+    {
+        return warehouseId;
     }
 
-    public void setAssignNum(BigDecimal assignNum) {
-        this.assignNum = assignNum;
+    public void setClassNowId(String classNowId) 
+    {
+        this.classNowId = classNowId;
     }
 
-    public String getEntryid() {
-        return entryid;
+    public String getClassNowId() 
+    {
+        return classNowId;
     }
 
-    public void setEntryid(String entryid) {
-        this.entryid = entryid;
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
     }
 
-    public String getCustomerName() {
-        return customerName;
+    public String getExitId() 
+    {
+        return exitId;
     }
 
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getProductGuid() {
-        return productGuid;
-    }
-
-    public void setProductGuid(String productGuid) {
-        this.productGuid = productGuid;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getCargoNo() {
-        return cargoNo;
-    }
-
-    public void setCargoNo(String cargoNo) {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    public String getSpare1() {
-        return spare1;
-    }
-
-    public void setSpare1(String spare1) {
+    public void setSpare1(String spare1) 
+    {
         this.spare1 = spare1;
     }
 
-    public String getSpare2() {
-        return spare2;
+    public String getSpare1() 
+    {
+        return spare1;
     }
 
-    public void setSpare2(String spare2) {
+    public void setSpare2(String spare2) 
+    {
         this.spare2 = spare2;
     }
 
-    public String getSpare3() {
-        return spare3;
+    public String getSpare2() 
+    {
+        return spare2;
     }
 
-    public void setSpare3(String spare3) {
+    public void setSpare3(String spare3) 
+    {
         this.spare3 = spare3;
     }
 
-    public String getSpare4() {
-        return spare4;
+    public String getSpare3() 
+    {
+        return spare3;
     }
 
-    public void setSpare4(String spare4) {
+    public void setSpare4(String spare4) 
+    {
         this.spare4 = spare4;
     }
 
-    public String getSpare5() {
-        return spare5;
+    public String getSpare4() 
+    {
+        return spare4;
     }
 
-    public void setSpare5(String spare5) {
+    public void setSpare5(String spare5) 
+    {
         this.spare5 = spare5;
     }
 
-    public String getSpare6() {
-        return spare6;
+    public String getSpare5() 
+    {
+        return spare5;
     }
 
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
+    public void setStockoutDetailId(String stockoutDetailId) 
+    {
+        this.stockoutDetailId = stockoutDetailId;
     }
 
-    public String getSpare7() {
-        return spare7;
+    public String getStockoutDetailId() 
+    {
+        return stockoutDetailId;
     }
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
     }
 
-    public String getSpare8() {
-        return spare8;
+    public String getLotNo() 
+    {
+        return lotNo;
     }
 
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
     }
 
-    public String getSpare9() {
-        return spare9;
+    public String getProductId() 
+    {
+        return productId;
     }
 
-    public void setSpare9(String spare9) {
+    public void setQuantity(BigDecimal quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setAssignNum(BigDecimal assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public BigDecimal getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAllotQuantity(BigDecimal allotQuantity) 
+    {
+        this.allotQuantity = allotQuantity;
+    }
+
+    public BigDecimal getAllotQuantity() 
+    {
+        return allotQuantity;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setCjgx(String cjgx) 
+    {
+        this.cjgx = cjgx;
+    }
+
+    public String getCjgx() 
+    {
+        return cjgx;
+    }
+
+    public void setScwl(String scwl) 
+    {
+        this.scwl = scwl;
+    }
+
+    public String getScwl() 
+    {
+        return scwl;
+    }
+
+    public void setDcwl(String dcwl) 
+    {
+        this.dcwl = dcwl;
+    }
+
+    public String getDcwl() 
+    {
+        return dcwl;
+    }
+
+    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;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getFinishTime() {
-        return finishTime;
-    }
-
-    public void setFinishTime(String finishTime) {
-        this.finishTime = finishTime;
+    public String getSpare9() 
+    {
+        return spare9;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockoutGuid", getStockoutGuid())
+            .append("stockoutId", getStockoutId())
+            .append("outType", getOutType())
+            .append("createDate", getCreateDate())
+            .append("departmentNo", getDepartmentNo())
+            .append("customerNo", getCustomerNo())
+            .append("createManId", getCreateManId())
+            .append("status", getStatus())
+            .append("stockoutSource", getStockoutSource())
+            .append("warehouseId", getWarehouseId())
+            .append("classNowId", getClassNowId())
+            .append("exitId", getExitId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("stockoutDetailId", getStockoutDetailId())
+            .append("lotNo", getLotNo())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("assignNum", getAssignNum())
+            .append("allotQuantity", getAllotQuantity())
+            .append("remark", getRemark())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("productName", getProductName())
+            .append("cjgx", getCjgx())
+            .append("scwl", getScwl())
+            .append("dcwl", getDcwl())
+            .append("spare9", getSpare9())
+            .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 501ffb2..4964a47 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
@@ -6,18 +6,18 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 /**
  * 出库单据历史Mapper接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2026-01-06
  */
 public interface ViewStockoutHistoryMapper 
 {
     /**
      * 查询出库单据历史
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 出库单据历史
      */
-    public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId);
+    public ViewStockoutHistory selectViewStockoutHistoryByStockoutGuid(String stockoutGuid);
 
     /**
      * 查询出库单据历史列表
@@ -46,16 +46,16 @@ public interface ViewStockoutHistoryMapper
     /**
      * 删除出库单据历史
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 结果
      */
-    public int deleteViewStockoutHistoryByStockoutId(String stockoutId);
+    public int deleteViewStockoutHistoryByStockoutGuid(String stockoutGuid);
 
     /**
      * 批量删除出库单据历史
      * 
-     * @param stockoutIds 需要删除的数据主键集合
+     * @param stockoutGuids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds);
+    public int deleteViewStockoutHistoryByStockoutGuids(String[] stockoutGuids);
 }
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 56c4001..aa7457e 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
@@ -6,18 +6,18 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 /**
  * 出库单据历史Service接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2026-01-06
  */
 public interface IViewStockoutHistoryService 
 {
     /**
      * 查询出库单据历史
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 出库单据历史
      */
-    public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId);
+    public ViewStockoutHistory selectViewStockoutHistoryByStockoutGuid(String stockoutGuid);
 
     /**
      * 查询出库单据历史列表
@@ -46,16 +46,16 @@ public interface IViewStockoutHistoryService
     /**
      * 批量删除出库单据历史
      * 
-     * @param stockoutIds 需要删除的出库单据历史主键集合
+     * @param stockoutGuids 需要删除的出库单据历史主键集合
      * @return 结果
      */
-    public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds);
+    public int deleteViewStockoutHistoryByStockoutGuids(String[] stockoutGuids);
 
     /**
      * 删除出库单据历史信息
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 结果
      */
-    public int deleteViewStockoutHistoryByStockoutId(String stockoutId);
+    public int deleteViewStockoutHistoryByStockoutGuid(String stockoutGuid);
 }
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 5bf1d8c..f706fc5 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
@@ -10,8 +10,8 @@ import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService;
 /**
  * 出库单据历史Service业务层处理
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2026-01-06
  */
 @Service
 public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService 
@@ -22,13 +22,13 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
     /**
      * 查询出库单据历史
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 出库单据历史
      */
     @Override
-    public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId)
+    public ViewStockoutHistory selectViewStockoutHistoryByStockoutGuid(String stockoutGuid)
     {
-        return viewStockoutHistoryMapper.selectViewStockoutHistoryByStockoutId(stockoutId);
+        return viewStockoutHistoryMapper.selectViewStockoutHistoryByStockoutGuid(stockoutGuid);
     }
 
     /**
@@ -70,24 +70,24 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi
     /**
      * 批量删除出库单据历史
      * 
-     * @param stockoutIds 需要删除的出库单据历史主键
+     * @param stockoutGuids 需要删除的出库单据历史主键
      * @return 结果
      */
     @Override
-    public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds)
+    public int deleteViewStockoutHistoryByStockoutGuids(String[] stockoutGuids)
     {
-        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutIds(stockoutIds);
+        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutGuids(stockoutGuids);
     }
 
     /**
      * 删除出库单据历史信息
      * 
-     * @param stockoutId 出库单据历史主键
+     * @param stockoutGuid 出库单据历史主键
      * @return 结果
      */
     @Override
-    public int deleteViewStockoutHistoryByStockoutId(String stockoutId)
+    public int deleteViewStockoutHistoryByStockoutGuid(String stockoutGuid)
     {
-        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutId(stockoutId);
+        return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutGuid(stockoutGuid);
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
index 4a8d152..81e64fe 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
@@ -6,239 +6,218 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="StockSummary" id="StockSummaryResult">
         <result property="onlyIdentity"    column="only_identity"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <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"    />
+        <result property="stockId" column="stock_id" />
+        <result property="cargoSpaceId" column="cargo_space_id" />
+        <result property="stockStatus" column="stock_status" />
+        <result property="productStatus" column="product_status" />
+        <result property="lotNo" column="lot_no" />
+        <result property="inDate" column="in_date" />
+        <result property="backDate" column="back_date" />
+        <result property="productGuid" column="product_guid" />
+        <result property="quantity" column="quantity" />
+        <result property="jobId" column="job_id" />
+        <result property="trayCode" column="tray_code" />
+        <result property="outQuantity" column="out_quantity" />
+        <result property="stockinDetailId" column="stockin_detail_id" />
+        <result property="stockinId" column="stockin_id" />
+        <result property="inType" column="in_type" />
+        <result property="inClassId" column="in_class_id" />
+        <result property="warehouseId" column="warehouse_id" />
+        <result property="stackingId" column="stacking_id" />
+        <result property="productId" column="product_id" />
+        <result property="productName" column="product_name" />
+        <result property="voltage" column="voltage" />
+        <result property="power" column="power" />
+        <result property="phase" column="phase" />
+        <result property="orderId" column="order_id" />
+        <result property="cargoSpaceName" column="cargo_space_name" />
+        <result property="cargoSpaceStatus" column="cargo_space_status" />
+        <result property="locked" column="locked" />
+        <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="netWeight" column="net_weight" />
+        <result property="grossWeight" column="gross_weight" />
+        <result property="distribution" column="distribution" />
+        <result property="model" column="model" />
     </resultMap>
 
     <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 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="groupByOrderId != null and groupByOrderId">s.order_id,</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>
+                <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupByOrderId != null and groupByOrderId or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByStockId != null and groupByStockId or groupByStockStatus != null and groupByStockStatus or groupByProductStatus != null and groupByProductStatus or groupByInDate != null and groupByInDate or groupByBackDate != null and groupByBackDate or groupByProductGuid != null and groupByProductGuid or groupByJobId != null and groupByJobId or groupByTrayCode != null and groupByTrayCode or groupByOutQuantity != null and groupByOutQuantity or groupByStockinDetailId != null and groupByStockinDetailId or groupByStockinId != null and groupByStockinId or groupByInType != null and groupByInType or groupByInClassId != null and groupByInClassId or groupByStackingId != null and groupByStackingId or groupByVoltage != null and groupByVoltage or groupByPower != null and groupByPower or groupByPhase != null and groupByPhase or groupByCargoSpaceName != null and groupByCargoSpaceName or groupByCargoSpaceStatus != null and groupByCargoSpaceStatus or groupByLocked != null and groupByLocked 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 groupByNetWeight != null and groupByNetWeight or groupByGrossWeight != null and groupByGrossWeight or groupByDistribution != null and groupByDistribution or groupByModel != null and groupByModel">
+                    <if test="groupByStockId != null and groupByStockId">s.stock_id,</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>
+                    <if test="groupByStockStatus != null and groupByStockStatus">s.stock_status,</if>
+                    <if test="groupByProductStatus != null and groupByProductStatus">s.product_status,</if>
+                    <if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
+                    <if test="groupByInDate != null and groupByInDate">s.in_date,</if>
+                    <if test="groupByBackDate != null and groupByBackDate">s.back_date,</if>
+                    <if test="groupByProductGuid != null and groupByProductGuid">s.product_guid,</if>
+                    <if test="groupByJobId != null and groupByJobId">s.job_id,</if>
+                    <if test="groupByTrayCode != null and groupByTrayCode">s.tray_code,</if>
+                    <if test="groupByOutQuantity != null and groupByOutQuantity">s.out_quantity,</if>
+                    <if test="groupByStockinDetailId != null and groupByStockinDetailId">s.stockin_detail_id,</if>
+                    <if test="groupByStockinId != null and groupByStockinId">s.stockin_id,</if>
+                    <if test="groupByInType != null and groupByInType">s.in_type,</if>
+                    <if test="groupByInClassId != null and groupByInClassId">s.in_class_id,</if>
+                    <if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
+                    <if test="groupByStackingId != null and groupByStackingId">s.stacking_id,</if>
+                    <if test="groupByProductId != null and groupByProductId">s.product_id,</if>
+                    <if test="groupByProductName != null and groupByProductName">s.product_name,</if>
+                    <if test="groupByVoltage != null and groupByVoltage">s.voltage,</if>
+                    <if test="groupByPower != null and groupByPower">s.power,</if>
+                    <if test="groupByPhase != null and groupByPhase">s.phase,</if>
+                    <if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
+                    <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">bcs.cargo_space_name,</if>
+                    <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">bcs.status as cargo_space_status,</if>
+                    <if test="groupByLocked != null and groupByLocked">bcs.locked,</if>
+                    <if test="groupBySpare1 != null and groupBySpare1">s.spare1,</if>
+                    <if test="groupBySpare2 != null and groupBySpare2">s.spare2,</if>
+                    <if test="groupBySpare3 != null and groupBySpare3">s.spare3,</if>
+                    <if test="groupBySpare4 != null and groupBySpare4">s.spare4,</if>
+                    <if test="groupBySpare5 != null and groupBySpare5">s.spare5,</if>
+                    <if test="groupBySpare6 != null and groupBySpare6">s.spare6,</if>
+                    <if test="groupBySpare7 != null and groupBySpare7">s.spare7,</if>
+                    <if test="groupBySpare8 != null and groupBySpare8">s.spare8,</if>
+                    <if test="groupByNetWeight != null and groupByNetWeight">s.net_weight,</if>
+                    <if test="groupByGrossWeight != null and groupByGrossWeight">s.gross_weight,</if>
+                    <if test="groupByDistribution != null and groupByDistribution">s.distribution,</if>
+                    <if test="groupByModel != null and groupByModel">s.model,</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
-                    LEFT JOIN bas_warehouse bw ON bw.warehouse_id = s.warehouse_id
                     LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
                     <where>
-                        AND p.product_id IS NOT NULL AND p.product_id != ''
-                        <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
-                        <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
-                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
-                        <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="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="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="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="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
                         <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
+                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
+                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
+                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
+                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
+                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
+                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
+                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
+                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
+                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
+                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
+                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
+                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
                         <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-                        <if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
-                        <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                            ${params.warehouseDataScope}
-                        </if>
+                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
+                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
+                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
+                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
+                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
+                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
                     </where>
                     GROUP BY
                     <trim prefixOverrides=",">
-                        <if test="groupByProductId != null and groupByProductId">,p.product_id</if>
-                        <if test="groupByProductName != null and groupByProductName">,p.product_name</if>
-                        <if test="groupByOrderId != null and groupByOrderId">,s.order_id</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="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="groupByStockId != null and groupByStockId">,s.stock_id</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>
+                        <if test="groupByStockStatus != null and groupByStockStatus">,s.stock_status</if>
+                        <if test="groupByProductStatus != null and groupByProductStatus">,s.product_status</if>
+                        <if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
+                        <if test="groupByInDate != null and groupByInDate">,s.in_date</if>
+                        <if test="groupByBackDate != null and groupByBackDate">,s.back_date</if>
+                        <if test="groupByProductGuid != null and groupByProductGuid">,s.product_guid</if>
+                        <if test="groupByJobId != null and groupByJobId">,s.job_id</if>
+                        <if test="groupByTrayCode != null and groupByTrayCode">,s.tray_code</if>
+                        <if test="groupByOutQuantity != null and groupByOutQuantity">,s.out_quantity</if>
+                        <if test="groupByStockinDetailId != null and groupByStockinDetailId">,s.stockin_detail_id</if>
+                        <if test="groupByStockinId != null and groupByStockinId">,s.stockin_id</if>
+                        <if test="groupByInType != null and groupByInType">,s.in_type</if>
+                        <if test="groupByInClassId != null and groupByInClassId">,s.in_class_id</if>
+                        <if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
+                        <if test="groupByStackingId != null and groupByStackingId">,s.stacking_id</if>
+                        <if test="groupByProductId != null and groupByProductId">,s.product_id</if>
+                        <if test="groupByProductName != null and groupByProductName">,s.product_name</if>
+                        <if test="groupByVoltage != null and groupByVoltage">,s.voltage</if>
+                        <if test="groupByPower != null and groupByPower">,s.power</if>
+                        <if test="groupByPhase != null and groupByPhase">,s.phase</if>
+                        <if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
+                        <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">,bcs.cargo_space_name</if>
+                        <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">,bcs.status</if>
+                        <if test="groupByLocked != null and groupByLocked">,bcs.locked</if>
+                        <if test="groupBySpare1 != null and groupBySpare1">,s.spare1</if>
+                        <if test="groupBySpare2 != null and groupBySpare2">,s.spare2</if>
+                        <if test="groupBySpare3 != null and groupBySpare3">,s.spare3</if>
+                        <if test="groupBySpare4 != null and groupBySpare4">,s.spare4</if>
+                        <if test="groupBySpare5 != null and groupBySpare5">,s.spare5</if>
+                        <if test="groupBySpare6 != null and groupBySpare6">,s.spare6</if>
+                        <if test="groupBySpare7 != null and groupBySpare7">,s.spare7</if>
+                        <if test="groupBySpare8 != null and groupBySpare8">,s.spare8</if>
+                        <if test="groupByNetWeight != null and groupByNetWeight">,s.net_weight</if>
+                        <if test="groupByGrossWeight != null and groupByGrossWeight">,s.gross_weight</if>
+                        <if test="groupByDistribution != null and groupByDistribution">,s.distribution</if>
+                        <if test="groupByModel != null and groupByModel">,s.model</if>
                     </trim>
                 </when>
                 <otherwise>
                     1 as group_all,
                     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
+                    LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
                     <where>
-                        AND p.product_id IS NOT NULL AND p.product_id != ''
-                        <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
-                        <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
-                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
-                        <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="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</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="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
                         <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
+                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
+                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
+                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
+                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
+                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
+                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
+                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
+                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
+                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
+                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
+                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
+                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
                         <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-                        <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                            ${params.warehouseDataScope}
-                        </if>
+                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
+                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
+                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
+                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
+                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
+                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
                     </where>
                 </otherwise>
             </choose>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index bb9ff4d..60b2b8d 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -6,172 +6,111 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
         <result property="jobId"    column="job_id"    />
-        <result property="jobDetailId"    column="job_detail_id"    />
         <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
         <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
         <result property="trayCode"    column="tray_code"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
         <result property="priority"    column="priority"    />
         <result property="executionPhase"    column="execution_phase"    />
         <result property="inOrOut"    column="in_or_out"    />
-        <result property="entranceId"    column="entrance_id"    />
-        <result property="wlbh"    column="wlbh"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="inQuantity"    column="in_quantity"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
         <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
         <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="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinId"    column="stockin_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="stockinDetailId"    column="stockin_detail_id"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productId"    column="product_id"    />
         <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="lineId"    column="line_id"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_id, job_detail_id,line_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
+        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_in_job_flow
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
         <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>
-            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
+            <if test="onLineType != null  and onLineType != ''"> and on_line_type = #{onLineType}</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="departmentId != null  and departmentId != ''"> and department_id = #{departmentId}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
             <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</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="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 = #{inOrOut}</if>
-            <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat('%', #{entranceId}, '%')</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 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>
-            <if test="createTime != null  and createTime != ''"> and create_time like concat('%', #{createTime}, '%')</if>
-            <if test="startTime != null  and startTime != ''"> and create_time &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and create_time &lt;= #{finishTime}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</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="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id = #{targetRoadwayId}</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</if>
             <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
+            <if test="workshopId != null  and workshopId != ''"> and workshop_id = #{workshopId}</if>
+            <if test="priority != null "> and priority = #{priority}</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
+            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
+            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
+            <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</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="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
         </where>
     </select>
     
@@ -184,234 +123,159 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into view_in_job_flow
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="jobDetailId != null">job_detail_id,</if>
-            <if test="status != null">status,</if>
-            <if test="taskNo != null">task_no,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
             <if test="trayCode != null">tray_code,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
             <if test="priority != null">priority,</if>
             <if test="executionPhase != null">execution_phase,</if>
             <if test="inOrOut != null">in_or_out,</if>
-            <if test="entranceId != null">entrance_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>
-            <if test="inQuantity != null">in_quantity,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="startTime != null">start_time,</if>
             <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
             <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</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="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinId != null">stockin_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="stockinDetailId != null">stockin_detail_id,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="productId != null">product_id,</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>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="jobDetailId != null">#{jobDetailId},</if>
-            <if test="status != null">#{status},</if>
-            <if test="taskNo != null">#{taskNo},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
             <if test="trayCode != null">#{trayCode},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
             <if test="priority != null">#{priority},</if>
             <if test="executionPhase != null">#{executionPhase},</if>
             <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="entranceId != null">#{entranceId},</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>
-            <if test="inQuantity != null">#{inQuantity},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</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="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinId != null">#{stockinId},</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="stockinDetailId != null">#{stockinDetailId},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="productId != null">#{productId},</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>
          </trim>
     </insert>
 
     <update id="updateViewInJobFlow" parameterType="ViewInJobFlow">
         update view_in_job_flow
         <trim prefix="SET" suffixOverrides=",">
-            <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="taskNo != null">task_no = #{taskNo},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
             <if test="priority != null">priority = #{priority},</if>
             <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="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>
-            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</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="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</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="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="productId != null">product_id = #{productId},</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>
         </trim>
         where job_id = #{jobId}
     </update>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
index 9c94e5f..69d3e3a 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -6,168 +6,111 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
         <result property="jobId"    column="job_id"    />
-        <result property="jobDetailId"    column="job_detail_id"    />
         <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
         <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
         <result property="trayCode"    column="tray_code"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="thePlatoon"    column="the_platoon"    />
-        <result property="theColumn"    column="the_column"    />
-        <result property="theFloor"    column="the_floor"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
         <result property="priority"    column="priority"    />
         <result property="executionPhase"    column="execution_phase"    />
         <result property="inOrOut"    column="in_or_out"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="wlbh"    column="wlbh"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="stockStatus"    column="stock_status"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="giveNum"    column="give_num"    />
-        <result property="inOrOutId"    column="in_or_out_id"    />
-        <result property="inOrOutDId"    column="in_or_out_d_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="startTime"    column="start_time"    />
         <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
         <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
         <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="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinId"    column="stockin_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="stockinDetailId"    column="stockin_detail_id"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productId"    column="product_id"    />
         <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="customerName"    column="customer_name"    />
-        <result property="lineId"    column="line_id"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_id, job_detail_id,line_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
+        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_out_job_flow
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
         <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>
+            <if test="onLineType != null  and onLineType != ''"> and on_line_type = #{onLineType}</if>
             <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
+            <if test="departmentId != null  and departmentId != ''"> and department_id = #{departmentId}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</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="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 = #{inOrOut}</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</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 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>
-            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
-            <if test="createTime != null  and createTime != ''"> and create_time like concat('%', #{createTime}, '%')</if>
-            <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="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="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id = #{targetRoadwayId}</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</if>
             <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
+            <if test="workshopId != null  and workshopId != ''"> and workshop_id = #{workshopId}</if>
+            <if test="priority != null "> and priority = #{priority}</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
+            <if test="inOrOut != null "> and in_or_out = #{inOrOut}</if>
+            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time = #{finishTime}</if>
+            <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</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="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</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="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
         </where>
     </select>
     
@@ -180,240 +123,159 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into view_out_job_flow
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">job_id,</if>
-            <if test="jobDetailId != null">job_detail_id,</if>
-            <if test="status != null">status,</if>
-            <if test="taskNo != null">task_no,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
             <if test="trayCode != null">tray_code,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="thePlatoon != null">the_platoon,</if>
-            <if test="theColumn != null">the_column,</if>
-            <if test="theFloor != null">the_floor,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
             <if test="priority != null">priority,</if>
             <if test="executionPhase != null">execution_phase,</if>
             <if test="inOrOut != null">in_or_out,</if>
-            <if test="exitId != null">exit_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>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="giveNum != null">give_num,</if>
-            <if test="inOrOutId != null">in_or_out_id,</if>
-            <if test="inOrOutDId != null">in_or_out_d_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="startTime != null">start_time,</if>
             <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
             <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</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="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinId != null">stockin_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="stockinDetailId != null">stockin_detail_id,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="productId != null">product_id,</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>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobId != null and jobId != ''">#{jobId},</if>
-            <if test="jobDetailId != null">#{jobDetailId},</if>
-            <if test="status != null">#{status},</if>
-            <if test="taskNo != null">#{taskNo},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
             <if test="trayCode != null">#{trayCode},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="thePlatoon != null">#{thePlatoon},</if>
-            <if test="theColumn != null">#{theColumn},</if>
-            <if test="theFloor != null">#{theFloor},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
             <if test="priority != null">#{priority},</if>
             <if test="executionPhase != null">#{executionPhase},</if>
             <if test="inOrOut != null">#{inOrOut},</if>
-            <if test="exitId != null">#{exitId},</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>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="giveNum != null">#{giveNum},</if>
-            <if test="inOrOutId != null">#{inOrOutId},</if>
-            <if test="inOrOutDId != null">#{inOrOutDId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</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="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinId != null">#{stockinId},</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="stockinDetailId != null">#{stockinDetailId},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="productId != null">#{productId},</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>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
          </trim>
     </insert>
 
     <update id="updateViewOutJobFlow" parameterType="ViewOutJobFlow">
         update view_out_job_flow
         <trim prefix="SET" suffixOverrides=",">
-            <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="taskNo != null">task_no = #{taskNo},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
             <if test="trayCode != null">tray_code = #{trayCode},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
-            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
             <if test="priority != null">priority = #{priority},</if>
             <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="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>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="giveNum != null">give_num = #{giveNum},</if>
-            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
-            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</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="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</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="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="productId != null">product_id = #{productId},</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>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
         </trim>
         where job_id = #{jobId}
     </update>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
index e12fe1c..6881df7 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -3,93 +3,100 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
-
+    
     <resultMap type="ViewStockDetail" id="ViewStockDetailResult">
         <result property="onlyIdentity"    column="only_identity"    />
         <result property="stockId"    column="stock_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
-        <result property="roadwayId"    column="roadway_id"    />
-        <result property="cargoSpaceStatus"    column="cargo_space_status"    />
-        <result property="locked"    column="locked"    />
-        <result property="productId"    column="product_id"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="price"    column="price"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="remark"    column="remark"    />
-        <result property="warehouseName"    column="warehouse_name"    />
         <result property="stockStatus"    column="stock_status"    />
         <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="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="productName"    column="product_name"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
         <result property="orderId"    column="order_id"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="cargoSpaceStatus"    column="cargo_space_status"    />
+        <result property="locked"    column="locked"    />
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
-        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,s.order_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'
+        select only_identity, stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, cargo_space_status, locked from view_stock_detail
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
-        <if test="stockId != null  and stockId != ''"> and s.stock_id like concat('%',#{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 like concat('%',#{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 like concat('%',#{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 like concat('%',#{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>
-        <if test="orderId != null  and orderId != ''"> and s.order_id like concat('%',#{orderId}, '%')</if>
-        <if test="thePlatoon != null and thePlatoon != ''"> and cs.the_platoon = #{thePlatoon}</if>
-        <if test="theColumn != null and theColumn != ''"> and cs.the_column = #{theColumn}</if>
-        <if test="theFloor != null and theFloor != ''"> and cs.the_floor = #{theFloor}</if>
-        <if test="startTime != null and startTime != ''"> and s.in_date &gt;= #{startTime}</if>
-        <if test="finishTime != null and finishTime != ''"> and s.in_date &lt;= #{finishTime}</if>
+        <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="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 like concat('%', #{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 like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{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="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
+            <if test="power != null  and power != ''"> and power = #{power}</if>
+            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
+            <if test="netWeight != null  and netWeight != ''"> and net_weight = #{netWeight}</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight = #{grossWeight}</if>
+            <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
+            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cargo_space_status = #{cargoSpaceStatus}</if>
+            <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
+        </where>
     </select>
-
+    
     <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
         where only_identity = #{onlyIdentity}
@@ -101,59 +108,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="onlyIdentity != null">only_identity,</if>
             <if test="stockId != null and stockId != ''">stock_id,</if>
             <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="trayCode != null">tray_code,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <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="lotNo != null">lot_no,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
             <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="inDate != null">in_date,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="stackingId != null">stacking_id,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
-            <if test="roadwayId != null">roadway_id,</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status,</if>
-            <if test="locked != null">locked,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="price != null">price,</if>
-            <if test="remark != null">remark,</if>
             <if test="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="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="productName != null">product_name,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
+            <if test="netWeight != null">net_weight,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="distribution != null">distribution,</if>
+            <if test="model != null">model,</if>
+            <if test="orderId != null">order_id,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+            <if test="cargoSpaceStatus != null">cargo_space_status,</if>
+            <if test="locked != null">locked,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="onlyIdentity != null">#{onlyIdentity},</if>
             <if test="stockId != null and stockId != ''">#{stockId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <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="lotNo != null">#{lotNo},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
             <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="inDate != null">#{inDate},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="stackingId != null">#{stackingId},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
-            <if test="roadwayId != null">#{roadwayId},</if>
-            <if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
-            <if test="locked != null">#{locked},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
             <if test="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="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="productName != null">#{productName},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
+            <if test="netWeight != null">#{netWeight},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="distribution != null">#{distribution},</if>
+            <if test="model != null">#{model},</if>
+            <if test="orderId != null">#{orderId},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+            <if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
+            <if test="locked != null">#{locked},</if>
          </trim>
     </insert>
 
@@ -162,30 +195,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="stockId != null and stockId != ''">stock_id = #{stockId},</if>
             <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <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="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
             <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <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="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
-            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
-            <if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
-            <if test="locked != null">locked = #{locked},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="remark != null">remark = #{remark},</if>
             <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="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="productName != null">product_name = #{productName},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="distribution != null">distribution = #{distribution},</if>
+            <if test="model != null">model = #{model},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
             <if test="spare7 != null">spare7 = #{spare7},</if>
             <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
+            <if test="locked != null">locked = #{locked},</if>
         </trim>
         where only_identity = #{onlyIdentity}
     </update>
@@ -195,9 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewStockDetailByOnlyIdentitys" parameterType="String">
-        delete from view_stock_detail where only_identity in
+        delete from view_stock_detail where only_identity in 
         <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
             #{onlyIdentity}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
index e706b6d..ee6b8ca 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
@@ -12,178 +12,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createManId"    column="create_man_id"    />
         <result property="status"    column="status"    />
         <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
         <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
         <result property="erpBill"    column="erp_bill"    />
         <result property="stockSource"    column="stock_source"    />
         <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
         <result property="classNo"    column="class_no"    />
         <result property="supplierNo"    column="supplier_no"    />
-        <result property="supplierName"    column="supplier_name"    />
-        <result property="simpleName"    column="simple_name"    />
-        <result property="contactName"    column="contact_name"    />
-        <result property="contactNumber"    column="contact_number"    />
-        <result property="address"    column="address"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
         <result property="lotNo"    column="lot_no"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="quantityX"    column="quantity_x"    />
-        <result property="quantityJ"    column="quantity_j"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="assignNumX"    column="assign_num_x"    />
-        <result property="assignNumJ"    column="assign_num_j"    />
-        <result property="scanNum"    column="scan_num"    />
-        <result property="scanNumX"    column="scan_num_x"    />
-        <result property="scanNumJ"    column="scan_num_j"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="stockStatus"    column="stock_status"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
         <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="quantity"    column="quantity"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="assignNumX"    column="assign_num_x"    />
         <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="cjgx"    column="cjgx"    />
+        <result property="scwl"    column="scwl"    />
+        <result property="dcwl"    column="dcwl"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="scanNumX"    column="scan_num_x"    />
         <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, 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
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, lot_no, stockin_detail_id, product_guid, product_id, quantity, quantity_j, quantity_x, remark, assign_num, assign_num_j, assign_num_x, unit, spec, cjgx, scwl, dcwl, scan_num, scan_num_j, scan_num_x, product_name from view_stockin_history
     </sql>
 
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
         <include refid="selectViewStockinHistoryVo"/>
         <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="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
-            <if test="startTime != null  and startTime != ''"> and create_date &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and create_date &lt;= #{startTime}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
-            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
-            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
-            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
-            <if test="classNo != null  and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
-            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
-            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="simpleName != null  and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
-            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and contact_number like concat('%', #{contactNumber}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
-            <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 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="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="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill = #{erpBill}</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source = #{stockSource}</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="classNo != null  and classNo != ''"> and class_no = #{classNo}</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x = #{quantityX}</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num = #{assignNum}</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="cjgx != null  and cjgx != ''"> and cjgx = #{cjgx}</if>
+            <if test="scwl != null  and scwl != ''"> and scwl = #{scwl}</if>
+            <if test="dcwl != null  and dcwl != ''"> and dcwl = #{dcwl}</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num = #{scanNum}</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x = #{scanNumX}</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="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
         </where>
     </select>
     
@@ -196,252 +103,129 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into view_stockin_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="createDate != null">create_date,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
             <if test="createManId != null">create_man_id,</if>
-            <if test="status != null">status,</if>
+            <if test="status != null and status != ''">status,</if>
             <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
             <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
             <if test="erpBill != null">erp_bill,</if>
             <if test="stockSource != null">stock_source,</if>
             <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
             <if test="classNo != null">class_no,</if>
             <if test="supplierNo != null">supplier_no,</if>
-            <if test="supplierName != null">supplier_name,</if>
-            <if test="simpleName != null">simple_name,</if>
-            <if test="contactName != null">contact_name,</if>
-            <if test="contactNumber != null">contact_number,</if>
-            <if test="address != null">address,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
             <if test="lotNo != null">lot_no,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="quantityX != null">quantity_x,</if>
-            <if test="quantityJ != null">quantity_j,</if>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="assignNumX != null">assign_num_x,</if>
-            <if test="assignNumJ != null">assign_num_j,</if>
-            <if test="scanNum != null">scan_num,</if>
-            <if test="scanNumX != null">scan_num_x,</if>
-            <if test="scanNumJ != null">scan_num_j,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="stockStatus != null">stock_status,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</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="quantity != null">quantity,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="assignNumX != null">assign_num_x,</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="cjgx != null">cjgx,</if>
+            <if test="scwl != null">scwl,</if>
+            <if test="dcwl != null">dcwl,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="scanNumX != null">scan_num_x,</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>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="createDate != null">#{createDate},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
             <if test="createManId != null">#{createManId},</if>
-            <if test="status != null">#{status},</if>
+            <if test="status != null and status != ''">#{status},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
             <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
             <if test="erpBill != null">#{erpBill},</if>
             <if test="stockSource != null">#{stockSource},</if>
             <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
             <if test="classNo != null">#{classNo},</if>
             <if test="supplierNo != null">#{supplierNo},</if>
-            <if test="supplierName != null">#{supplierName},</if>
-            <if test="simpleName != null">#{simpleName},</if>
-            <if test="contactName != null">#{contactName},</if>
-            <if test="contactNumber != null">#{contactNumber},</if>
-            <if test="address != null">#{address},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
             <if test="lotNo != null">#{lotNo},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="scanNum != null">#{scanNum},</if>
-            <if test="scanNumX != null">#{scanNumX},</if>
-            <if test="scanNumJ != null">#{scanNumJ},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</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="quantity != null">#{quantity},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="assignNumX != null">#{assignNumX},</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="cjgx != null">#{cjgx},</if>
+            <if test="scwl != null">#{scwl},</if>
+            <if test="dcwl != null">#{dcwl},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="scanNumX != null">#{scanNumX},</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>
 
     <update id="updateViewStockinHistory" parameterType="ViewStockinHistory">
         update view_stockin_history
         <trim prefix="SET" suffixOverrides=",">
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="createDate != null">create_date = #{createDate},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
             <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null">status = #{status},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
             <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="erpBill != null">erp_bill = #{erpBill},</if>
             <if test="stockSource != null">stock_source = #{stockSource},</if>
             <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
             <if test="classNo != null">class_no = #{classNo},</if>
             <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
-            <if test="simpleName != null">simple_name = #{simpleName},</if>
-            <if test="contactName != null">contact_name = #{contactName},</if>
-            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
             <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="quantityX != null">quantity_x = #{quantityX},</if>
-            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
-            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
-            <if test="scanNum != null">scan_num = #{scanNum},</if>
-            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
-            <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="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</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="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</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="cjgx != null">cjgx = #{cjgx},</if>
+            <if test="scwl != null">scwl = #{scwl},</if>
+            <if test="dcwl != null">dcwl = #{dcwl},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</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>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
index 35489b7..ba2e846 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
@@ -5,373 +5,199 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper">
     
     <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
+        <result property="stockoutGuid"    column="stockout_guid"    />
         <result property="stockoutId"    column="stockout_id"    />
         <result property="outType"    column="out_type"    />
         <result property="createDate"    column="create_date"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
         <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="lotNo"    column="lot_no"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="allotQuantity"    column="allot_quantity"    />
-        <result property="assignNum"    column="assign_num"    />
-        <result property="erpStockoutId"    column="erp_stockout_id"    />
-        <result property="entryid"    column="entryid"    />
-        <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="classNowId"    column="class_now_id"    />
+        <result property="exitId"    column="exit_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="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="remark"    column="remark"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
         <result property="productName"    column="product_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
+        <result property="cjgx"    column="cjgx"    />
+        <result property="scwl"    column="scwl"    />
+        <result property="dcwl"    column="dcwl"    />
         <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, 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
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, spare1, spare2, spare3, spare4, spare5, stockout_detail_id, lot_no, product_id, quantity, assign_num, allot_quantity, remark, unit, spec, product_name, cjgx, scwl, dcwl, spare9 from view_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         <where>  
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if>
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
             <if test="outType != null  and outType != ''"> and out_type = #{outType}</if>
-            <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
-            <if test="startTime != null  and startTime != ''"> and create_date &gt;= #{startTime}</if>
-            <if test="finishTime != null  and finishTime != ''"> and create_date &lt;= #{finishTime}</if>
-            <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no = #{departmentNo}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source 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="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>
-            <if test="assignNum != null "> and assign_num like concat('%', #{assignNum}, '%')</if>
-            <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="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="classNowId != null  and classNowId != ''"> and class_now_id = #{classNowId}</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</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="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</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="quantity != null "> and quantity = #{quantity}</if>
+            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
+            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</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="cjgx != null  and cjgx != ''"> and cjgx = #{cjgx}</if>
+            <if test="scwl != null  and scwl != ''"> and scwl = #{scwl}</if>
+            <if test="dcwl != null  and dcwl != ''"> and dcwl = #{dcwl}</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 = #{spare9}</if>
         </where>
     </select>
     
-    <select id="selectViewStockoutHistoryByStockoutId" parameterType="String" resultMap="ViewStockoutHistoryResult">
+    <select id="selectViewStockoutHistoryByStockoutGuid" parameterType="String" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
-        where stockout_id = #{stockoutId}
+        where stockout_guid = #{stockoutGuid}
     </select>
 
     <insert id="insertViewStockoutHistory" parameterType="ViewStockoutHistory">
         insert into view_stockout_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
             <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
             <if test="outType != null and outType != ''">out_type,</if>
             <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
             <if test="createManId != null">create_man_id,</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="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>
-            <if test="assignNum != null">assign_num,</if>
-            <if test="erpStockoutId != null">erp_stockout_id,</if>
-            <if test="entryid != null">entryid,</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="classNowId != null">class_now_id,</if>
+            <if test="exitId != null">exit_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="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="allotQuantity != null">allot_quantity,</if>
+            <if test="remark != null">remark,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
             <if test="productName != null">product_name,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
+            <if test="cjgx != null">cjgx,</if>
+            <if test="scwl != null">scwl,</if>
+            <if test="dcwl != null">dcwl,</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="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
             <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
             <if test="outType != null and outType != ''">#{outType},</if>
             <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
             <if test="createManId != null">#{createManId},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="stockoutSource != null">#{stockoutSource},</if>
-            <if test="exitId != null">#{exitId},</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>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="entryid != null">#{entryid},</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="classNowId != null">#{classNowId},</if>
+            <if test="exitId != null">#{exitId},</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="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="allotQuantity != null">#{allotQuantity},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
             <if test="productName != null">#{productName},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
+            <if test="cjgx != null">#{cjgx},</if>
+            <if test="scwl != null">#{scwl},</if>
+            <if test="dcwl != null">#{dcwl},</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="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
             <if test="outType != null and outType != ''">out_type = #{outType},</if>
             <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
             <if test="createManId != null">create_man_id = #{createManId},</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="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>
-            <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <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="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="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</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="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</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="cjgx != null">cjgx = #{cjgx},</if>
+            <if test="scwl != null">scwl = #{scwl},</if>
+            <if test="dcwl != null">dcwl = #{dcwl},</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}
+        where stockout_guid = #{stockoutGuid}
     </update>
 
-    <delete id="deleteViewStockoutHistoryByStockoutId" parameterType="String">
-        delete from view_stockout_history where stockout_id = #{stockoutId}
+    <delete id="deleteViewStockoutHistoryByStockoutGuid" parameterType="String">
+        delete from view_stockout_history where stockout_guid = #{stockoutGuid}
     </delete>
 
-    <delete id="deleteViewStockoutHistoryByStockoutIds" parameterType="String">
-        delete from view_stockout_history where stockout_id in 
-        <foreach item="stockoutId" collection="array" open="(" separator="," close=")">
-            #{stockoutId}
+    <delete id="deleteViewStockoutHistoryByStockoutGuids" parameterType="String">
+        delete from view_stockout_history where stockout_guid in 
+        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
+            #{stockoutGuid}
         </foreach>
     </delete>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/search/ViewStockoutHistory.js b/ruoyi-ui/src/api/search/ViewStockoutHistory.js
index 4754f95..9e6a26d 100644
--- a/ruoyi-ui/src/api/search/ViewStockoutHistory.js
+++ b/ruoyi-ui/src/api/search/ViewStockoutHistory.js
@@ -10,9 +10,9 @@ export function listViewStockoutHistory(query) {
 }
 
 // 查询出库单据历史详细
-export function getViewStockoutHistory(stockoutId) {
+export function getViewStockoutHistory(stockoutGuid) {
   return request({
-    url: '/search/ViewStockoutHistory/' + stockoutId,
+    url: '/search/ViewStockoutHistory/' + stockoutGuid,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateViewStockoutHistory(data) {
 }
 
 // 删除出库单据历史
-export function delViewStockoutHistory(stockoutId) {
+export function delViewStockoutHistory(stockoutGuid) {
   return request({
-    url: '/search/ViewStockoutHistory/' + stockoutId,
+    url: '/search/ViewStockoutHistory/' + stockoutGuid,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue
index 631f8f1..9d844af 100644
--- a/ruoyi-ui/src/views/search/StockSummary/index.vue
+++ b/ruoyi-ui/src/views/search/StockSummary/index.vue
@@ -3,65 +3,53 @@
     <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="orderId">订单号</el-checkbox>
-          <el-checkbox label="productId">品号</el-checkbox>
-          <el-checkbox label="productName">品名</el-checkbox>
-          <el-checkbox label="lotNo">批号</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 label="stockId">库存id</el-checkbox>
+          <el-checkbox label="productId">物料编码</el-checkbox>
+          <el-checkbox label="productName">物料名称</el-checkbox>
+          <el-checkbox label="trayCode">托盘条码</el-checkbox>
+          <el-checkbox label="model">是否满盘</el-checkbox>
+          <el-checkbox label="spare7">盘点记录</el-checkbox>
+          <el-checkbox label="spare4">项目号546</el-checkbox>
+          <el-checkbox label="lotNo">批号546</el-checkbox>
+          <el-checkbox label="spare1">层级关系546</el-checkbox>
+          <el-checkbox label="spare2">上层物料546</el-checkbox>
+          <el-checkbox label="spare3">顶层物料546</el-checkbox>
+          <el-checkbox label="spare5">合同号546</el-checkbox>
+          <el-checkbox label="spare6">销售订单号546</el-checkbox>
+          <el-checkbox label="cargoSpaceId">货位id</el-checkbox>
+          <el-checkbox label="stockStatus">库存状态</el-checkbox>
+          <el-checkbox label="productStatus">物料状态</el-checkbox>
+          <el-checkbox label="stackingId">供应商名称546</el-checkbox>
+          <el-checkbox label="voltage">供应商编码546</el-checkbox>
+          <el-checkbox label="power">规格型号546</el-checkbox>
+          <el-checkbox label="phase">计量单位546</el-checkbox>
+          <el-checkbox label="cargoSpaceName">货位名称</el-checkbox>
+          <el-checkbox label="cargoSpaceStatus">货位状态</el-checkbox>
+          <el-checkbox label="locked">货位锁</el-checkbox>
+<!--          <el-checkbox label="inDate">入库时间</el-checkbox>-->
+<!--          <el-checkbox label="backDate">回流时间</el-checkbox>-->
+<!--          <el-checkbox label="productGuid">物料GUID</el-checkbox>-->
+<!--          <el-checkbox label="quantity">库存数量</el-checkbox>-->
+<!--          <el-checkbox label="jobId">作业ID</el-checkbox>-->
+<!--          <el-checkbox label="outQuantity">出库数量</el-checkbox>-->
+<!--          <el-checkbox label="stockinDetailId">入库子单id</el-checkbox>-->
+<!--          <el-checkbox label="stockinId">入库主单</el-checkbox>-->
+<!--          <el-checkbox label="inType">入库类型</el-checkbox>-->
+<!--          <el-checkbox label="inClassId">入库班组ID</el-checkbox>-->
+<!--          <el-checkbox label="warehouseId">仓库</el-checkbox>-->
+<!--          <el-checkbox label="orderId">订单号</el-checkbox>-->
+<!--          <el-checkbox label="spare8">备用字段</el-checkbox>-->
+<!--          <el-checkbox label="netWeight">净重</el-checkbox>-->
+<!--          <el-checkbox label="grossWeight">毛重</el-checkbox>-->
+<!--          <el-checkbox label="distribution">分配</el-checkbox>-->
         </el-checkbox-group>
       </el-form-item>
       <br>
 
-      <el-form-item label="订单号" prop="orderId">
+      <el-form-item label="库存id" prop="stockId">
         <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单号"
+          v-model="queryParams.stockId"
+          placeholder="请输入库存id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -82,10 +70,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="NC号" prop="spare9">
+      <el-form-item label="项目号" prop="spare4">
         <el-input
-          v-model="queryParams.spare9"
-          placeholder="请输入NC号"
+          v-model="queryParams.spare4"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -121,61 +109,74 @@
     <el-table
       v-loading="loading"
       :data="stockSummaryList"
-      @selection-change="handleSelectionChange"
       max-height="650"
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
-      <el-table-column label="品号" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
-      <el-table-column label="品名" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
-      <el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
-      <!-- <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="160" />
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" 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="160" v-if="queryParams.groupFields.includes('spec')" />
-      <el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
-      <el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />
-      <el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
-      <el-table-column label="NC号" align="left" prop="spare9" width="160" v-if="queryParams.groupFields.includes('spare9')" />
-      <el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />
-      <el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />
-      <el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />
-      <el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />
-      <el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />
-      <el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />
-      <el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />
-      <el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />
-      <el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />
-      <el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />
-      <el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />
-      <el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />
-      <el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />
-      <el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />
-      <el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />
-      <el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />
-      <el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />
-      <el-table-column label="非标颜色" align="left" prop="spare30" width="160" v-if="queryParams.groupFields.includes('spare30')" />
-      <el-table-column label="主颜色" align="left" prop="spare31" width="160" v-if="queryParams.groupFields.includes('spare31')" />
-      <el-table-column label="辅助颜色" align="left" prop="spare32" width="160" v-if="queryParams.groupFields.includes('spare32')" />
-      <el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />
-      <el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />
-      <el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />
-      <el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />
-      <el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />
-      <el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />
-      <el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />
-      <el-table-column label="备注" align="left" prop="remark" width="160" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column label="库存id" align="left" prop="stockId" width="160" v-if="queryParams.groupFields.includes('stockId')" />
+      <el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
+      <el-table-column label="物料名称" align="left" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
+      <el-table-column label="库存数量" align="left" prop="quantity" width="160" v-if="queryParams.groupFields.includes('quantity')" />
+      <el-table-column label="托盘条码" align="left" prop="trayCode" width="160" v-if="queryParams.groupFields.includes('trayCode')" />
+      <el-table-column width="80" label="是否满盘" align="left" prop="model"
+                       :formatter="(row, column, cellValue) => cellValue == '1'  ? '是' : '否'"
+                       v-if="queryParams.groupFields.includes('model')"
+      />
+      <el-table-column width="80" label="盘点记录" align="left" prop="spare7"
+                       :formatter="(row, column, cellValue) => cellValue == '1'  ? '已盘点' : '未盘点'"
+                       v-if="queryParams.groupFields.includes('spare7')"
+      />
+      <el-table-column label="项目号" align="left" prop="spare4" width="160" v-if="queryParams.groupFields.includes('spare4')" />
+      <el-table-column label="批号" align="left" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
+      <el-table-column label="层级关系" align="left" prop="spare1" width="160" v-if="queryParams.groupFields.includes('spare1')" />
+      <el-table-column label="上层物料" align="left" prop="spare2" width="160" v-if="queryParams.groupFields.includes('spare2')" />
+      <el-table-column label="顶层物料" align="left" prop="spare3" width="160" v-if="queryParams.groupFields.includes('spare3')" />
+      <el-table-column label="合同号" align="left" prop="spare5" width="160" v-if="queryParams.groupFields.includes('spare5')" />
+      <el-table-column label="销售订单号" align="left" prop="spare6" width="160" v-if="queryParams.groupFields.includes('spare6')" />
+      <el-table-column label="供应商编码" align="left" prop="voltage" width="160" v-if="queryParams.groupFields.includes('voltage')" />
+      <el-table-column label="供应商名称" align="left" prop="stackingId" width="160" v-if="queryParams.groupFields.includes('stackingId')" />
+      <el-table-column label="规格型号" align="left" prop="power" width="160" v-if="queryParams.groupFields.includes('power')" />
+      <el-table-column label="计量单位" align="left" prop="phase" width="160" v-if="queryParams.groupFields.includes('phase')" />
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceName')" />
+      <el-table-column width="180" label="货位状态" align="left" prop="cargoSpaceStatus" v-if="queryParams.groupFields.includes('cargoSpaceStatus')">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column width="80" label="货位锁" align="left" prop="locked" v-if="queryParams.groupFields.includes('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 width="80" label="库存状态" align="left" prop="stockStatus" v-if="queryParams.groupFields.includes('stockStatus')">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column width="80" label="物料状态" align="left" prop="productStatus" v-if="queryParams.groupFields.includes('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="left" prop="cargoSpaceStatus" width="160" v-if="queryParams.groupFields.includes('cargoSpaceStatus')" />-->
+<!--      <el-table-column label="货位锁" align="left" prop="locked" width="160" v-if="queryParams.groupFields.includes('locked')" />-->
+<!--      <el-table-column label="库存状态" align="left" prop="stockStatus" width="160" v-if="queryParams.groupFields.includes('stockStatus')" />-->
+<!--      <el-table-column label="物料状态" align="left" prop="productStatus" width="160" v-if="queryParams.groupFields.includes('productStatus')" />-->
+<!--      <el-table-column label="入库时间" align="left" prop="inDate" width="160" v-if="queryParams.groupFields.includes('inDate')" />-->
+<!--      <el-table-column label="作业ID" align="left" prop="jobId" width="160" v-if="queryParams.groupFields.includes('jobId')" />-->
+<!--      <el-table-column label="出库数量" align="left" prop="outQuantity" width="160" v-if="queryParams.groupFields.includes('outQuantity')" />-->
+<!--      <el-table-column label="入库子单id" align="left" prop="stockinDetailId" width="160" v-if="queryParams.groupFields.includes('stockinDetailId')" />-->
+<!--      <el-table-column label="入库主单" align="left" prop="stockinId" width="160" v-if="queryParams.groupFields.includes('stockinId')" />-->
+<!--      <el-table-column label="入库类型" align="left" prop="inType" width="160" v-if="queryParams.groupFields.includes('inType')" />-->
+      <!--      <el-table-column label="货位id" align="left" prop="cargoSpaceId" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />-->
+<!--      <el-table-column label="回流时间" align="left" prop="backDate" width="160" v-if="queryParams.groupFields.includes('backDate')" />-->
+<!--      <el-table-column label="物料GUID" align="left" prop="productGuid" width="160" v-if="queryParams.groupFields.includes('productGuid')" />-->
+<!--     <el-table-column label="入库班组ID" align="left" prop="inClassId" width="160" v-if="queryParams.groupFields.includes('inClassId')" />-->
+<!--      <el-table-column label="仓库" align="left" prop="warehouseId" width="160" v-if="queryParams.groupFields.includes('warehouseId')" />-->
+<!--      <el-table-column label="订单号" align="left" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />-->
+<!--      <el-table-column label="备用字段" align="left" prop="spare8" width="160" v-if="queryParams.groupFields.includes('spare8')" />-->
+<!--      <el-table-column label="净重" align="left" prop="netWeight" width="160" v-if="queryParams.groupFields.includes('netWeight')" />-->
+<!--      <el-table-column label="毛重" align="left" prop="grossWeight" width="160" v-if="queryParams.groupFields.includes('grossWeight')" />-->
+<!--      <el-table-column label="分配" align="left" prop="distribution" width="160" v-if="queryParams.groupFields.includes('distribution')" />-->
     </el-table>
 
     <pagination
@@ -194,6 +195,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "StockSummary",
+  dicts:['product_status','stock_status','cargo_space_lock_status','cargo_space_status'],
   data() {
     return {
       // 遮罩层
@@ -216,54 +218,45 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        stockId: null,
+        cargoSpaceId: null,
+        stockStatus: null,
+        productStatus: null,
+        lotNo: null,
+        inDate: null,
+        backDate: null,
+        productGuid: null,
+        quantity: null,
+        jobId: null,
+        trayCode: null,
+        outQuantity: null,
+        stockinDetailId: null,
+        stockinId: null,
+        inType: null,
+        inClassId: null,
+        warehouseId: null,
+        stackingId: null,
         productId: null,
         productName: null,
-        spec: null,
-        unit: null,
-        lotNo: null,
-        warehouseId: null,
-        orderId:null,
-        roadwayId: null,
-        quantity: null,
-        parentId: null,
-        cargoNo: null,
+        voltage: null,
+        power: null,
+        phase: null,
+        orderId: null,
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        locked: 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,
+        netWeight: null,
+        grossWeight: null,
+        distribution: null,
+        model: null,
         //分组字段
         groupFields: []
       }
@@ -272,49 +265,30 @@ export default {
   created() {
     // 初始化时全选分组选项
     this.queryParams.groupFields = [
-      'parentId',
-      'cargoNo',
-      'roadwayId',
-      'orderId',
+      'stockId',
+      'quantity',
+      'cargoSpaceId',
+      'stockStatus',
+      'productStatus',
+      'lotNo',
+      'trayCode',,
+      'stackingId',
+      'productId',
+      'productName',
+      'voltage',
+      'power',
+      'phase',
+      'cargoSpaceName',
+      'cargoSpaceStatus',
+      'locked',
+      'spare1',
+      'spare2',
       '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'
+      'model'
     ];
     this.getList();
     this.getWarehouseList()
@@ -362,49 +336,30 @@ export default {
       this.resetForm("queryForm");
       // 重置时恢复全选状态
       this.queryParams.groupFields = [
-        'parentId',
-        'cargoNo',
-        'orderId',
-        'roadwayId',
+        'stockId',
+        'quantity',
+        'cargoSpaceId',
+        'stockStatus',
+        'productStatus',
+        'lotNo',
+        'trayCode',,
+        'stackingId',
+        'productId',
+        'productName',
+        'voltage',
+        'power',
+        'phase',
+        'cargoSpaceName',
+        'cargoSpaceStatus',
+        'locked',
+        'spare1',
+        'spare2',
         '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'
+        'model'
       ];
       this.handleQuery();
     },
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index 0daf029..a1c3764 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -1,26 +1,32 @@
 <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="status">
-        <el-select v-model="queryParams.status" placeholder="请选择作业状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mydo_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="作业类型" prop="inOrOut">
-        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_all_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="作业编号" prop="jobId">
+        <el-input
+          v-model="queryParams.jobId"
+          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.mydo_job_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="上线类型" prop="onLineType">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.onLineType"-->
+<!--          placeholder="请输入上线类型"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="任务号" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
@@ -29,87 +35,338 @@
           @keyup.enter.native="handleQuery"
         />
       </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="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单号" prop="lineId">
+<!--      <el-form-item label="供应商ID" prop="supplierId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierId"-->
+<!--          placeholder="请输入供应商ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="客户ID" prop="customerId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.customerId"-->
+<!--          placeholder="请输入客户ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="部门ID" prop="departmentId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.departmentId"-->
+<!--          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="巷道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="目标巷道ID" prop="targetRoadwayId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.targetRoadwayId"-->
+<!--          placeholder="请输入目标巷道ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="目标货位ID" prop="targetCargoSpaceId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.targetCargoSpaceId"-->
+<!--          placeholder="请输入目标货位ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="项目号" prop="lineId">
         <el-input
           v-model="queryParams.lineId"
-          placeholder="请输入订单号"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品号" prop="productId">
+<!--      <el-form-item label="517补码标志" prop="workshopId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.workshopId"-->
+<!--          placeholder="请输入517补码标志"-->
+<!--          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-input-->
+<!--          v-model="queryParams.executionPhase"-->
+<!--          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="开始时间" 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="entranceId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.entranceId"-->
+<!--          placeholder="请输入入口ID"-->
+<!--          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="classId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.classId"-->
+<!--          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="faultFlag">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.faultFlag"-->
+<!--          placeholder="请输入重分标记"-->
+<!--          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="库存ID" prop="stockId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockId"-->
+<!--          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="inDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.inDate"-->
+<!--          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="物料GUID" prop="productGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productGuid"-->
+<!--          placeholder="请输入物料GUID"-->
+<!--          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="追溯入库单ID" prop="stockinId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockinId"-->
+<!--          placeholder="请输入追溯入库单ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供应商名称546/客户名称546" prop="stackingId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stackingId"-->
+<!--          placeholder="请输入供应商名称546/客户名称546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="层级关系546" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入层级关系546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="上层物料546" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入上层物料546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="顶层物料546" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入顶层物料546"-->
+<!--          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="合同号546" prop="spare5">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare5"-->
+<!--          placeholder="请输入合同号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="销售订单号546" prop="spare6">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare6"-->
+<!--          placeholder="请输入销售订单号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="规格型号546" prop="spec">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          placeholder="请输入规格型号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量单位546" prop="unit">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unit"-->
+<!--          placeholder="请输入计量单位546"-->
+<!--          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="货位-排" 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="startTime"> <!-- 开始时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.finishTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间" style="width: 206px">
-        </el-date-picker>
-      </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>
         <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>
@@ -117,38 +374,38 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          @click="handleAdd"-->
-      <!--          v-hasPermi="['search:ViewInJobFlow:add']"-->
-      <!--        >新增</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['search:ViewInJobFlow:edit']"-->
-      <!--        >修改</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-delete"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          @click="handleDelete"-->
-      <!--          v-hasPermi="['search:ViewInJobFlow:remove']"-->
-      <!--        >删除</el-button>-->
-      <!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['search:ViewInJobFlow:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['search:ViewInJobFlow:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['search:ViewInJobFlow:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -157,111 +414,94 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewInJobFlow:export']"
-        >导出
-        </el-button>
+        >导出</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="650">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="作业ID" align="left" prop="jobId" width="140" />
-      <el-table-column label="作业类型" align="center" prop="inOrOut">
+    <el-table v-loading="loading" :data="ViewInJobFlowList" >
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column width="180" label="作业编码" align="center" prop="jobId" />
+      <el-table-column width="180" label="子作业编码" align="center" prop="jobDetailId" />
+      <el-table-column width="180" label="项目号" align="center" prop="lineId" />
+      <el-table-column width="180" label="任务号" align="center" prop="taskNo" />
+      <el-table-column width="100" label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_all_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column 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"/>
-      <el-table-column label="巷道" align="left" prop="roadwayId"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120" />
-      <el-table-column label="入口" align="left" prop="entranceId"/>
-      <el-table-column label="订单号" align="left" prop="lineId" width="160" />
-      <el-table-column label="品号" align="left" prop="productId" width="160"/>
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-      <el-table-column label="序列号" align="center" prop="trayCode" width="160"/>
-      <el-table-column label="入库数量" align="right" prop="inQuantity"/>
-      <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="createTime" width="160"/>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
-      <el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
-      <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column 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 label="单据ID" align="left" prop="inOrOutId"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId"/>
-      <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
-      <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column label="品号描述" align="left" prop="price"/>
-      <el-table-column label="英文描述" align="left" prop="cargoNo"/>
-      <!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column label="图号" align="left" prop="unit"/>
-      <el-table-column 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 label="NC号" align="left" prop="spare9"/>
-      <el-table-column label="电源线" align="left" prop="spare10"/>
-      <el-table-column label="插头" align="left" prop="spare11"/>
-      <el-table-column label="接嘴" align="left" prop="spare12"/>
-      <el-table-column label="快捷码" align="left" prop="spare13"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15"/>
-      <el-table-column label="品号群组" align="left" prop="spare16"/>
-      <el-table-column label="归类品" align="left" prop="spare17"/>
-      <el-table-column label="计量体系" align="left" prop="spare18"/>
-      <el-table-column label="群组名称" align="left" prop="spare19"/>
-      <el-table-column label="批号管理" align="left" prop="spare20"/>
-      <el-table-column label="状态" align="left" prop="spare21"/>
-      <el-table-column label="产品大类" align="left" prop="spare22"/>
-      <el-table-column label="产品二类" align="left" prop="spare23"/>
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24"/>
-      <el-table-column label="BOM状态" align="left" prop="spare25"/>
-      <el-table-column label="产品定位" align="left" prop="spare26"/>
-      <el-table-column label="电脑板型号" align="left" prop="spare27"/>
-      <el-table-column label="非标要求" align="left" prop="spare28"/>
-      <el-table-column label="品牌" align="left" prop="spare29"/>
-      <el-table-column label="非标颜色" align="left" prop="spare30"/>
-      <el-table-column label="主颜色" align="left" prop="spare31"/>
-      <el-table-column label="辅助颜色" align="left" prop="spare32"/>
-      <el-table-column label="是否标准款" align="left" prop="spare33"/>
-      <el-table-column label="包装方式" align="left" prop="spare34"/>
-      <el-table-column label="主要包装方式" align="left" prop="spare35"/>
-      <el-table-column label="长" align="righ" prop="spare36"/>
-      <el-table-column label="宽" align="righ" prop="spare37"/>
-      <el-table-column label="高" align="righ" prop="spare38"/>
-      <el-table-column label="包装材积" align="righ" prop="spare39"/>
-      <el-table-column 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:ViewInJobFlow:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['search:ViewInJobFlow:remove']"-->
-      <!--          >删除</el-button>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
+      <el-table-column width="100" label="入库数量" align="center" prop="inQuantity" />
+      <el-table-column width="100" label="入口ID" align="center" prop="entranceId" />
+<!--      <el-table-column label="库存ID" align="center" prop="stockId" />-->
+<!--      <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
+<!--      <el-table-column label="库存状态" align="center" prop="stockStatus">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="180" label="层级关系" align="center" prop="spare1" />
+      <el-table-column width="180" label="上层物料" align="center" prop="spare2" />
+      <el-table-column width="180" label="顶层物料" align="center" prop="spare3" />
+      <el-table-column width="180" label="合同号" align="center" prop="spare5" />
+      <el-table-column width="180" label="销售订单号" align="center" prop="spare6" />
+      <el-table-column width="180" label="规格型号" align="center" prop="spec" />
+      <el-table-column width="180" label="计量单位" align="center" prop="unit" />
+      <el-table-column width="180" label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column width="180" label="追溯入库单ID" align="center" prop="stockinId" />
+      <el-table-column width="180" label="追溯入库子单ID" align="center" prop="stockinDetailId" />
+      <el-table-column width="180" label="供应商ID" align="center" prop="supplierId" />
+      <el-table-column width="180" label="客户ID" align="center" prop="customerId" />
+      <el-table-column width="180" label="供应商名称/客户名称" align="center" prop="stackingId" />
+      <el-table-column width="180" label="开始时间" align="center" prop="startTime" />
+      <el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
+
+      <!--      <el-table-column 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="center" prop="onLineType" />-->
+<!--      <el-table-column label="部门ID" align="center" prop="departmentId" />-->
+<!--      <el-table-column label="巷道ID" align="center" prop="roadwayId" />-->
+<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+<!--      <el-table-column label="目标巷道ID" align="center" prop="targetRoadwayId" />-->
+<!--      <el-table-column label="目标货位ID" align="center" prop="targetCargoSpaceId" />-->
+<!--      <el-table-column label="517补码标志" align="center" prop="workshopId" />-->
+<!--      <el-table-column label="优先级" align="center" prop="priority" />-->
+<!--      <el-table-column label="执行阶段" align="center" prop="executionPhase" />-->
+<!--      <el-table-column label="出口ID" align="center" prop="exitId" />-->
+<!--      <el-table-column label="层数" align="center" prop="classId" />-->
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="重分标记" align="center" prop="faultFlag" />-->
+<!--      <el-table-column label="入库时间" align="center" prop="inDate" />-->
+<!--      <el-table-column label="单据ID" align="center" prop="inOrOutId" />-->
+<!--      <el-table-column label="子单据ID" align="center" prop="inOrOutDId" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
+
+
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['search:ViewInJobFlow:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['search:ViewInJobFlow:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -275,14 +515,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="作业ID" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业ID"/>
+        <el-form-item label="任务ID" prop="jobId">
+          <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-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
+        <el-form-item label="任务状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择任务状态">
             <el-option
               v-for="dict in dict.type.mydo_job_status"
               :key="dict.value"
@@ -291,216 +528,148 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="任务号" prop="taskNo">
-          <el-input v-model="form.taskNo" placeholder="请输入任务号"/>
+        <el-form-item label="上线类型" prop="onLineType">
+          <el-input v-model="form.onLineType" placeholder="请输入上线类型" />
         </el-form-item>
-        <el-form-item label="托盘号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘号"/>
+        <el-form-item label="任务号" prop="taskNo">
+          <el-input v-model="form.taskNo" placeholder="请输入任务号" />
+        </el-form-item>
+        <el-form-item label="供应商ID" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入供应商ID" />
+        </el-form-item>
+        <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="form.customerId" placeholder="请输入客户ID" />
+        </el-form-item>
+        <el-form-item label="部门ID" prop="departmentId">
+          <el-input v-model="form.departmentId" placeholder="请输入部门ID" />
+        </el-form-item>
+        <el-form-item label="托盘码" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入托盘码" />
         </el-form-item>
         <el-form-item label="巷道ID" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID"/>
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
         </el-form-item>
         <el-form-item label="货位ID" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID"/>
+          <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-form-item label="目标巷道ID" prop="targetRoadwayId">
+          <el-input v-model="form.targetRoadwayId" placeholder="请输入目标巷道ID" />
         </el-form-item>
-        <el-form-item label="排" prop="thePlatoon">
-          <el-input v-model="form.thePlatoon" placeholder="请输入排"/>
+        <el-form-item label="目标货位ID" prop="targetCargoSpaceId">
+          <el-input v-model="form.targetCargoSpaceId" placeholder="请输入目标货位ID" />
         </el-form-item>
-        <el-form-item label="列" prop="theColumn">
-          <el-input v-model="form.theColumn" placeholder="请输入列"/>
+        <el-form-item label="项目号546" prop="lineId">
+          <el-input v-model="form.lineId" placeholder="请输入项目号546" />
         </el-form-item>
-        <el-form-item label="层" prop="theFloor">
-          <el-input v-model="form.theFloor" placeholder="请输入层"/>
+        <el-form-item label="517补码标志" prop="workshopId">
+          <el-input v-model="form.workshopId" placeholder="请输入517补码标志" />
         </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="请选择执行阶段">
+          <el-input v-model="form.executionPhase" placeholder="请输入执行阶段" />
+        </el-form-item>
+        <el-form-item label="任务类型" prop="inOrOut">
+          <el-select v-model="form.inOrOut" placeholder="请选择任务类型">
             <el-option
-              v-for="dict in dict.type.execution_phase_type"
+              v-for="dict in dict.type.in_job_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
+        </el-form-item>
+        <el-form-item label="结束时间" prop="finishTime">
+          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
+        </el-form-item>
+        <el-form-item label="入口ID" prop="entranceId">
+          <el-input v-model="form.entranceId" placeholder="请输入入口ID" />
+        </el-form-item>
+        <el-form-item label="出口ID" prop="exitId">
+          <el-input v-model="form.exitId" placeholder="请输入出口ID" />
+        </el-form-item>
+        <el-form-item label="层数" prop="classId">
+          <el-input v-model="form.classId" placeholder="请输入层数" />
+        </el-form-item>
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        </el-form-item>
+        <el-form-item label="重分标记" prop="faultFlag">
+          <el-input v-model="form.faultFlag" placeholder="请输入重分标记" />
+        </el-form-item>
+        <el-form-item label="子任务ID" prop="jobDetailId">
+          <el-input v-model="form.jobDetailId" placeholder="请输入子任务ID" />
+        </el-form-item>
+        <el-form-item label="库存ID" prop="stockId">
+          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
+        </el-form-item>
+        <el-form-item label="批次号" prop="lotNo">
+          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
+        </el-form-item>
+        <el-form-item label="入库时间" prop="inDate">
+          <el-input v-model="form.inDate" 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="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        </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="inOrOut">
-          <el-input v-model="form.inOrOut" placeholder="请输入作业类型"/>
+        <el-form-item label="追溯入库单ID" prop="stockinId">
+          <el-input v-model="form.stockinId" placeholder="请输入追溯入库单ID" />
         </el-form-item>
-        <el-form-item label="入口ID" prop="entranceId">
-          <el-input v-model="form.entranceId" placeholder="请输入入口ID"/>
+        <el-form-item label="供应商名称546/客户名称546" prop="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入供应商名称546/客户名称546" />
         </el-form-item>
-        <el-form-item label="物料ID" prop="wlbh">
-          <el-input v-model="form.wlbh" placeholder="请输入物料ID"/>
+        <el-form-item label="层级关系546" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入层级关系546" />
         </el-form-item>
-        <el-form-item label="批号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批号"/>
+        <el-form-item label="上层物料546" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入上层物料546" />
         </el-form-item>
-        <el-form-item label="垛型ID" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入垛型ID"/>
+        <el-form-item label="顶层物料546" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入顶层物料546" />
         </el-form-item>
-        <el-form-item label="单据ID" prop="inOrOutId">
-          <el-input v-model="form.inOrOutId" placeholder="请输入单据ID"/>
+        <el-form-item label="追溯入库子单ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" placeholder="请输入追溯入库子单ID" />
         </el-form-item>
-        <el-form-item label="子单据ID" prop="inOrOutDId">
-          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据ID"/>
+        <el-form-item label="合同号546" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入合同号546" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-input v-model="form.startTime" placeholder="请输入开始时间"/>
+        <el-form-item label="销售订单号546" prop="spare6">
+          <el-input v-model="form.spare6" placeholder="请输入销售订单号546" />
         </el-form-item>
-        <el-form-item label="结束时间" prop="finishTime">
-          <el-input v-model="form.finishTime" placeholder="请输入结束时间"/>
+        <el-form-item label="规格型号546" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格型号546" />
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
+        <el-form-item label="计量单位546" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位546" />
         </el-form-item>
-        <el-form-item label="物料GUID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料GUID"/>
+        <el-form-item label="物料编码546" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料编码546" />
         </el-form-item>
-        <el-form-item label="品名" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入品名"/>
+        <el-form-item label="物料名称546" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入物料名称546" />
         </el-form-item>
-        <el-form-item label="产品分类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入产品分类"/>
-        </el-form-item>
-        <el-form-item label="品号描述" prop="price">
-          <el-input v-model="form.price" placeholder="请输入品号描述"/>
-        </el-form-item>
-        <el-form-item label="英文描述" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入英文描述"/>
-        </el-form-item>
-        <el-form-item label="图号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入图号"/>
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格"/>
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述"/>
-        </el-form-item>
-        <el-form-item label="型号" prop="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 label="货位名称" prop="cargoSpaceName">
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -512,17 +681,11 @@
 </template>
 
 <script>
-import {
-  listViewInJobFlow,
-  getViewInJobFlow,
-  delViewInJobFlow,
-  addViewInJobFlow,
-  updateViewInJobFlow
-} from "@/api/search/ViewInJobFlow"
+import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
 
 export default {
   name: "ViewInJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status', 'in_all_job_type'],
+  dicts: ['in_job_type', 'mydo_job_status', 'stock_status'],
   data() {
     return {
       // 遮罩层
@@ -548,86 +711,69 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        jobDetailId: null,
         status: null,
+        onLineType: null,
         taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
         trayCode: null,
         roadwayId: null,
         cargoSpaceId: null,
-        cargoSpaceName: null,
-        thePlatoon: null,
-        theColumn: null,
-        theFloor: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
         priority: null,
         executionPhase: null,
         inOrOut: null,
-        entranceId: null,
-        wlbh: null,
-        lotNo: null,
-        stackingId: null,
-        stockStatus: null,
-        inQuantity: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        createTime: null,
         startTime: null,
         finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
         warehouseId: null,
+        faultFlag: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inDate: null,
+        inOrOutId: null,
+        inOrOutDId: null,
         productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        stockinId: null,
+        stackingId: null,
         spare1: null,
         spare2: null,
         spare3: null,
-        spare4: null,
+        stockinDetailId: null,
         spare5: null,
         spare6: null,
+        spec: null,
+        unit: null,
+        productId: 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
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         jobId: [
-          {required: true, message: "作业ID不能为空", trigger: "blur"}
+          { required: true, message: "任务ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "任务状态不能为空", trigger: "change" }
+        ],
+        taskNo: [
+          { required: true, message: "任务号不能为空", trigger: "blur" }
+        ],
+        jobDetailId: [
+          { required: true, message: "子任务ID不能为空", trigger: "blur" }
         ],
       }
     }
@@ -638,24 +784,12 @@ export default {
   methods: {
     /** 查询入库作业流水列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listViewInJobFlow(this.queryParams).then(response => {
-        this.ViewInJobFlowList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 格式化日期时间为 yyyy-MM-dd HH:mm:ss
-    formatDateTime(dateTimeStr) {
-      if (!dateTimeStr) return '';
-      const date = new Date(dateTimeStr);
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0');
-      const day = String(date.getDate()).padStart(2, '0');
-      const hours = String(date.getHours()).padStart(2, '0');
-      const minutes = String(date.getMinutes()).padStart(2, '0');
-      const seconds = String(date.getSeconds()).padStart(2, '0');
-      return `${year}-${month}-${day}  ${hours}:${minutes}:${seconds}`;
+        this.ViewInJobFlowList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
@@ -666,79 +800,54 @@ export default {
     reset() {
       this.form = {
         jobId: null,
-        jobDetailId: null,
         status: null,
+        onLineType: null,
         taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
         trayCode: null,
         roadwayId: null,
         cargoSpaceId: null,
-        cargoSpaceName: null,
-        thePlatoon: null,
-        theColumn: null,
-        theFloor: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
         priority: null,
         executionPhase: null,
         inOrOut: null,
-        entranceId: null,
-        wlbh: null,
-        lotNo: null,
-        stackingId: null,
-        stockStatus: null,
-        inQuantity: null,
-        inOrOutId: null,
-        inOrOutDId: null,
         createTime: null,
         startTime: null,
         finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
         warehouseId: null,
+        faultFlag: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inDate: null,
+        inOrOutId: null,
+        inOrOutDId: null,
         productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        stockinId: null,
+        stackingId: null,
         spare1: null,
         spare2: null,
         spare3: null,
-        spare4: null,
+        stockinDetailId: null,
         spare5: null,
         spare6: null,
+        spec: null,
+        unit: null,
+        productId: 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
       }
       this.resetForm("form")
     },
@@ -755,7 +864,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
     },
     /** 新增按钮操作 */
@@ -797,13 +906,12 @@ 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()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {
-      })
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -814,14 +922,3 @@ export default {
   }
 }
 </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/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index c21f0b4..d508a8a 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -1,26 +1,32 @@
 <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="status">
-        <el-select v-model="queryParams.status" placeholder="请选择作业状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mydo_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="作业类型" prop="inOrOut">
-        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_all_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="作业编号" prop="jobId">
+        <el-input
+          v-model="queryParams.jobId"
+          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.mydo_job_status"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="上线类型" prop="onLineType">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.onLineType"-->
+      <!--          placeholder="请输入上线类型"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="任务号" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
@@ -29,86 +35,339 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巷道" prop="roadwayId">
+      <!--      <el-form-item label="供应商ID" prop="supplierId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.supplierId"-->
+      <!--          placeholder="请输入供应商ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="客户ID" prop="customerId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.customerId"-->
+      <!--          placeholder="请输入客户ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="部门ID" prop="departmentId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.departmentId"-->
+      <!--          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="巷道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="目标巷道ID" prop="targetRoadwayId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.targetRoadwayId"-->
+      <!--          placeholder="请输入目标巷道ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="目标货位ID" prop="targetCargoSpaceId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.targetCargoSpaceId"-->
+      <!--          placeholder="请输入目标货位ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="项目号" prop="lineId">
         <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
+          v-model="queryParams.lineId"
+          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 label="517补码标志" prop="workshopId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.workshopId"-->
+      <!--          placeholder="请输入517补码标志"-->
+      <!--          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-input-->
+      <!--          v-model="queryParams.executionPhase"-->
+      <!--          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.out_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="订单号" prop="lineId">
+      <!--      <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="entranceId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.entranceId"-->
+      <!--          placeholder="请输入入口ID"-->
+      <!--          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="classId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.classId"-->
+      <!--          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="faultFlag">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.faultFlag"-->
+      <!--          placeholder="请输入重分标记"-->
+      <!--          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="库存ID" prop="stockId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.stockId"-->
+      <!--          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="inDate">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.inDate"-->
+      <!--          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="物料GUID" prop="productGuid">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.productGuid"-->
+      <!--          placeholder="请输入物料GUID"-->
+      <!--          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="追溯入库单ID" prop="stockinId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.stockinId"-->
+      <!--          placeholder="请输入追溯入库单ID"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="供应商名称546/客户名称546" prop="stackingId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.stackingId"-->
+      <!--          placeholder="请输入供应商名称546/客户名称546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="层级关系546" prop="spare1">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spare1"-->
+      <!--          placeholder="请输入层级关系546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="上层物料546" prop="spare2">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spare2"-->
+      <!--          placeholder="请输入上层物料546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="顶层物料546" prop="spare3">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spare3"-->
+      <!--          placeholder="请输入顶层物料546"-->
+      <!--          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="合同号546" prop="spare5">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spare5"-->
+      <!--          placeholder="请输入合同号546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="销售订单号546" prop="spare6">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spare6"-->
+      <!--          placeholder="请输入销售订单号546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="规格型号546" prop="spec">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spec"-->
+      <!--          placeholder="请输入规格型号546"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="计量单位546" prop="unit">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.unit"-->
+      <!--          placeholder="请输入计量单位546"-->
+      <!--          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="productId">
-        <el-input
-          v-model="queryParams.productId"
-          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="货位-排" 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="startTime"> <!-- 开始时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.finishTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间" style="width: 206px">
-        </el-date-picker>
-      </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>
         <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>
@@ -116,38 +375,38 @@
     </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"
@@ -156,119 +415,95 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewOutJobFlow:export']"
-        >导出
-        </el-button>
+        >导出</el-button>
       </el-col>
-      <left-toolbar :showSearch.sync="showSearch" @queryTable="getList"></left-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <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 label="作业ID" align="left" prop="jobId" width="150" />
-<!--      <el-table-column label="子作业ID" align="left" prop="jobDetailId" display="display"/>-->
-      <el-table-column label="作业类型" align="left" prop="inOrOut">
+    <el-table v-loading="loading" :data="ViewOutJobFlowList" >
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column width="180" label="作业编码" align="center" prop="jobId" />
+      <el-table-column width="180" label="子作业编码" align="center" prop="jobDetailId" />
+      <el-table-column width="180" label="项目号" align="center" prop="lineId" />
+      <el-table-column width="180" label="任务号" align="center" prop="taskNo" />
+      <el-table-column width="100" label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_all_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column label="作业状态" align="left" 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"/>
-      <el-table-column label="巷道" align="left" prop="roadwayId"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
-      <el-table-column label="出口" align="left" prop="exitId"/>
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="托盘码" align="center" prop="trayCode" />
+      <el-table-column label="出库数量" align="center" prop="outQuantity" />
+      <el-table-column label="出口ID" align="center" prop="exitId" />
 
-      <el-table-column label="订单号" align="left" prop="lineId" width="160"/>
-      <el-table-column label="品号" align="left" prop="productId" width="160"/>
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-      <el-table-column label="序列号" align="left" prop="trayCode" width="160"/>
-      <el-table-column label="出库数量" align="left" prop="outQuantity"/>
-      <el-table-column label="排" align="left" prop="thePlatoon"/>
-      <el-table-column label="列" align="left" prop="theColumn"/>
-      <el-table-column label="层" align="left" prop="theFloor"/>
-      <el-table-column label="创建时间" align="left" prop="createTime" width="160"/>
-      <el-table-column label="开始时间" align="left" prop="startTime" width="160"/>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="160"/>
 
-      <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column 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="left" prop="giveNum" />-->
-      <el-table-column label="单据ID" align="left" prop="inOrOutId"/>
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId"/>
-
-      <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
-      <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column label="客户名称" align="left" prop="customerName"/>
-
-      <el-table-column label="品号描述" align="left" prop="price"/>
-      <el-table-column label="英文描述" align="left" prop="cargoNo"/>
-      <!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column label="图号" align="left" prop="unit"/>
-      <el-table-column 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 label="NC号" align="left" prop="spare9"/>
-      <el-table-column label="电源线" align="left" prop="spare10"/>
-      <el-table-column label="插头" align="left" prop="spare11"/>
-      <el-table-column label="接嘴" align="left" prop="spare12"/>
-      <el-table-column label="快捷码" align="left" prop="spare13"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15"/>
-      <el-table-column label="品号群组" align="left" prop="spare16"/>
-      <el-table-column label="归类品" align="left" prop="spare17"/>
-      <el-table-column label="计量体系" align="left" prop="spare18"/>
-      <el-table-column label="群组名称" align="left" prop="spare19"/>
-      <el-table-column label="批号管理" align="left" prop="spare20"/>
-      <el-table-column label="状态" align="left" prop="spare21"/>
-      <el-table-column label="产品大类" align="left" prop="spare22"/>
-      <el-table-column label="产品二类" align="left" prop="spare23"/>
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24"/>
-      <el-table-column label="BOM状态" align="left" prop="spare25"/>
-      <el-table-column label="产品定位" align="left" prop="spare26"/>
-      <el-table-column label="电脑板型号" align="left" prop="spare27"/>
-      <el-table-column label="非标要求" align="left" prop="spare28"/>
-      <el-table-column label="品牌" align="left" prop="spare29"/>
-      <el-table-column label="非标颜色" align="left" prop="spare30"/>
-      <el-table-column label="主颜色" align="left" prop="spare31"/>
-      <el-table-column label="辅助颜色" align="left" prop="spare32"/>
-      <el-table-column label="是否标准款" align="left" prop="spare33"/>
-      <el-table-column label="包装方式" align="left" prop="spare34"/>
-      <el-table-column label="主要包装方式" align="left" prop="spare35"/>
-      <el-table-column label="长" align="left" prop="spare36"/>
-      <el-table-column label="宽" align="left" prop="spare37"/>
-      <el-table-column label="高" align="left" prop="spare38"/>
-      <el-table-column label="包装材积" align="left" prop="spare39"/>
-      <el-table-column label="描述" align="left" prop="remark"/>
-      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--      <el-table-column width="100" label="入库数量" align="center" prop="inQuantity" />-->
+<!--      <el-table-column width="100" label="入口ID" align="center" prop="entranceId" />-->
+      <!--      <el-table-column label="库存ID" align="center" prop="stockId" />-->
+      <!--      <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
+      <!--      <el-table-column label="库存状态" align="center" prop="stockStatus">-->
       <!--        <template slot-scope="scope">-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-edit"-->
-      <!--            @click="handleUpdate(scope.row)"-->
-      <!--            v-hasPermi="['search:ViewOutJobFlow:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            size="mini"-->
-      <!--            type="text"-->
-      <!--            icon="el-icon-delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['search:ViewOutJobFlow:remove']"-->
-      <!--          >删除</el-button>-->
+      <!--          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="180" label="层级关系" align="center" prop="spare1" />
+      <el-table-column width="180" label="上层物料" align="center" prop="spare2" />
+      <el-table-column width="180" label="顶层物料" align="center" prop="spare3" />
+      <el-table-column width="180" label="合同号" align="center" prop="spare5" />
+      <el-table-column width="180" label="销售订单号" align="center" prop="spare6" />
+      <el-table-column width="180" label="规格型号" align="center" prop="spec" />
+      <el-table-column width="180" label="计量单位" align="center" prop="unit" />
+      <el-table-column width="180" label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column width="180" label="追溯入库单ID" align="center" prop="stockinId" />
+      <el-table-column width="180" label="追溯入库子单ID" align="center" prop="stockinDetailId" />
+      <el-table-column width="180" label="供应商ID" align="center" prop="supplierId" />
+      <el-table-column width="180" label="客户ID" align="center" prop="customerId" />
+      <el-table-column width="180" label="客户名称" align="center" prop="stackingId" />
+      <el-table-column width="180" label="开始时间" align="center" prop="startTime" />
+      <el-table-column width="180" label="结束时间" align="center" prop="finishTime" />
+
+      <!--      <el-table-column 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="center" prop="onLineType" />-->
+      <!--      <el-table-column label="部门ID" align="center" prop="departmentId" />-->
+      <!--      <el-table-column label="巷道ID" align="center" prop="roadwayId" />-->
+      <!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
+      <!--      <el-table-column label="目标巷道ID" align="center" prop="targetRoadwayId" />-->
+      <!--      <el-table-column label="目标货位ID" align="center" prop="targetCargoSpaceId" />-->
+      <!--      <el-table-column label="517补码标志" align="center" prop="workshopId" />-->
+      <!--      <el-table-column label="优先级" align="center" prop="priority" />-->
+      <!--      <el-table-column label="执行阶段" align="center" prop="executionPhase" />-->
+      <!--      <el-table-column label="层数" align="center" prop="classId" />-->
+      <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+      <!--      <el-table-column label="重分标记" align="center" prop="faultFlag" />-->
+      <!--      <el-table-column label="入库时间" align="center" prop="inDate" />-->
+      <!--      <el-table-column label="单据ID" align="center" prop="inOrOutId" />-->
+      <!--      <el-table-column label="子单据ID" align="center" prop="inOrOutDId" />-->
+      <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+
+<!--      <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
@@ -282,14 +517,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="作业ID" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业ID"/>
+        <el-form-item label="任务ID" prop="jobId">
+          <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-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态">
+        <el-form-item label="任务状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择任务状态">
             <el-option
               v-for="dict in dict.type.mydo_job_status"
               :key="dict.value"
@@ -299,231 +531,144 @@
           </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="供应商ID" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入供应商ID" />
+        </el-form-item>
+        <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="form.customerId" placeholder="请输入客户ID" />
+        </el-form-item>
+        <el-form-item label="部门ID" prop="departmentId">
+          <el-input v-model="form.departmentId" placeholder="请输入部门ID" />
         </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="巷道ID" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID"/>
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
         </el-form-item>
         <el-form-item label="货位ID" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID"/>
+          <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-form-item label="目标巷道ID" prop="targetRoadwayId">
+          <el-input v-model="form.targetRoadwayId" placeholder="请输入目标巷道ID" />
         </el-form-item>
-        <el-form-item label="排" prop="thePlatoon">
-          <el-input v-model="form.thePlatoon" placeholder="请输入排"/>
+        <el-form-item label="目标货位ID" prop="targetCargoSpaceId">
+          <el-input v-model="form.targetCargoSpaceId" placeholder="请输入目标货位ID" />
         </el-form-item>
-        <el-form-item label="列" prop="theColumn">
-          <el-input v-model="form.theColumn" placeholder="请输入列"/>
+        <el-form-item label="项目号546" prop="lineId">
+          <el-input v-model="form.lineId" placeholder="请输入项目号546" />
         </el-form-item>
-        <el-form-item label="层" prop="theFloor">
-          <el-input v-model="form.theFloor" placeholder="请输入层"/>
+        <el-form-item label="517补码标志" prop="workshopId">
+          <el-input v-model="form.workshopId" placeholder="请输入517补码标志" />
         </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="请选择执行阶段">
-            <el-option
-              v-for="dict in dict.type.execution_phase_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+          <el-input v-model="form.executionPhase" placeholder="请输入执行阶段" />
         </el-form-item>
-        <el-form-item label="作业类型" prop="inOrOut">
-          <el-select v-model="form.inOrOut" placeholder="请选择作业类型">
+        <el-form-item label="任务类型" prop="inOrOut">
+          <el-select v-model="form.inOrOut" placeholder="请选择任务类型">
             <el-option
               v-for="dict in dict.type.out_job_type"
               :key="dict.value"
               :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入开始时间" />
+        </el-form-item>
+        <el-form-item label="结束时间" prop="finishTime">
+          <el-input v-model="form.finishTime" placeholder="请输入结束时间" />
+        </el-form-item>
+        <el-form-item label="入口ID" prop="entranceId">
+          <el-input v-model="form.entranceId" placeholder="请输入入口ID" />
+        </el-form-item>
+        <el-form-item label="出口ID" prop="exitId">
+          <el-input v-model="form.exitId" placeholder="请输入出口ID" />
+        </el-form-item>
+        <el-form-item label="层数" prop="classId">
+          <el-input v-model="form.classId" placeholder="请输入层数" />
+        </el-form-item>
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        </el-form-item>
+        <el-form-item label="重分标记" prop="faultFlag">
+          <el-input v-model="form.faultFlag" placeholder="请输入重分标记" />
+        </el-form-item>
+        <el-form-item label="子任务ID" prop="jobDetailId">
+          <el-input v-model="form.jobDetailId" placeholder="请输入子任务ID" />
+        </el-form-item>
+        <el-form-item label="库存ID" prop="stockId">
+          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
+        </el-form-item>
+        <el-form-item label="批次号" prop="lotNo">
+          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
+        </el-form-item>
+        <el-form-item label="入库时间" prop="inDate">
+          <el-input v-model="form.inDate" 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="物料GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
+        </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="出口ID" prop="exitId">
-          <el-input v-model="form.exitId" placeholder="请输入出口ID"/>
+        <el-form-item label="追溯入库单ID" prop="stockinId">
+          <el-input v-model="form.stockinId" placeholder="请输入追溯入库单ID" />
         </el-form-item>
-        <el-form-item label="物料ID" prop="wlbh">
-          <el-input v-model="form.wlbh" placeholder="请输入物料ID"/>
+        <el-form-item label="供应商名称546/客户名称546" prop="stackingId">
+          <el-input v-model="form.stackingId" placeholder="请输入供应商名称546/客户名称546" />
         </el-form-item>
-        <el-form-item label="批号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批号"/>
+        <el-form-item label="层级关系546" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入层级关系546" />
         </el-form-item>
-        <el-form-item label="剁型ID" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入剁型ID"/>
+        <el-form-item label="上层物料546" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入上层物料546" />
         </el-form-item>
-        <el-form-item label="出库数量" prop="outQuantity">
-          <el-input v-model="form.outQuantity" placeholder="请输入出库数量"/>
+        <el-form-item label="顶层物料546" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入顶层物料546" />
         </el-form-item>
-        <el-form-item label="回流数量" prop="giveNum">
-          <el-input v-model="form.giveNum" placeholder="请输入回流数量"/>
+        <el-form-item label="追溯入库子单ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" placeholder="请输入追溯入库子单ID" />
         </el-form-item>
-        <el-form-item label="单据ID" prop="inOrOutId">
-          <el-input v-model="form.inOrOutId" placeholder="请输入单据ID"/>
+        <el-form-item label="合同号546" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入合同号546" />
         </el-form-item>
-        <el-form-item label="子单据ID" prop="inOrOutDId">
-          <el-input v-model="form.inOrOutDId" placeholder="请输入子单据ID"/>
+        <el-form-item label="销售订单号546" prop="spare6">
+          <el-input v-model="form.spare6" placeholder="请输入销售订单号546" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-input v-model="form.startTime" placeholder="请输入开始时间"/>
+        <el-form-item label="规格型号546" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格型号546" />
         </el-form-item>
-        <el-form-item label="结束时间" prop="finishTime">
-          <el-input v-model="form.finishTime" placeholder="请输入结束时间"/>
+        <el-form-item label="计量单位546" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位546" />
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
+        <el-form-item label="物料编号546" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料编号546" />
         </el-form-item>
-        <el-form-item label="物料GUID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料GUID"/>
+        <el-form-item label="物料名称546" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入物料名称546" />
         </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="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="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
+        <el-form-item label="货位名称" prop="cargoSpaceName">
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -535,17 +680,11 @@
 </template>
 
 <script>
-import {
-  listViewOutJobFlow,
-  getViewOutJobFlow,
-  delViewOutJobFlow,
-  addViewOutJobFlow,
-  updateViewOutJobFlow
-} from "@/api/search/ViewOutJobFlow"
+import { listViewOutJobFlow, getViewOutJobFlow, delViewOutJobFlow, addViewOutJobFlow, updateViewOutJobFlow } from "@/api/search/ViewOutJobFlow"
 
 export default {
   name: "ViewOutJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status', 'out_all_job_type'],
+  dicts: ['mydo_job_status', 'out_job_type', 'stock_status'],
   data() {
     return {
       // 遮罩层
@@ -571,88 +710,69 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        jobDetailId: null,
         status: null,
+        onLineType: null,
         taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
         trayCode: null,
         roadwayId: null,
         cargoSpaceId: null,
-        cargoSpaceName: null,
-        thePlatoon: null,
-        theColumn: null,
-        theFloor: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
         priority: null,
         executionPhase: null,
         inOrOut: null,
-        exitId: null,
-        wlbh: null,
-        lotNo: null,
-        stackingId: null,
-        stockStatus: null,
-        outQuantity: null,
-        giveNum: null,
-        inOrOutId: null,
-        inOrOutDId: null,
-        createTime: null,
         startTime: null,
         finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
         warehouseId: null,
+        faultFlag: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inDate: null,
+        inOrOutId: null,
+        inOrOutDId: null,
         productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        stockinId: null,
+        stackingId: null,
         spare1: null,
         spare2: null,
         spare3: null,
-        spare4: null,
+        stockinDetailId: null,
         spare5: null,
         spare6: null,
+        spec: null,
+        unit: null,
+        productId: 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
+        cargoSpaceName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         jobId: [
-          {required: true, message: "作业ID不能为空", trigger: "blur"}
+          { required: true, message: "任务ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "任务状态不能为空", trigger: "change" }
+        ],
+        taskNo: [
+          { required: true, message: "任务号不能为空", trigger: "blur" }
+        ],
+        jobDetailId: [
+          { required: true, message: "子任务ID不能为空", trigger: "blur" }
         ],
       }
     }
@@ -675,97 +795,58 @@ export default {
       this.open = false
       this.reset()
     },
-    // 格式化日期时间为 yyyy-MM-dd HH:mm:ss
-    formatDateTime(dateTimeStr) {
-      if (!dateTimeStr) return '';
-      const date = new Date(dateTimeStr);
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0');
-      const day = String(date.getDate()).padStart(2, '0');
-      const hours = String(date.getHours()).padStart(2, '0');
-      const minutes = String(date.getMinutes()).padStart(2, '0');
-      const seconds = String(date.getSeconds()).padStart(2, '0');
-      return `${year}-${month}-${day}  ${hours}:${minutes}:${seconds}`;
-    },
     // 表单重置
     reset() {
       this.form = {
         jobId: null,
-        jobDetailId: null,
         status: null,
+        onLineType: null,
         taskNo: null,
+        supplierId: null,
+        customerId: null,
+        departmentId: null,
         trayCode: null,
         roadwayId: null,
         cargoSpaceId: null,
-        cargoSpaceName: null,
-        thePlatoon: null,
-        theColumn: null,
-        theFloor: null,
+        targetRoadwayId: null,
+        targetCargoSpaceId: null,
+        lineId: null,
+        workshopId: null,
         priority: null,
         executionPhase: null,
         inOrOut: null,
-        exitId: null,
-        wlbh: null,
-        lotNo: null,
-        stackingId: null,
-        stockStatus: null,
-        outQuantity: null,
-        giveNum: null,
-        inOrOutId: null,
-        inOrOutDId: null,
         createTime: null,
         startTime: null,
         finishTime: null,
+        entranceId: null,
+        exitId: null,
+        classId: null,
         warehouseId: null,
+        faultFlag: null,
+        jobDetailId: null,
+        stockId: null,
+        lotNo: null,
+        inDate: null,
+        inOrOutId: null,
+        inOrOutDId: null,
         productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        stockStatus: null,
+        inQuantity: null,
+        stockQuantity: null,
+        outQuantity: null,
+        stockinId: null,
+        stackingId: null,
         spare1: null,
         spare2: null,
         spare3: null,
-        spare4: null,
+        stockinDetailId: null,
         spare5: null,
         spare6: null,
+        spec: null,
+        unit: null,
+        productId: 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
+        cargoSpaceName: null
       }
       this.resetForm("form")
     },
@@ -782,7 +863,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
     },
     /** 新增按钮操作 */
@@ -824,13 +905,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobIds = row.jobId || this.ids
-      this.$modal.confirm('是否确认删除出库作业流水编号为"' + jobIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除出库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
         return delViewOutJobFlow(jobIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {
-      })
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
index 0164f16..c2010d8 100644
--- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
@@ -1,129 +1,62 @@
 <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="orderId">
+      <el-form-item label="库存id" prop="stockId">
         <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单号"
+          v-model="queryParams.stockId"
+          placeholder="请输入库存id"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品号" prop="productId">
+      <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="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="序列号" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="是否满盘" prop="model">
+        <el-select v-model="queryParams.model" placeholder="请选择是否满盘" clearable>
+          <el-option label="否" value="0"></el-option>
+          <el-option label="是" value="1"></el-option>
+        </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="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="startTime"> <!-- 开始时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.finishTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间" style="width: 206px">
-        </el-date-picker>
+      <el-form-item label="货位状态" prop="cargoSpaceStatus">
+        <el-select v-model="queryParams.cargoSpaceStatus" placeholder="请选择货位状态" clearable>
+          <el-option
+            v-for="dict in dict.type.cargo_space_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">清空</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['search:ViewStockDetail:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['search:ViewStockDetail:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['search:ViewStockDetail:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -137,110 +70,68 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
-      <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
-      <el-table-column label="订单号" align="left" prop="orderId" width="160"/>
-      <el-table-column label="品号" align="left" prop="productId" width="160"/>
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-      <el-table-column label="巷道号" align="left" prop="roadwayId" width="160"/>
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
-      <!--      <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>-->
-      <el-table-column label="序列号" align="left" prop="trayCode" width="160"/>
-<!--      <el-table-column label="数量" align="right" prop="quantity" width="120"/>-->
-      <el-table-column label="作业ID" align="left" prop="jobId" width="160"/>
-      <el-table-column label="批号" align="left" prop="lotNo" width="120"/>
-      <el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="160"/>
-      <el-table-column label="入库时间" align="left" prop="inDate" width="160"/>
-<!--      <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="cargoSpaceStatus" width="160">
+    <el-table v-loading="loading" :data="ViewStockDetailList" >
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="${comment}" align="center" prop="onlyIdentity" />-->
+      <el-table-column width="180" label="库存id" align="left" prop="stockId" />
+      <el-table-column width="180" label="物料编码" align="left" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="left" prop="productName" />
+      <el-table-column width="80" label="库存数量" align="left" prop="quantity" />
+      <el-table-column width="180" label="托盘条码" align="left" prop="trayCode" />
+      <el-table-column width="80" label="是否满盘" align="left" prop="model"
+        :formatter="(row, column, cellValue) => cellValue == '1'  ? '是' : '否'"
+      />
+      <el-table-column width="80" label="盘点记录" align="left" prop="spare7"
+        :formatter="(row, column, cellValue) => cellValue == '1'  ? '已盘点' : '未盘点'"
+      />
+      <el-table-column width="180" label="项目号" align="left" prop="spare4" />
+      <el-table-column width="180" label="批号" align="left" prop="lotNo" />
+      <el-table-column width="80" label="层级关系" align="left" prop="spare1" />
+      <el-table-column width="180" label="上层物料" align="left" prop="spare2" />
+      <el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
+      <el-table-column width="180" label="合同号" align="left" prop="spare5" />
+      <el-table-column width="180" label="销售订单号" align="left" prop="spare6" />
+      <el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
+      <el-table-column width="180" label="供应商名称" align="left" prop="stackingId" />
+      <el-table-column width="180" label="规格型号" align="left" prop="power" />
+      <el-table-column width="180" label="计量单位" align="left" prop="phase" />
+      <el-table-column width="180" label="货位名称" align="left" prop="cargoSpaceName" />
+      <el-table-column width="180" label="货位状态" align="left" prop="cargoSpaceStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="库存状态" align="left" prop="stockStatus" width="160">
-        <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="productStatus" width="160">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否锁定" align="left" prop="locked" width="160">
+      <el-table-column width="80" label="货位锁" align="left" 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="物料GUID" align="left" prop="productGuid" width="180"/> -->
-      <el-table-column label="规格" align="left" prop="spec" width="160"/>
-      <!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
-      <el-table-column label="价格" align="right" prop="price" width="160"/>
-      <el-table-column label="产品分类" align="left" prop="parentId" width="160"/>
-      <el-table-column label="品号描述" align="left" prop="cargoNo" width="160"/>
-      <el-table-column label="英文名称" align="left" prop="spare1" width="160"/>
-      <!-- <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="160"/>
-      <el-table-column label="电源线" align="left" prop="spare10" width="160"/>
-      <el-table-column label="插头" align="left" prop="spare11" width="160"/>
-      <el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
-      <el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
-      <el-table-column label="品号群组" align="left" prop="spare16" width="160"/>
-      <el-table-column label="归类品" align="left" prop="spare17" width="160"/>
-      <el-table-column label="计量体系" align="left" prop="spare18" width="160"/>
-      <el-table-column label="群组名称" align="left" prop="spare19" width="160"/>
-      <el-table-column label="批号管理" align="left" prop="spare20" width="160"/>
-      <el-table-column label="状态" align="left" prop="spare21" width="160"/>
-      <el-table-column label="产品大类" align="left" prop="spare22" width="160"/>
-      <el-table-column label="产品二类" align="left" prop="spare23" width="160"/>
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160"/>
-      <el-table-column label="BOM状态" align="left" prop="spare25" width="160"/>
-      <el-table-column label="产品定位" align="left" prop="spare26" width="160"/>
-      <el-table-column label="电脑板型号" align="left" prop="spare27" width="160"/>
-      <el-table-column label="非标要求" align="left" prop="spare28" width="160"/>
-      <el-table-column label="品牌" align="left" prop="spare29" width="160"/>
-      <el-table-column label="非标颜色" align="left" prop="spare30" width="160"/>
-      <el-table-column label="主颜色" align="left" prop="spare31" width="160"/>
-      <el-table-column label="辅助颜色" align="left" prop="spare32" width="160"/>
-      <el-table-column label="是否标准款" align="left" prop="spare33" width="160"/>
-      <el-table-column label="包装方式" align="left" prop="spare34" width="160"/>
-      <el-table-column label="主要包装方式" align="left" prop="spare35" width="160"/>
-      <el-table-column label="长" align="right" prop="spare36" width="160"/>
-      <el-table-column label="宽" align="right" prop="spare37" width="160"/>
-      <el-table-column label="高" align="right" prop="spare38" width="160"/>
-      <el-table-column label="包装材积" align="right" prop="spare39" width="160"/>
-      <el-table-column label="描述" align="left" prop="remark" width="160"/>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockDetail:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockDetail:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column width="80" 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 width="80" label="物料状态" align="left" 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="货位id" align="center" prop="cargoSpaceId" />-->
+      <el-table-column width="180" label="入库时间" align="left" prop="inDate" />
+<!--      <el-table-column width="180" label="回流时间" align="center" prop="backDate" />-->
+<!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="180" label="作业ID" align="left" prop="jobId" />
+      <el-table-column width="80" label="出库数量" align="left" prop="outQuantity" />
+      <el-table-column width="180" label="入库子单id" align="left" prop="stockinDetailId" />
+      <el-table-column width="180" label="入库主单" align="left" prop="stockinId" />
+      <el-table-column width="80" label="入库类型" align="left" prop="inType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="入库班组ID" align="center" prop="inClassId" />-->
+<!--      <el-table-column label="仓库" align="center" prop="warehouseId" />-->
+
     </el-table>
 
     <pagination
@@ -251,88 +142,21 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改库存明细查询对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一标识" prop="onlyIdentity">
-          <el-input v-model="form.onlyIdentity" placeholder="请输入唯一标识" />
-        </el-form-item>
-        <el-form-item label="库存ID" prop="stockId">
-          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
-        </el-form-item>
-        <el-form-item label="货位ID" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
-        </el-form-item>
-        <el-form-item label="托盘号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘号" />
-        </el-form-item>
-        <el-form-item label="数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入数量" />
-        </el-form-item>
-        <el-form-item label="作业ID" prop="jobId">
-          <el-input v-model="form.jobId" placeholder="请输入作业ID" />
-        </el-form-item>
-        <el-form-item label="批号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批号" />
-        </el-form-item>
-        <el-form-item label="入库子单ID" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
-        </el-form-item>
-        <el-form-item label="入库时间" prop="inDate">
-          <el-input v-model="form.inDate" placeholder="请输入入库时间" />
-        </el-form-item>
-        <el-form-item label="仓库" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库" />
-        </el-form-item>
-        <el-form-item label="剁型ID" prop="stackingId">
-          <el-input v-model="form.stackingId" placeholder="请输入剁型ID" />
-        </el-form-item>
-        <el-form-item label="货位名称" prop="cargoSpaceName">
-          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
-        </el-form-item>
-        <el-form-item label="巷道ID" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
-        </el-form-item>
-        <el-form-item label="是否锁定" prop="locked">
-          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
-        </el-form-item>
-        <el-form-item label="物料ID" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料ID" />
-        </el-form-item>
-        <el-form-item label="品名" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入品名" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确定</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import { listViewStockDetail, getViewStockDetail, delViewStockDetail, addViewStockDetail, updateViewStockDetail } from "@/api/search/ViewStockDetail"
-import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockDetail",
-  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
+  dicts: ['product_status', 'cargo_space_status', 'cargo_space_lock_status', 'stock_status','in_bill_type'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -356,101 +180,58 @@ export default {
         onlyIdentity: null,
         stockId: null,
         cargoSpaceId: null,
-        trayCode: null,
-        quantity: null,
-        jobId: null,
-        lotNo: null,
-        stockinDetailId: null,
-        inDate: null,
-        warehouseId: null,
-        warehouseName: null,
-        stackingId: null,
-        cargoSpaceName: null,
-        roadwayId: null,
-        cargoSpaceStatus: null,
         stockStatus: null,
         productStatus: null,
-        locked: null,
+        lotNo: null,
+        inDate: null,
+        backDate: null,
         productGuid: null,
-        productId: null,
-        productName: null,
-        spec: null,
-        unit: null,
-        price: null,
-        parentId: null,
-        cargoNo: null,
+        quantity: null,
+        jobId: null,
+        trayCode: null,
+        outQuantity: null,
+        stockinDetailId: null,
+        stockinId: null,
+        inType: null,
+        inClassId: null,
+        warehouseId: null,
+        stackingId: null,
         spare1: null,
         spare2: null,
         spare3: null,
         spare4: null,
         spare5: null,
         spare6: null,
+        productId: null,
+        productName: null,
+        voltage: null,
+        power: null,
+        phase: null,
+        netWeight: null,
+        grossWeight: null,
+        distribution: null,
+        model: null,
+        orderId: 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,
-        thePlatoon: null,
-        theColumn: null,
-        theFloor: null,
-        startTime: null,
-        finishTime: null
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        locked: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         stockId: [
-          { 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
@@ -471,23 +252,43 @@ export default {
         onlyIdentity: null,
         stockId: null,
         cargoSpaceId: null,
-        trayCode: null,
+        stockStatus: null,
+        productStatus: null,
+        lotNo: null,
+        inDate: null,
+        backDate: null,
+        productGuid: null,
         quantity: null,
         jobId: null,
-        lotNo: null,
+        trayCode: null,
+        outQuantity: null,
         stockinDetailId: null,
-        inDate: null,
+        stockinId: null,
+        inType: null,
+        inClassId: null,
         warehouseId: null,
         stackingId: null,
-        cargoSpaceName: null,
-        roadwayId: null,
-        cargoSpaceStatus: null,
-        locked: null,
+        spare1: null,
+        spare2: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
         productId: null,
         productName: null,
-        spec: null,
-        unit: null,
-        price: null
+        voltage: null,
+        power: null,
+        phase: null,
+        netWeight: null,
+        grossWeight: null,
+        distribution: null,
+        model: null,
+        orderId: null,
+        spare7: null,
+        spare8: null,
+        cargoSpaceName: null,
+        cargoSpaceStatus: null,
+        locked: null
       }
       this.resetForm("form")
     },
@@ -511,7 +312,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "新增库存详情"
+      this.title = "添加库存明细查询"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -520,7 +321,7 @@ export default {
       getViewStockDetail(onlyIdentity).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改库存详情"
+        this.title = "修改库存明细查询"
       })
     },
     /** 提交按钮 */
@@ -546,7 +347,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const onlyIdentitys = row.onlyIdentity || this.ids
-      this.$modal.confirm("是否确认删除库存详情编号为" + onlyIdentitys + "的数据项?").then(function() {
+      this.$modal.confirm('是否确认删除库存明细查询编号为"' + onlyIdentitys + '"的数据项？').then(function() {
         return delViewStockDetail(onlyIdentitys)
       }).then(() => {
         this.getList()
@@ -557,18 +358,8 @@ export default {
     handleExport() {
       this.download('search/ViewStockDetail/export', {
         ...this.queryParams
-      }, `库存明细_${new Date().getTime()}.xlsx`)
+      }, `ViewStockDetail_${new Date().getTime()}.xlsx`)
     }
   }
 }
 </script>
-<style scoped>
-.el-table >>> .current-row {
-  background-color: #f0f9eb;
-}
-.el-form-item >>> .el-form-item__label {
-  white-space: nowrap;
-  width: auto;
-  min-width: fit-content;
-}
-</style>
diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
index bd8b55e..d512b2f 100644
--- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
@@ -1,24 +1,64 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="入库单号" prop="stockinId">
+<!--      <el-form-item label="GUID" prop="stockinGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockinGuid"-->
+<!--          placeholder="请输入GUID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="入库单ID" prop="stockinId">
         <el-input
           v-model="queryParams.stockinId"
-          placeholder="请输入入库单号"
+          placeholder="请输入入库单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库子单ID" prop="stockinDetailId">
+        <el-input
+          v-model="queryParams.stockinDetailId"
+          placeholder="请输入入库子单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目号" prop="departmentNo">
+        <el-input
+          v-model="queryParams.departmentNo"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="入库类型" prop="inType">
-        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型546" clearable>
           <el-option
-            v-for="dict in dict.type.in_job_type"
+            v-for="dict in dict.type.in_bill_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="单据时间546" prop="createDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createDate"-->
+<!--          placeholder="请输入单据时间546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="制单人546" prop="createManId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createManId"-->
+<!--          placeholder="请输入制单人546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="单据状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
           <el-option
@@ -29,56 +69,175 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="订单号" prop="erpBill">
-        <el-input
-          v-model="queryParams.erpBill"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="仓库ID546" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="备注546" prop="spare5">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare5"-->
+<!--          placeholder="请输入备注546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核人546" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          placeholder="请输入审核人546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核时间546" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入审核时间546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="完成日期" prop="finishDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.finishDate"-->
+<!--          placeholder="请输入完成日期"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="销售订单号546" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入销售订单号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="合同号546" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入合同号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="erpBill">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.erpBill"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单据来源" prop="stockSource">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockSource"-->
+<!--          placeholder="请输入单据来源"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="${comment}" prop="customerNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.customerNo"-->
+<!--          placeholder="请输入${comment}"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供应商名称546" prop="classNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.classNo"-->
+<!--          placeholder="请输入供应商名称546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="供应商编码546" prop="supplierNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierNo"-->
+<!--          placeholder="请输入供应商编码546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="批次号546" prop="lotNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批次号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 
-      <el-form-item label="品号" prop="productId">
+<!--      <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="计量单位546" prop="unit">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unit"-->
+<!--          placeholder="请输入计量单位546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="规格型号546" prop="spec">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          placeholder="请输入规格型号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="层级关系546" prop="cjgx">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cjgx"-->
+<!--          placeholder="请输入层级关系546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="上层物料546" prop="scwl">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.scwl"-->
+<!--          placeholder="请输入上层物料546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="顶层物料546" prop="dcwl">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.dcwl"-->
+<!--          placeholder="请输入顶层物料546"-->
+<!--          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="spare4">
-        <el-input
-          v-model="queryParams.spare4"
-          placeholder="请输入序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.finishTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间" style="width: 206px">
-        </el-date-picker>
-      </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>
@@ -131,101 +290,56 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <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="160"/>
-      <el-table-column label="入库子单号" align="left" prop="stockinDetailId"  width="160"/>
-      <el-table-column label="入库类型" align="center" prop="inType">
+    <el-table v-loading="loading" :data="ViewStockinHistoryList">
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="GUID" align="center" prop="stockinGuid" />-->
+      <el-table-column width="180" label="入库单ID" align="center" prop="stockinId" />
+      <el-table-column width="180" label="子单ID" align="center" prop="stockinDetailId" />
+      <el-table-column width="180" label="项目号" align="center" prop="departmentNo" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="100" label="计划数量" align="center" prop="quantity" />
+      <el-table-column width="100" label="扫码数量" align="center" prop="scanNum" />
+      <el-table-column width="100" label="实际数量" align="center" prop="assignNum" />
+      <el-table-column width="80" label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
+          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createManId" width="160"/>
-<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
-      <el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
-      <el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
-      <el-table-column label="订单号" align="left" prop="erpBill" width="160"/>
-      <el-table-column label="品号" align="left" prop="productId" width="160"/>
-      <el-table-column label="品名" align="left" prop="productName" width="160"/>
-<!--      <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="160"/>
-      <el-table-column label="单据状态" align="center" prop="status">
+      <el-table-column width="80" label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="供应商简称" align="center" prop="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" width="160"/>
-<!--      <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">
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
-<!--      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>-->
-      <el-table-column label="品号描述" align="left" prop="price" width="160"/>
-      <el-table-column label="英文描述" align="left" prop="cargoNo" width="160"/>
-      <el-table-column label="图号" align="left" prop="unit" width="160"/>
-      <el-table-column label="规格" align="left" prop="spec" width="160"/>
-<!--      <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="160"/>
-      <el-table-column label="电源线" align="left" prop="spare10" width="160"/>
-      <el-table-column label="插头" align="left" prop="spare11" width="160"/>
-      <el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
-      <el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
-      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-<!--      <el-table-column width="160" label="仓库名称" align="left" prop="warehouseName" />-->
-      <el-table-column width="160" label="描述" align="left" prop="remark" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <el-table-column width="180" label="审核人" align="center" prop="spare4" />
+      <el-table-column width="180" label="审核时间" align="center" prop="spare3" />
+      <el-table-column width="180" label="完成日期" align="center" prop="finishDate" />
+      <el-table-column width="180" label="销售订单号" align="center" prop="spare2" />
+      <el-table-column width="180" label="合同号" align="center" prop="spare1" />
+      <el-table-column width="180" label="供应商编码" align="center" prop="supplierNo" />
+      <el-table-column width="180" label="供应商名称" align="center" prop="classNo" />
+      <el-table-column width="180" label="计量单位" align="center" prop="unit" />
+      <el-table-column width="180" label="规格型号" align="center" prop="spec" />
+      <el-table-column width="180" label="层级关系" align="center" prop="cjgx" />
+      <el-table-column width="180" label="上层物料" align="center" prop="scwl" />
+      <el-table-column width="180" label="顶层物料" align="center" prop="dcwl" />
+      <el-table-column width="180" label="单据时间" align="center" prop="createDate" />
+      <el-table-column width="180" label="制单人" align="center" prop="createManId" />
+      <el-table-column width="180" label="仓库ID" align="center" prop="warehouseId" />
+<!--      <el-table-column width="180" label="备注" align="center" prop="spare5" />-->
+      <el-table-column width="180" label="单据来源" align="center" prop="stockSource" />
+<!--      <el-table-column width="180" label="主单GUID" align="center" prop="productGuid" />-->
+      <el-table-column width="100" label="计划数量(件)" align="center" prop="quantityJ" />
+      <el-table-column width="100" label="计划数量(箱)" align="center" prop="quantityX" />
+      <el-table-column width="100" label="实际数量(件)" align="center" prop="assignNumJ" />
+      <el-table-column width="100" label="实际数量(箱)" align="center" prop="assignNumX" />
+      <el-table-column width="100" label="扫码数量(件)" align="center" prop="scanNumJ" />
+      <el-table-column width="100" label="扫码数量(箱)" align="center" prop="scanNumX" />
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
+      <!--      <el-table-column label="${comment}" align="center" prop="erpBill" />-->
+      <!--      <el-table-column label="${comment}" align="center" prop="customerNo" />-->
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -256,27 +370,27 @@
     <!-- 添加或修改入库单据历史对话框 -->
     <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="入库单guid" prop="stockinGuid">
-          <el-input v-model="form.stockinGuid" placeholder="请输入入库单guid" />
+        <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="请输入入库单号" />
+        <el-form-item label="入库订单ID" prop="stockinId">
+          <el-input v-model="form.stockinId" placeholder="请输入入库订单ID" />
         </el-form-item>
-        <el-form-item label="入库类型" prop="inType">
-          <el-select v-model="form.inType" placeholder="请选择入库类型">
+        <el-form-item label="入库类型546" prop="inType">
+          <el-select v-model="form.inType" placeholder="请选择入库类型546">
             <el-option
-              v-for="dict in dict.type.in_job_type"
+              v-for="dict in dict.type.in_bill_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入创建时间" />
+        <el-form-item label="单据时间546" prop="createDate">
+          <el-input v-model="form.createDate" placeholder="请输入单据时间546" />
         </el-form-item>
-        <el-form-item label="创建人" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人" />
+        <el-form-item label="制单人546" prop="createManId">
+          <el-input v-model="form.createManId" placeholder="请输入制单人546" />
         </el-form-item>
         <el-form-item label="单据状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择单据状态">
@@ -288,234 +402,77 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        <el-form-item label="仓库ID546" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID546" />
         </el-form-item>
-        <el-form-item label="完成时间" prop="finishDate">
-          <el-input v-model="form.finishDate" placeholder="请输入完成时间" />
+        <el-form-item label="备注546" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入备注546" />
         </el-form-item>
-        <el-form-item label="ERP单号" prop="erpBill">
-          <el-input v-model="form.erpBill" placeholder="请输入ERP单号" />
+        <el-form-item label="审核人546" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入审核人546" />
+        </el-form-item>
+        <el-form-item label="审核时间546" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入审核时间546" />
+        </el-form-item>
+        <el-form-item label="完成日期" prop="finishDate">
+          <el-input v-model="form.finishDate" placeholder="请输入完成日期" />
+        </el-form-item>
+        <el-form-item label="销售订单号546" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入销售订单号546" />
+        </el-form-item>
+        <el-form-item label="合同号546" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入合同号546" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="erpBill">
+          <el-input v-model="form.erpBill" placeholder="请输入${comment}" />
         </el-form-item>
         <el-form-item label="单据来源" prop="stockSource">
           <el-input v-model="form.stockSource" placeholder="请输入单据来源" />
         </el-form-item>
-        <el-form-item label="部门编码" prop="departmentNo">
+        <el-form-item label="项目号546" prop="departmentNo">
           <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="请输入班组编码" />
+        <el-form-item label="${comment}" prop="customerNo">
+          <el-input v-model="form.customerNo" placeholder="请输入${comment}" />
         </el-form-item>
-        <el-form-item label="供应商编号" prop="supplierNo">
-          <el-input v-model="form.supplierNo" placeholder="请输入供应商编号" />
+        <el-form-item label="供应商名称546" prop="classNo">
+          <el-input v-model="form.classNo" placeholder="请输入供应商名称546" />
         </el-form-item>
-        <el-form-item label="供应商名称" prop="supplierName">
-          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+        <el-form-item label="供应商编码546" prop="supplierNo">
+          <el-input v-model="form.supplierNo" placeholder="请输入供应商编码546" />
         </el-form-item>
-        <el-form-item label="供应商简称" prop="simpleName">
-          <el-input v-model="form.simpleName" placeholder="请输入供应商简称" />
+        <el-form-item label="批次号546" prop="lotNo">
+          <el-input v-model="form.lotNo" placeholder="请输入批次号546" />
         </el-form-item>
-        <el-form-item label="联系人" prop="contactName">
-          <el-input v-model="form.contactName" placeholder="请输入联系人" />
+        <el-form-item label="子单ID" prop="stockinDetailId">
+          <el-input v-model="form.stockinDetailId" placeholder="请输入子单ID" />
         </el-form-item>
-        <el-form-item label="联系电话" prop="contactNumber">
-          <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
+        <el-form-item label="主单GUID" prop="productGuid">
+          <el-input v-model="form.productGuid" placeholder="请输入主单GUID" />
         </el-form-item>
-        <el-form-item label="供应商地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入供应商地址" />
+        <el-form-item label="物料编码" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料编码" />
         </el-form-item>
-        <el-form-item label="入库明细ID" prop="stockinDetailId">
-          <el-input v-model="form.stockinDetailId" placeholder="请输入入库明细ID" />
+        <el-form-item label="备注546" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注546" />
         </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
+        <el-form-item label="计量单位546" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位546" />
         </el-form-item>
-        <el-form-item label="计划数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入计划数量" />
+        <el-form-item label="规格型号546" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格型号546" />
         </el-form-item>
-        <el-form-item label="计划箱数" prop="quantityX">
-          <el-input v-model="form.quantityX" placeholder="请输入计划箱数" />
+        <el-form-item label="层级关系546" prop="cjgx">
+          <el-input v-model="form.cjgx" placeholder="请输入层级关系546" />
         </el-form-item>
-        <el-form-item label="计划件数" prop="quantityJ">
-          <el-input v-model="form.quantityJ" placeholder="请输入计划件数" />
+        <el-form-item label="上层物料546" prop="scwl">
+          <el-input v-model="form.scwl" placeholder="请输入上层物料546" />
         </el-form-item>
-        <el-form-item label="实际数量" prop="assignNum">
-          <el-input v-model="form.assignNum" placeholder="请输入实际数量" />
+        <el-form-item label="顶层物料546" prop="dcwl">
+          <el-input v-model="form.dcwl" placeholder="请输入顶层物料546" />
         </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-input v-model="form.printDate" placeholder="请输入入库日期" />
-        </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="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="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 label="物料名称546" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入物料名称546" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -531,7 +488,7 @@ import { listViewStockinHistory, getViewStockinHistory, delViewStockinHistory, a
 
 export default {
   name: "ViewStockinHistory",
-  dicts: ['in_job_type', 'in_bill_status', 'stock_status'],
+  dicts: ['in_bill_status', 'in_bill_type'],
   data() {
     return {
       // 遮罩层
@@ -563,88 +520,56 @@ export default {
         createManId: null,
         status: null,
         warehouseId: null,
+        spare5: null,
+        spare4: null,
+        spare3: null,
         finishDate: null,
+        spare2: null,
+        spare1: null,
         erpBill: null,
         stockSource: null,
         departmentNo: null,
+        customerNo: null,
         classNo: null,
         supplierNo: null,
-        supplierName: null,
-        simpleName: null,
-        contactName: null,
-        contactNumber: null,
-        address: null,
-        stockinDetailId: null,
         lotNo: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        scanNum: null,
-        scanNumX: null,
-        scanNumJ: null,
-        printDate: null,
-        stockStatus: null,
+        stockinDetailId: null,
         productGuid: null,
         productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
+        quantity: null,
+        quantityJ: null,
+        quantityX: null,
+        assignNum: null,
+        assignNumJ: null,
+        assignNumX: 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,
-        warehouseName: null,
-        startTime: null,
-        finishTime: null
+        cjgx: null,
+        scwl: null,
+        dcwl: null,
+        scanNum: null,
+        scanNumJ: null,
+        scanNumX: null,
+        productName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         stockinGuid: [
-          { required: true, message: "入库单guid不能为空", trigger: "blur" }
+          { required: true, message: "GUID不能为空", trigger: "blur" }
+        ],
+        stockinId: [
+          { required: true, message: "入库订单ID不能为空", trigger: "blur" }
+        ],
+        inType: [
+          { required: true, message: "入库类型546不能为空", trigger: "change" }
+        ],
+        createDate: [
+          { required: true, message: "单据时间546不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "单据状态不能为空", trigger: "change" }
         ],
       }
     }
@@ -677,79 +602,38 @@ export default {
         createManId: null,
         status: null,
         warehouseId: null,
+        spare5: null,
+        spare4: null,
+        spare3: null,
         finishDate: null,
+        spare2: null,
+        spare1: null,
         erpBill: null,
         stockSource: null,
         departmentNo: null,
+        customerNo: null,
         classNo: null,
         supplierNo: null,
-        supplierName: null,
-        simpleName: null,
-        contactName: null,
-        contactNumber: null,
-        address: null,
-        stockinDetailId: null,
         lotNo: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        scanNum: null,
-        scanNumX: null,
-        scanNumJ: null,
-        printDate: null,
-        stockStatus: null,
+        stockinDetailId: null,
         productGuid: null,
         productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
+        quantity: null,
+        quantityJ: null,
+        quantityX: null,
+        remark: null,
+        assignNum: null,
+        assignNumJ: null,
+        assignNumX: 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,
-        warehouseName: null
+        cjgx: null,
+        scwl: null,
+        dcwl: null,
+        scanNum: null,
+        scanNumJ: null,
+        scanNumX: null,
+        productName: null
       }
       this.resetForm("form")
     },
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index 3c1b95d..b9ad744 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -1,10 +1,34 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出库单号" prop="stockoutId">
+<!--      <el-form-item label="546 guid" prop="stockoutGuid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockoutGuid"-->
+<!--          placeholder="请输入546 guid"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="出库单ID" prop="stockoutId">
         <el-input
           v-model="queryParams.stockoutId"
-          placeholder="请输入出库单号"
+          placeholder="请输入出库单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出库子单ID" prop="stockoutDetailId">
+        <el-input
+          v-model="queryParams.stockoutDetailId"
+          placeholder="请输入出库子单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目号" prop="departmentNo">
+        <el-input
+          v-model="queryParams.departmentNo"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -19,8 +43,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="出库状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>
+      <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"
@@ -29,56 +53,201 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="订单号" prop="erpStockoutId">
-        <el-input
-          v-model="queryParams.erpStockoutId"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="品号" prop="productId">
+<!--      <el-form-item label="546 单据时间" prop="createDate">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createDate"-->
+<!--          placeholder="请输入546 单据时间"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item label="客户编码" prop="customerNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.customerNo"-->
+<!--          placeholder="请输入客户编码546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="制单人546" prop="createManId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createManId"-->
+<!--          placeholder="请输入制单人546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item label="单据来源0自建单1接口" prop="stockoutSource">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stockoutSource"-->
+<!--          placeholder="请输入单据来源0自建单1接口"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="仓库ID546" prop="warehouseId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请输入仓库ID546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="客户名称546" prop="classNowId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.classNowId"-->
+<!--          placeholder="请输入客户名称546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="出口" prop="exitId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.exitId"-->
+<!--          placeholder="请输入出口"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="合同号546" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入合同号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="销售订单号546" prop="spare2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare2"-->
+<!--          placeholder="请输入销售订单号546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核时间546" prop="spare3">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare3"-->
+<!--          placeholder="请输入审核时间546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="审核人546" prop="spare4">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare4"-->
+<!--          placeholder="请输入审核人546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="备注546" prop="spare5">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare5"-->
+<!--          placeholder="请输入备注546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item label="546 批次" prop="lotNo">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入546 批次"-->
+<!--          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="546 数量" prop="quantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.quantity"-->
+<!--          placeholder="请输入546 数量"-->
+<!--          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="allotQuantity">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.allotQuantity"-->
+<!--          placeholder="请输入货位分配数量"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计量单位546" prop="unit">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unit"-->
+<!--          placeholder="请输入计量单位546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="规格型号546" prop="spec">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          placeholder="请输入规格型号546"-->
+<!--          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="spare4">
-        <el-input
-          v-model="queryParams.spare4"
-          placeholder="请输入序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择开始时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.finishTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择结束时间" style="width: 206px">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item label="层级关系546" prop="cjgx">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.cjgx"-->
+<!--          placeholder="请输入层级关系546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="上层物料546" prop="scwl">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.scwl"-->
+<!--          placeholder="请输入上层物料546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="顶层物料546" prop="dcwl">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.dcwl"-->
+<!--          placeholder="请输入顶层物料546"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="货位，托盘加数量按逗号分开546" prop="spare9">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare9"-->
+<!--          placeholder="请输入货位，托盘加数量按逗号分开546"-->
+<!--          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>
@@ -131,80 +300,48 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <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="160" label="出库单号" align="left" prop="stockoutId" />
-      <el-table-column width="160" label="出库子单号" align="left" prop="stockoutDetailId" />
-      <el-table-column label="出库类型" align="center" prop="outType">
+    <el-table v-loading="loading" :data="ViewStockoutHistoryList" >
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="546 guid" align="center" prop="stockoutGuid" />-->
+      <el-table-column width="180" label="出库单ID" align="center" prop="stockoutId" />
+      <el-table-column width="180" label="子单ID" align="center" prop="stockoutDetailId" />
+      <el-table-column width="180" label="项目号" align="center" prop="departmentNo" />
+      <el-table-column width="180" label="物料编码" align="center" prop="productId" />
+      <el-table-column width="180" label="物料名称" align="center" prop="productName" />
+      <el-table-column width="180" label="批次号" align="center" prop="lotNo" />
+      <el-table-column width="100" label="数量" align="center" prop="quantity" />
+      <el-table-column width="180" label="货位分配数量" align="center" prop="allotQuantity" />
+      <el-table-column width="180" label="货位实际数量" align="center" prop="assignNum" />
+      <el-table-column width="100" 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="status">
+      <el-table-column width="180" label="审核人546" align="center" prop="spare4" />
+      <el-table-column width="180" label="审核时间546" align="center" prop="spare3" />
+      <el-table-column width="180" label="销售订单号546" align="center" prop="spare2" />
+      <el-table-column width="180" label="合同号546" align="center" prop="spare1" />
+      <el-table-column width="180" label="客户编码546" align="center" prop="customerNo" />
+      <el-table-column width="180" label="客户名称546" align="center" prop="classNowId" />
+      <el-table-column width="180" label="计量单位546" align="center" prop="unit" />
+      <el-table-column width="180" label="规格型号546" align="center" prop="spec" />
+      <el-table-column width="180" label="层级关系546" align="center" prop="cjgx" />
+      <el-table-column width="180" label="上层物料546" align="center" prop="scwl" />
+      <el-table-column width="180" label="顶层物料546" align="center" prop="dcwl" />
+      <el-table-column width="180" label="546 单据时间" align="center" prop="createDate" />
+      <el-table-column width="180" label="制单人546" align="center" prop="createManId" />
+      <el-table-column width="180" label="仓库ID546" align="center" prop="warehouseId" />
+      <el-table-column width="100" label="546 单据状态" 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="创建人ID" align="center" prop="createManId" width="160"/>
-      <el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
-      <el-table-column label="创建时间" align="center" prop="createDate" width="160" sortable/>
-      <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
-      <el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
-      <el-table-column width="160" label="品号" align="left" prop="productId" />
-      <el-table-column width="160" label="品名" align="left" prop="productName" />
-      <el-table-column width="160" label="出库数量" align="right" prop="quantity" />
-      <el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
-      <el-table-column width="160" label="确认数量" align="right" prop="assignNum" />
-      <el-table-column width="160" label="批次号" align="left" prop="lotNo" />
-      <el-table-column width="160" label="客户名称" align="left" prop="customerName" />
-      <!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
-<!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
-      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="160" 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="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-      <el-table-column width="160" label="描述" align="left" prop="remark" />
-<!--      <el-table-column width="120" label="操作" align="center" class-name="small-padding fixed-width">-->
+      <el-table-column width="100" label="单据来源0自建单1接口" align="center" prop="stockoutSource" />
+      <el-table-column width="100" label="出口" align="center" prop="exitId" />
+<!--      <el-table-column label="备注546" align="center" prop="spare5" />-->
+      <el-table-column width="180" label="备注" align="center" prop="remark" />
+      <el-table-column width="180" label="货位，托盘加数量按逗号分开546" align="center" prop="spare9" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -235,11 +372,14 @@
     <!-- 添加或修改出库单据历史对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="出库单号" prop="stockoutId">
-          <el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
+        <el-form-item label="546 guid" prop="stockoutGuid">
+          <el-input v-model="form.stockoutGuid" placeholder="请输入546 guid" />
         </el-form-item>
-        <el-form-item label="出库类型" prop="outType">
-          <el-select v-model="form.outType" placeholder="请选择出库类型">
+        <el-form-item label="546 单据编码" prop="stockoutId">
+          <el-input v-model="form.stockoutId" placeholder="请输入546 单据编码" />
+        </el-form-item>
+        <el-form-item label="546 出库类型" prop="outType">
+          <el-select v-model="form.outType" placeholder="请选择546 出库类型">
             <el-option
               v-for="dict in dict.type.out_bill_type"
               :key="dict.value"
@@ -248,197 +388,96 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="创建日期" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入创建日期" />
+        <el-form-item label="546 单据时间" prop="createDate">
+          <el-input v-model="form.createDate" placeholder="请输入546 单据时间" />
         </el-form-item>
-        <el-form-item label="创建人ID" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人ID" />
+        <el-form-item label="项目号546" prop="departmentNo">
+          <el-input v-model="form.departmentNo" placeholder="请输入项目号546" />
         </el-form-item>
-        <el-form-item label="出库状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
+        <el-form-item label="客户编码546" prop="customerNo">
+          <el-input v-model="form.customerNo" placeholder="请输入客户编码546" />
+        </el-form-item>
+        <el-form-item label="制单人546" prop="createManId">
+          <el-input v-model="form.createManId" placeholder="请输入制单人546" />
+        </el-form-item>
+        <el-form-item label="546 单据状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择546 单据状态">
+            <el-option
               v-for="dict in dict.type.out_bill_status"
               :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="出库来源" prop="stockoutSource">
-          <el-input v-model="form.stockoutSource" placeholder="请输入出库来源" />
+        <el-form-item label="单据来源0自建单1接口" prop="stockoutSource">
+          <el-input v-model="form.stockoutSource" placeholder="请输入单据来源0自建单1接口" />
+        </el-form-item>
+        <el-form-item label="仓库ID546" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID546" />
+        </el-form-item>
+        <el-form-item label="客户名称546" prop="classNowId">
+          <el-input v-model="form.classNowId" placeholder="请输入客户名称546" />
         </el-form-item>
         <el-form-item label="出口" prop="exitId">
           <el-input v-model="form.exitId" placeholder="请输入出口" />
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        <el-form-item label="合同号546" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入合同号546" />
         </el-form-item>
-        <el-form-item label="出库明细ID" prop="stockoutDetailId">
-          <el-input v-model="form.stockoutDetailId" placeholder="请输入出库明细ID" />
+        <el-form-item label="销售订单号546" prop="spare2">
+          <el-input v-model="form.spare2" placeholder="请输入销售订单号546" />
         </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
+        <el-form-item label="审核时间546" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入审核时间546" />
         </el-form-item>
-        <el-form-item label="出库数量" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入出库数量" />
+        <el-form-item label="审核人546" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入审核人546" />
         </el-form-item>
-        <el-form-item label="分配数量" prop="allotQuantity">
-          <el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
+        <el-form-item label="备注546" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入备注546" />
         </el-form-item>
-        <el-form-item label="分配编号" prop="assignNum">
-          <el-input v-model="form.assignNum" placeholder="请输入分配编号" />
+        <el-form-item label="546 子单" prop="stockoutDetailId">
+          <el-input v-model="form.stockoutDetailId" placeholder="请输入546 子单" />
         </el-form-item>
-        <el-form-item label="ERP出库单ID" prop="erpStockoutId">
-          <el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
+        <el-form-item label="546 批次" prop="lotNo">
+          <el-input v-model="form.lotNo" placeholder="请输入546 批次" />
         </el-form-item>
-        <el-form-item label="客户编号" prop="entryid">
-          <el-input v-model="form.entryid" placeholder="请输入客户编号" />
+        <el-form-item label="546 资材编码" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入546 资材编码" />
         </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        <el-form-item label="546 数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入546 数量" />
         </el-form-item>
-        <el-form-item label="物料主键" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料主键" />
+        <el-form-item label="货位实际数量" prop="assignNum">
+          <el-input v-model="form.assignNum" placeholder="请输入货位实际数量" />
         </el-form-item>
-        <el-form-item label="品号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入品号" />
+        <el-form-item label="货位分配数量" prop="allotQuantity">
+          <el-input v-model="form.allotQuantity" placeholder="请输入货位分配数量" />
         </el-form-item>
-        <el-form-item label="产品分类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入产品分类" />
+        <el-form-item label="备注546" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注546" />
         </el-form-item>
-        <el-form-item label="品号描述" prop="price">
-          <el-input v-model="form.price" placeholder="请输入品号描述" />
+        <el-form-item label="计量单位546" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入计量单位546" />
         </el-form-item>
-        <el-form-item label="英文描述" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入英文描述" />
+        <el-form-item label="规格型号546" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格型号546" />
         </el-form-item>
-        <el-form-item label="图号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入图号" />
+        <el-form-item label="546品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入546品名" />
         </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
+        <el-form-item label="层级关系546" prop="cjgx">
+          <el-input v-model="form.cjgx" placeholder="请输入层级关系546" />
         </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
+        <el-form-item label="上层物料546" prop="scwl">
+          <el-input v-model="form.scwl" placeholder="请输入上层物料546" />
         </el-form-item>
-        <el-form-item label="型号" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        <el-form-item label="顶层物料546" prop="dcwl">
+          <el-input v-model="form.dcwl" placeholder="请输入顶层物料546" />
         </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 label="货位，托盘加数量按逗号分开546" prop="spare9">
+          <el-input v-model="form.spare9" placeholder="请输入货位，托盘加数量按逗号分开546" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -479,91 +518,58 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        stockoutGuid: null,
         stockoutId: null,
         outType: null,
         createDate: null,
+        departmentNo: null,
+        customerNo: null,
         createManId: null,
         status: null,
         stockoutSource: null,
-        exitId: null,
         warehouseId: null,
-        stockoutDetailId: null,
-        lotNo: null,
-        quantity: null,
-        allotQuantity: null,
-        assignNum: null,
-        erpStockoutId: null,
-        entryid: null,
-        customerName: null,
-        productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        classNowId: null,
+        exitId: null,
         spare1: null,
         spare2: null,
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null,
+        stockoutDetailId: null,
+        lotNo: null,
+        productId: null,
+        quantity: null,
+        assignNum: null,
+        allotQuantity: null,
+        unit: null,
+        spec: 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,
-        startTime: null,
-        finishTime: null
+        cjgx: null,
+        scwl: null,
+        dcwl: null,
+        spare9: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        stockoutGuid: [
+          { required: true, message: "546 guid不能为空", trigger: "blur" }
+        ],
         stockoutId: [
-          { required: true, message: "出库单号不能为空", trigger: "blur" }
+          { required: true, message: "546 单据编码不能为空", trigger: "blur" }
         ],
         outType: [
-          { required: true, message: "出库类型不能为空", trigger: "change" }
+          { required: true, message: "546 出库类型不能为空", trigger: "change" }
         ],
         createDate: [
-          { required: true, message: "创建日期不能为空", trigger: "blur" }
+          { required: true, message: "546 单据时间不能为空", trigger: "blur" }
         ],
         status: [
-          { required: true, message: "出库状态不能为空", trigger: "change" }
+          { required: true, message: "546 单据状态不能为空", trigger: "change" }
         ],
         stockoutDetailId: [
-          { required: true, message: "出库明细ID不能为空", trigger: "blur" }
+          { required: true, message: "546 子单不能为空", trigger: "blur" }
         ],
       }
     }
@@ -589,70 +595,37 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        stockoutGuid: null,
         stockoutId: null,
         outType: null,
         createDate: null,
+        departmentNo: null,
+        customerNo: null,
         createManId: null,
         status: null,
         stockoutSource: null,
-        exitId: null,
         warehouseId: null,
-        stockoutDetailId: null,
-        lotNo: null,
-        quantity: null,
-        allotQuantity: null,
-        assignNum: null,
-        erpStockoutId: null,
-        entryid: null,
-        customerName: null,
-        productGuid: null,
-        productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        classNowId: null,
+        exitId: null,
         spare1: null,
         spare2: null,
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null,
+        stockoutDetailId: null,
+        lotNo: null,
+        productId: null,
+        quantity: null,
+        assignNum: null,
+        allotQuantity: null,
+        remark: null,
+        unit: null,
+        spec: 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
+        cjgx: null,
+        scwl: null,
+        dcwl: null,
+        spare9: null
       }
       this.resetForm("form")
     },
@@ -668,7 +641,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.stockoutId)
+      this.ids = selection.map(item => item.stockoutGuid)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -681,8 +654,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const stockoutId = row.stockoutId || this.ids
-      getViewStockoutHistory(stockoutId).then(response => {
+      const stockoutGuid = row.stockoutGuid || this.ids
+      getViewStockoutHistory(stockoutGuid).then(response => {
         this.form = response.data
         this.open = true
         this.title = "修改出库单据历史"
@@ -692,7 +665,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.stockoutId != null) {
+          if (this.form.stockoutGuid != null) {
             updateViewStockoutHistory(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
@@ -710,9 +683,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const stockoutIds = row.stockoutId || this.ids
-      this.$modal.confirm('是否确认删除出库单据历史编号为"' + stockoutIds + '"的数据项？').then(function() {
-        return delViewStockoutHistory(stockoutIds)
+      const stockoutGuids = row.stockoutGuid || this.ids
+      this.$modal.confirm('是否确认删除出库单据历史编号为"' + stockoutGuids + '"的数据项？').then(function() {
+        return delViewStockoutHistory(stockoutGuids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")