From 444c1c2e2ec4057fc0bad46e08ae36f42e12ae7a Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 27 Oct 2025 15:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1-=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewStockoutHistoryController.java        |    4 +-
 .../domain/ViewStockoutHistory.java           |  593 ++++---
 .../mapper/ViewStockoutHistoryMapper.java     |    4 +-
 .../service/IViewStockoutHistoryService.java  |    4 +-
 .../impl/ViewStockoutHistoryServiceImpl.java  |    4 +-
 .../search/ViewStockoutHistoryMapper.xml      |  410 ++---
 .../resources/mapper/stock/BasStockMapper.xml |    2 +-
 .../search/ViewStockoutHistory/index.vue      | 1393 ++++++-----------
 8 files changed, 1008 insertions(+), 1406 deletions(-)

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..0548b22 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 2025-10-27
  */
 @RestController
 @RequestMapping("/search/ViewStockoutHistory")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
index 7aa3416..71e9ad6 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,13 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 出库单据历史对象 view_stockout_history
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
 public class ViewStockoutHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -33,22 +24,6 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "出库子单号")
     private String stockoutDetailId;
 
-    /** 出库类型 */
-    @Excel(name = "出库类型",dictType = "out_bill_type")
-    private String outType;
-
-    /** 创建日期 */
-    @Excel(name = "创建日期")
-    private String createDate;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createManId;
-
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String erpStockoutId;
-
     /** 物料编码 */
     @Excel(name = "物料编码")
     private String productId;
@@ -57,13 +32,17 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
-    /** 出口 */
-    @Excel(name = "出口")
-    private String exitId;
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spec;
 
-    /** 出库状态 */
-    @Excel(name = "出库状态",dictType = "out_bill_status")
-    private String status;
+    /** 图号 */
+    @Excel(name = "图号")
+    private String cargoNo;
+
+    /** 物料状态 */
+    @Excel(name = "物料状态")
+    private String productType;
 
     /** 出库数量 */
     @Excel(name = "出库数量")
@@ -73,216 +52,424 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "分配数量")
     private BigDecimal allotQuantity;
 
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
-
-    /** 出库来源 */
-//    @Excel(name = "出库来源")
-    private String stockoutSource;
-
-
-    /** 仓库ID */
-//    @Excel(name = "仓库ID")
-    private String warehouseId;
-
-    /** 分配编号 */
-//    @Excel(name = "分配编号")
+    /** 实际数量 */
+    @Excel(name = "实际数量")
     private BigDecimal assignNum;
 
+    /** 合同号 */
+    @Excel(name = "合同号")
+    private String contract;
 
-    /** 客户编号 */
-//    @Excel(name = "客户编号")
-    private String entryid;
+    /** 台次 */
+    @Excel(name = "台次")
+    private String power;
+
+    /** 件次 */
+    @Excel(name = "件次")
+    private String phase;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private String price;
+
+    /** 出库金额 */
+    @Excel(name = "出库金额")
+    private String priceTotal;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    private String customerNo;
 
     /** 客户名称 */
     @Excel(name = "客户名称")
     private String customerName;
 
-    /** 物料主键 */
-//    @Excel(name = "物料主键")
-    private String productGuid;
+    /** 单据状态 */
+    @Excel(name = "单据状态")
+    private String status;
 
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createManId;
 
+    /** 创建时间 */
+    @Excel(name = "创建时间")
+    private String createDate;
 
-    /** 产品分类 */
-//    @Excel(name = "产品分类")
-    private String parentId;
-
-    /** 品号描述 */
-    @Excel(name = "品号描述")
-    private String price;
-
-    /** 英文描述 */
-    @Excel(name = "英文描述")
-    private String cargoNo;
-
-    /** 图号 */
-    @Excel(name = "图号")
+    /** 单位 */
+    @Excel(name = "单位")
     private String unit;
 
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
+    /** 套账 */
+    @Excel(name = "套账")
+    private String account;
 
-    /** 型号 */
-    @Excel(name = "型号")
-    private String spare1;
+    /** 管理号 */
+    @Excel(name = "管理号")
+    private String managementNo;
 
-    /** 单件净重 */
-    @Excel(name = "单件净重")
-    private String spare2;
+    /** 供应商编码 */
+    @Excel(name = "供应商编码")
+    private String supplierId;
 
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare3;
+    /** 供应商 */
+    @Excel(name = "供应商")
+    private String supplierName;
 
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare4;
+    /** 用途 */
+    @Excel(name = "用途")
+    private String purpose;
 
-    /** 电压 */
-    @Excel(name = "电压")
-    private String spare5;
+    /** 质量 */
+    @Excel(name = "质量")
+    private String quality;
 
-    /** 功率 */
-    @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 source;
 
     /** 状态 */
     @Excel(name = "状态")
-    private String spare21;
+    private String turnoverStatus;
 
-    /** 产品大类 */
-    @Excel(name = "产品大类")
-    private String spare22;
+    /** 用途2 */
+    @Excel(name = "用途2")
+    private String purpose2;
 
-    /** 产品二类 */
-    @Excel(name = "产品二类")
-    private String spare23;
+    public void setStockoutId(String stockoutId) 
+    {
+        this.stockoutId = stockoutId;
+    }
 
-    /** 产品线/产品系列 */
-    @Excel(name = "产品线/产品系列")
-    private String spare24;
+    public String getStockoutId() 
+    {
+        return stockoutId;
+    }
 
-    /** BOM状态 */
-    @Excel(name = "BOM状态")
-    private String spare25;
+    public void setStockoutDetailId(String stockoutDetailId) 
+    {
+        this.stockoutDetailId = stockoutDetailId;
+    }
 
-    /** 产品定位（组码 */
-    @Excel(name = "产品定位", readConverterExp = "产品定位（组码")
-    private String spare26;
+    public String getStockoutDetailId() 
+    {
+        return stockoutDetailId;
+    }
 
-    /** 电脑板型号（组码） */
-    @Excel(name = "电脑板型号", readConverterExp = "组=码")
-    private String spare27;
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
 
-    /** 非标要求 */
-    @Excel(name = "非标要求")
-    private String spare28;
+    public String getProductId() 
+    {
+        return productId;
+    }
 
-    /** 品牌（组码） */
-    @Excel(name = "品牌", readConverterExp = "组=码")
-    private String spare29;
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
 
-    /** 非标颜色 */
-    @Excel(name = "非标颜色")
-    private String spare30;
+    public String getProductName() 
+    {
+        return productName;
+    }
 
-    /** 主颜色 */
-    @Excel(name = "主颜色")
-    private String spare31;
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
 
-    /** 辅助颜色 */
-    @Excel(name = "辅助颜色")
-    private String spare32;
+    public String getSpec() 
+    {
+        return spec;
+    }
 
-    /** 是否标准款（组码） */
-    @Excel(name = "是否标准款", readConverterExp = "组=码")
-    private String spare33;
+    public void setCargoNo(String cargoNo) 
+    {
+        this.cargoNo = cargoNo;
+    }
 
-    /** 包装方式 */
-    @Excel(name = "包装方式")
-    private String spare34;
+    public String getCargoNo() 
+    {
+        return cargoNo;
+    }
 
-    /** 主要包装方式 */
-    @Excel(name = "主要包装方式")
-    private String spare35;
+    public void setProductType(String productType) 
+    {
+        this.productType = productType;
+    }
 
-    /** 长 */
-    @Excel(name = "长")
-    private String spare36;
+    public String getProductType() 
+    {
+        return productType;
+    }
 
-    /** 宽 */
-    @Excel(name = "宽")
-    private String spare37;
+    public void setQuantity(BigDecimal quantity) 
+    {
+        this.quantity = quantity;
+    }
 
-    /** 高 */
-    @Excel(name = "高")
-    private String spare38;
+    public BigDecimal getQuantity() 
+    {
+        return quantity;
+    }
 
-    /** 包装材积 */
-    @Excel(name = "包装材积")
-    private String spare39;
-    /** 描述 */
-    @Excel(name = "描述")
-    private String remark;
+    public void setAllotQuantity(BigDecimal allotQuantity) 
+    {
+        this.allotQuantity = allotQuantity;
+    }
 
+    public BigDecimal getAllotQuantity() 
+    {
+        return allotQuantity;
+    }
 
+    public void setAssignNum(BigDecimal assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public BigDecimal getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setContract(String contract) 
+    {
+        this.contract = contract;
+    }
+
+    public String getContract() 
+    {
+        return contract;
+    }
+
+    public void setPower(String power) 
+    {
+        this.power = power;
+    }
+
+    public String getPower() 
+    {
+        return power;
+    }
+
+    public void setPhase(String phase) 
+    {
+        this.phase = phase;
+    }
+
+    public String getPhase() 
+    {
+        return phase;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setPriceTotal(String priceTotal) 
+    {
+        this.priceTotal = priceTotal;
+    }
+
+    public String getPriceTotal() 
+    {
+        return priceTotal;
+    }
+
+    public void setCustomerNo(String customerNo) 
+    {
+        this.customerNo = customerNo;
+    }
+
+    public String getCustomerNo() 
+    {
+        return customerNo;
+    }
+
+    public void setCustomerName(String customerName) 
+    {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerName() 
+    {
+        return customerName;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setCreateManId(String createManId) 
+    {
+        this.createManId = createManId;
+    }
+
+    public String getCreateManId() 
+    {
+        return createManId;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setAccount(String account) 
+    {
+        this.account = account;
+    }
+
+    public String getAccount() 
+    {
+        return account;
+    }
+
+    public void setManagementNo(String managementNo) 
+    {
+        this.managementNo = managementNo;
+    }
+
+    public String getManagementNo() 
+    {
+        return managementNo;
+    }
+
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierId() 
+    {
+        return supplierId;
+    }
+
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+
+    public void setPurpose(String purpose) 
+    {
+        this.purpose = purpose;
+    }
+
+    public String getPurpose() 
+    {
+        return purpose;
+    }
+
+    public void setQuality(String quality) 
+    {
+        this.quality = quality;
+    }
+
+    public String getQuality() 
+    {
+        return quality;
+    }
+
+    public void setSource(String source) 
+    {
+        this.source = source;
+    }
+
+    public String getSource() 
+    {
+        return source;
+    }
+
+    public void setTurnoverStatus(String turnoverStatus) 
+    {
+        this.turnoverStatus = turnoverStatus;
+    }
+
+    public String getTurnoverStatus() 
+    {
+        return turnoverStatus;
+    }
+
+    public void setPurpose2(String purpose2) 
+    {
+        this.purpose2 = purpose2;
+    }
+
+    public String getPurpose2() 
+    {
+        return purpose2;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockoutId", getStockoutId())
+            .append("stockoutDetailId", getStockoutDetailId())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("spec", getSpec())
+            .append("cargoNo", getCargoNo())
+            .append("productType", getProductType())
+            .append("quantity", getQuantity())
+            .append("allotQuantity", getAllotQuantity())
+            .append("assignNum", getAssignNum())
+            .append("contract", getContract())
+            .append("power", getPower())
+            .append("phase", getPhase())
+            .append("price", getPrice())
+            .append("priceTotal", getPriceTotal())
+            .append("customerNo", getCustomerNo())
+            .append("customerName", getCustomerName())
+            .append("status", getStatus())
+            .append("createManId", getCreateManId())
+            .append("createDate", getCreateDate())
+            .append("unit", getUnit())
+            .append("account", getAccount())
+            .append("managementNo", getManagementNo())
+            .append("supplierId", getSupplierId())
+            .append("supplierName", getSupplierName())
+            .append("remark", getRemark())
+            .append("purpose", getPurpose())
+            .append("quality", getQuality())
+            .append("source", getSource())
+            .append("turnoverStatus", getTurnoverStatus())
+            .append("purpose2", getPurpose2())
+            .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..7bfc061 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,8 +6,8 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 /**
  * 出库单据历史Mapper接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
  */
 public interface ViewStockoutHistoryMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
index 56c4001..6cd553c 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,8 +6,8 @@ import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory;
 /**
  * 出库单据历史Service接口
  * 
- * @author gw
- * @date 2025-09-19
+ * @author ruoyi
+ * @date 2025-10-27
  */
 public interface IViewStockoutHistoryService 
 {
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..bb73de4 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 2025-10-27
  */
 @Service
 public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService 
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
index 5617d8e..5b5448e 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
@@ -6,142 +6,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
         <result property="stockoutId"    column="stockout_id"    />
-        <result property="outType"    column="out_type"    />
-        <result property="createDate"    column="create_date"    />
-        <result property="createManId"    column="create_man_id"    />
-        <result property="status"    column="status"    />
-        <result property="stockoutSource"    column="stockout_source"    />
-        <result property="exitId"    column="exit_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
         <result property="stockoutDetailId"    column="stockout_detail_id"    />
-        <result property="lotNo"    column="lot_no"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spec"    column="spec"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="productType"    column="productType"    />
         <result property="quantity"    column="quantity"    />
         <result property="allotQuantity"    column="allot_quantity"    />
         <result property="assignNum"    column="assign_num"    />
-        <result property="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="contract"    column="contract"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
         <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
+        <result property="priceTotal"    column="priceTotal"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="status"    column="status"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="createDate"    column="create_date"    />
         <result property="unit"    column="unit"    />
-        <result property="spec"    column="spec"    />
+        <result property="account"    column="account"    />
+        <result property="managementNo"    column="managementNo"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="supplierName"    column="supplier_name"    />
         <result property="remark"    column="remark"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="spare9"    column="spare9"    />
-        <result property="spare10"    column="spare10"    />
-        <result property="spare11"    column="spare11"    />
-        <result property="spare12"    column="spare12"    />
-        <result property="spare13"    column="spare13"    />
-        <result property="spare14"    column="spare14"    />
-        <result property="spare15"    column="spare15"    />
-        <result property="spare16"    column="spare16"    />
-        <result property="spare17"    column="spare17"    />
-        <result property="spare18"    column="spare18"    />
-        <result property="spare19"    column="spare19"    />
-        <result property="spare20"    column="spare20"    />
-        <result property="spare21"    column="spare21"    />
-        <result property="spare22"    column="spare22"    />
-        <result property="spare23"    column="spare23"    />
-        <result property="spare24"    column="spare24"    />
-        <result property="spare25"    column="spare25"    />
-        <result property="spare26"    column="spare26"    />
-        <result property="spare27"    column="spare27"    />
-        <result property="spare28"    column="spare28"    />
-        <result property="spare29"    column="spare29"    />
-        <result property="spare30"    column="spare30"    />
-        <result property="spare31"    column="spare31"    />
-        <result property="spare32"    column="spare32"    />
-        <result property="spare33"    column="spare33"    />
-        <result property="spare34"    column="spare34"    />
-        <result property="spare35"    column="spare35"    />
-        <result property="spare36"    column="spare36"    />
-        <result property="spare37"    column="spare37"    />
-        <result property="spare38"    column="spare38"    />
-        <result property="spare39"    column="spare39"    />
+        <result property="purpose"    column="purpose"    />
+        <result property="quality"    column="quality"    />
+        <result property="source"    column="source"    />
+        <result property="turnoverStatus"    column="turnoverStatus"    />
+        <result property="purpose2"    column="purpose2"    />
     </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_id, stockout_detail_id, product_id, product_name, spec, cargo_no, productType, quantity, allot_quantity, assign_num, contract, power, phase, price, priceTotal, customer_no, customer_name, status, create_man_id, create_date, unit, account, managementNo, supplier_id, supplier_name, remark, purpose, quality, source, turnoverStatus, purpose2 from view_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         <where>  
-            <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="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat('%', #{stockoutSource}, '%')</if>
-            <if test="exitId != null  and exitId != ''"> and exit_id like concat('%', #{exitId}, '%')</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
-            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</if>
-            <if test="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="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="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="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="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
+            <if test="productType != null  and productType != ''"> and productType = #{productType}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
+            <if test="assignNum != null "> and assign_num = #{assignNum}</if>
+            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
+            <if test="power != null  and power != ''"> and power = #{power}</if>
+            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="priceTotal != null  and priceTotal != ''"> and priceTotal = #{priceTotal}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id = #{createManId}</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="account != null  and account != ''"> and account = #{account}</if>
+            <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id = #{supplierId}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="purpose != null  and purpose != ''"> and purpose = #{purpose}</if>
+            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
+            <if test="source != null  and source != ''"> and source = #{source}</if>
+            <if test="turnoverStatus != null  and turnoverStatus != ''"> and turnoverStatus = #{turnoverStatus}</if>
+            <if test="purpose2 != null  and purpose2 != ''"> and purpose2 = #{purpose2}</if>
         </where>
     </select>
     
@@ -154,204 +87,105 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into view_stockout_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
-            <if test="outType != null and outType != ''">out_type,</if>
-            <if test="createDate != null and createDate != ''">create_date,</if>
-            <if test="createManId != null">create_man_id,</if>
-            <if test="status != null 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="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spec != null">spec,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="productType != null">productType,</if>
             <if test="quantity != null">quantity,</if>
             <if test="allotQuantity != null">allot_quantity,</if>
             <if test="assignNum != null">assign_num,</if>
-            <if test="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="contract != null">contract,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
             <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
+            <if test="priceTotal != null">priceTotal,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
             <if test="unit != null">unit,</if>
-            <if test="spec != null">spec,</if>
+            <if test="account != null">account,</if>
+            <if test="managementNo != null">managementNo,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="supplierName != null">supplier_name,</if>
             <if test="remark != null">remark,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="spare9 != null">spare9,</if>
-            <if test="spare10 != null">spare10,</if>
-            <if test="spare11 != null">spare11,</if>
-            <if test="spare12 != null">spare12,</if>
-            <if test="spare13 != null">spare13,</if>
-            <if test="spare14 != null">spare14,</if>
-            <if test="spare15 != null">spare15,</if>
-            <if test="spare16 != null">spare16,</if>
-            <if test="spare17 != null">spare17,</if>
-            <if test="spare18 != null">spare18,</if>
-            <if test="spare19 != null">spare19,</if>
-            <if test="spare20 != null">spare20,</if>
-            <if test="spare21 != null">spare21,</if>
-            <if test="spare22 != null">spare22,</if>
-            <if test="spare23 != null">spare23,</if>
-            <if test="spare24 != null">spare24,</if>
-            <if test="spare25 != null">spare25,</if>
-            <if test="spare26 != null">spare26,</if>
-            <if test="spare27 != null">spare27,</if>
-            <if test="spare28 != null">spare28,</if>
-            <if test="spare29 != null">spare29,</if>
-            <if test="spare30 != null">spare30,</if>
-            <if test="spare31 != null">spare31,</if>
-            <if test="spare32 != null">spare32,</if>
-            <if test="spare33 != null">spare33,</if>
-            <if test="spare34 != null">spare34,</if>
-            <if test="spare35 != null">spare35,</if>
-            <if test="spare36 != null">spare36,</if>
-            <if test="spare37 != null">spare37,</if>
-            <if test="spare38 != null">spare38,</if>
-            <if test="spare39 != null">spare39,</if>
+            <if test="purpose != null">purpose,</if>
+            <if test="quality != null">quality,</if>
+            <if test="source != null">source,</if>
+            <if test="turnoverStatus != null">turnoverStatus,</if>
+            <if test="purpose2 != null">purpose2,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
-            <if test="outType != null and outType != ''">#{outType},</if>
-            <if test="createDate != null and createDate != ''">#{createDate},</if>
-            <if test="createManId != null">#{createManId},</if>
-            <if test="status != null and status != ''">#{status},</if>
-            <if test="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="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="productType != null">#{productType},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="allotQuantity != null">#{allotQuantity},</if>
             <if test="assignNum != null">#{assignNum},</if>
-            <if test="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="contract != null">#{contract},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
             <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="priceTotal != null">#{priceTotal},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
             <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
+            <if test="account != null">#{account},</if>
+            <if test="managementNo != null">#{managementNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="supplierName != null">#{supplierName},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="spare9 != null">#{spare9},</if>
-            <if test="spare10 != null">#{spare10},</if>
-            <if test="spare11 != null">#{spare11},</if>
-            <if test="spare12 != null">#{spare12},</if>
-            <if test="spare13 != null">#{spare13},</if>
-            <if test="spare14 != null">#{spare14},</if>
-            <if test="spare15 != null">#{spare15},</if>
-            <if test="spare16 != null">#{spare16},</if>
-            <if test="spare17 != null">#{spare17},</if>
-            <if test="spare18 != null">#{spare18},</if>
-            <if test="spare19 != null">#{spare19},</if>
-            <if test="spare20 != null">#{spare20},</if>
-            <if test="spare21 != null">#{spare21},</if>
-            <if test="spare22 != null">#{spare22},</if>
-            <if test="spare23 != null">#{spare23},</if>
-            <if test="spare24 != null">#{spare24},</if>
-            <if test="spare25 != null">#{spare25},</if>
-            <if test="spare26 != null">#{spare26},</if>
-            <if test="spare27 != null">#{spare27},</if>
-            <if test="spare28 != null">#{spare28},</if>
-            <if test="spare29 != null">#{spare29},</if>
-            <if test="spare30 != null">#{spare30},</if>
-            <if test="spare31 != null">#{spare31},</if>
-            <if test="spare32 != null">#{spare32},</if>
-            <if test="spare33 != null">#{spare33},</if>
-            <if test="spare34 != null">#{spare34},</if>
-            <if test="spare35 != null">#{spare35},</if>
-            <if test="spare36 != null">#{spare36},</if>
-            <if test="spare37 != null">#{spare37},</if>
-            <if test="spare38 != null">#{spare38},</if>
-            <if test="spare39 != null">#{spare39},</if>
+            <if test="purpose != null">#{purpose},</if>
+            <if test="quality != null">#{quality},</if>
+            <if test="source != null">#{source},</if>
+            <if test="turnoverStatus != null">#{turnoverStatus},</if>
+            <if test="purpose2 != null">#{purpose2},</if>
          </trim>
     </insert>
 
     <update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
         update view_stockout_history
         <trim prefix="SET" suffixOverrides=",">
-            <if test="outType != null and outType != ''">out_type = #{outType},</if>
-            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
-            <if test="createManId != null">create_man_id = #{createManId},</if>
-            <if test="status != null 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="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="productType != null">productType = #{productType},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
             <if test="assignNum != null">assign_num = #{assignNum},</if>
-            <if test="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="contract != null">contract = #{contract},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
             <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="priceTotal != null">priceTotal = #{priceTotal},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
             <if test="unit != null">unit = #{unit},</if>
-            <if test="spec != null">spec = #{spec},</if>
+            <if test="account != null">account = #{account},</if>
+            <if test="managementNo != null">managementNo = #{managementNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="spare9 != null">spare9 = #{spare9},</if>
-            <if test="spare10 != null">spare10 = #{spare10},</if>
-            <if test="spare11 != null">spare11 = #{spare11},</if>
-            <if test="spare12 != null">spare12 = #{spare12},</if>
-            <if test="spare13 != null">spare13 = #{spare13},</if>
-            <if test="spare14 != null">spare14 = #{spare14},</if>
-            <if test="spare15 != null">spare15 = #{spare15},</if>
-            <if test="spare16 != null">spare16 = #{spare16},</if>
-            <if test="spare17 != null">spare17 = #{spare17},</if>
-            <if test="spare18 != null">spare18 = #{spare18},</if>
-            <if test="spare19 != null">spare19 = #{spare19},</if>
-            <if test="spare20 != null">spare20 = #{spare20},</if>
-            <if test="spare21 != null">spare21 = #{spare21},</if>
-            <if test="spare22 != null">spare22 = #{spare22},</if>
-            <if test="spare23 != null">spare23 = #{spare23},</if>
-            <if test="spare24 != null">spare24 = #{spare24},</if>
-            <if test="spare25 != null">spare25 = #{spare25},</if>
-            <if test="spare26 != null">spare26 = #{spare26},</if>
-            <if test="spare27 != null">spare27 = #{spare27},</if>
-            <if test="spare28 != null">spare28 = #{spare28},</if>
-            <if test="spare29 != null">spare29 = #{spare29},</if>
-            <if test="spare30 != null">spare30 = #{spare30},</if>
-            <if test="spare31 != null">spare31 = #{spare31},</if>
-            <if test="spare32 != null">spare32 = #{spare32},</if>
-            <if test="spare33 != null">spare33 = #{spare33},</if>
-            <if test="spare34 != null">spare34 = #{spare34},</if>
-            <if test="spare35 != null">spare35 = #{spare35},</if>
-            <if test="spare36 != null">spare36 = #{spare36},</if>
-            <if test="spare37 != null">spare37 = #{spare37},</if>
-            <if test="spare38 != null">spare38 = #{spare38},</if>
-            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="purpose != null">purpose = #{purpose},</if>
+            <if test="quality != null">quality = #{quality},</if>
+            <if test="source != null">source = #{source},</if>
+            <if test="turnoverStatus != null">turnoverStatus = #{turnoverStatus},</if>
+            <if test="purpose2 != null">purpose2 = #{purpose2},</if>
         </trim>
         where stockout_id = #{stockoutId}
     </update>
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index 27025a2..eea07c8 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bs.cargo_space_id, --库位编码
                bs.tray_code,      --托盘
                bs.product_id,     --产品编码
-               bs.product_name,--产品名称
+               bp.product_name,--产品名称
                bp.spec,           -- 规格
                bs.quantity,       -- 数量
                bs.spare6,         -- 金额
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index a420706..79881d2 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -9,138 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出库类型" prop="outType">
-        <el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_bill_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="创建日期" prop="createDate">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createDate"-->
-<!--          placeholder="请输入创建日期"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建人ID" prop="createManId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createManId"-->
-<!--          placeholder="请输入创建人ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库状态" prop="status">-->
-<!--        <el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.out_bill_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库来源" prop="stockoutSource">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockoutSource"-->
-<!--          placeholder="请输入出库来源"-->
-<!--          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="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库明细ID" prop="stockoutDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockoutDetailId"-->
-<!--          placeholder="请输入出库明细ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批次号" prop="lotNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批次号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库数量" prop="quantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          placeholder="请输入出库数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="分配数量" prop="allotQuantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.allotQuantity"-->
-<!--          placeholder="请输入分配数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="分配编号" prop="assignNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.assignNum"-->
-<!--          placeholder="请输入分配编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="订单号" prop="erpStockoutId">
+      <el-form-item label="出库子单号" prop="stockoutDetailId">
         <el-input
-          v-model="queryParams.erpStockoutId"
-          placeholder="请输入订单号"
+          v-model="queryParams.stockoutDetailId"
+          placeholder="请输入出库子单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="客户编号" prop="entryid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.entryid"-->
-<!--          placeholder="请输入客户编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="客户名称" prop="customerName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.customerName"-->
-<!--          placeholder="请输入客户名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料主键" prop="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料主键"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -149,102 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="描述" prop="remark">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="型号" prop="spare1">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          placeholder="请输入型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          placeholder="请输入电压"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="功率" prop="spare6">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare6"-->
-<!--          placeholder="请输入功率"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -253,270 +33,228 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="规格" prop="spec">
+        <el-input
+          v-model="queryParams.spec"
+          placeholder="请输入规格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="图号" prop="cargoNo">
+        <el-input
+          v-model="queryParams.cargoNo"
+          placeholder="请输入图号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料状态" prop="productType">
+        <el-select v-model="queryParams.productType" placeholder="请选择物料状态" clearable>
+          <el-option
+            v-for="dict in dict.type.product_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出库数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入出库数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分配数量" prop="allotQuantity">
+        <el-input
+          v-model="queryParams.allotQuantity"
+          placeholder="请输入分配数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际数量" prop="assignNum">
+        <el-input
+          v-model="queryParams.assignNum"
+          placeholder="请输入实际数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同号" prop="contract">
+        <el-input
+          v-model="queryParams.contract"
+          placeholder="请输入合同号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="台次" prop="power">
+        <el-input
+          v-model="queryParams.power"
+          placeholder="请输入台次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="件次" prop="phase">
+        <el-input
+          v-model="queryParams.phase"
+          placeholder="请输入件次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单价" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入单价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出库金额" prop="priceTotal">
+        <el-input
+          v-model="queryParams.priceTotal"
+          placeholder="请输入出库金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户编码" prop="customerNo">
+        <el-input
+          v-model="queryParams.customerNo"
+          placeholder="请输入客户编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.out_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createManId">
+        <el-input
+          v-model="queryParams.createManId"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createDate">
+        <el-input
+          v-model="queryParams.createDate"
+          placeholder="请输入创建时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="套账" prop="account">
+        <el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
+          <el-option
+            v-for="dict in dict.type.account_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="管理号" prop="managementNo">
+        <el-input
+          v-model="queryParams.managementNo"
+          placeholder="请输入管理号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应商编码" prop="supplierId">
+        <el-input
+          v-model="queryParams.supplierId"
+          placeholder="请输入供应商编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应商" prop="supplierName">
+        <el-input
+          v-model="queryParams.supplierName"
+          placeholder="请输入供应商"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用途" prop="purpose">
+        <el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
+          <el-option
+            v-for="dict in dict.type.purpose_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="质量" prop="quality">
+        <el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
+          <el-option
+            v-for="dict in dict.type.quality_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="queryParams.source" placeholder="请选择来源" clearable>
+          <el-option
+            v-for="dict in dict.type.origin_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="turnoverStatus">
+        <el-select v-model="queryParams.turnoverStatus" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.turnover_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用途2" prop="purpose2">
+        <el-input
+          v-model="queryParams.purpose2"
+          placeholder="请输入用途2"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -524,38 +262,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:ViewStockoutHistory:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['search:ViewStockoutHistory:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['search:ViewStockoutHistory:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['search:ViewStockoutHistory:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['search:ViewStockoutHistory:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['search:ViewStockoutHistory:remove']"
+        >删除</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -569,101 +307,87 @@
       <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 v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
       <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-column label="出库单号" align="center" prop="stockoutId" />
+      <el-table-column label="出库子单号" align="center" prop="stockoutDetailId" />
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="物料名称" align="center" prop="productName" />
+      <el-table-column label="规格" align="center" prop="spec" />
+      <el-table-column label="图号" align="center" prop="cargoNo" />
+      <el-table-column label="物料状态" align="center" prop="productType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
+          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建日期" align="center" prop="createDate" width="160"/>
-      <el-table-column label="创建人ID" align="center" prop="createManId" width="160"/>
-
-      <el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
-      <el-table-column width="160" label="物料编码" align="left" prop="productId" />
-      <el-table-column width="160" label="物料名称" align="left" prop="productName" />
-<!--      <el-table-column label="出库来源" align="center" prop="stockoutSource" />-->
-      <el-table-column width="160" label="出口" align="left" prop="exitId" />
-      <el-table-column label="出库状态" align="center" prop="status">
+      <el-table-column label="出库数量" align="center" prop="quantity" />
+      <el-table-column label="分配数量" align="center" prop="allotQuantity" />
+      <el-table-column label="实际数量" align="center" prop="assignNum" />
+      <el-table-column label="合同号" align="center" prop="contract" />
+      <el-table-column label="台次" align="center" prop="power" />
+      <el-table-column label="件次" align="center" prop="phase" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="出库金额" align="center" prop="priceTotal" />
+      <el-table-column label="客户编码" align="center" prop="customerNo" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />-->
-      <el-table-column width="160" label="出库数量" align="right" prop="quantity" />
-      <el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
-<!--      <el-table-column label="分配编号" align="center" prop="assignNum" />-->
-<!--      <el-table-column label="客户编号" align="center" prop="entryid" />-->
-      <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">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockoutHistory:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['search:ViewStockoutHistory:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="创建人" align="center" prop="createManId" />
+      <el-table-column label="创建时间" align="center" prop="createDate" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="套账" align="center" prop="account">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.account_type" :value="scope.row.account"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理号" align="center" prop="managementNo" />
+      <el-table-column label="供应商编码" align="center" prop="supplierId" />
+      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="用途" align="center" prop="purpose">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.purpose_type" :value="scope.row.purpose"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="质量" align="center" prop="quality">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.quality_type" :value="scope.row.quality"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="来源" align="center" prop="source">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.origin_type" :value="scope.row.source"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="turnoverStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.turnover_type" :value="scope.row.turnoverStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用途2" align="center" prop="purpose2" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['search:ViewStockoutHistory:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['search:ViewStockoutHistory:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -678,207 +402,144 @@
         <el-form-item label="出库单号" prop="stockoutId">
           <el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
         </el-form-item>
-        <el-form-item label="出库类型" prop="outType">
-          <el-select v-model="form.outType" placeholder="请选择出库类型">
+        <el-form-item label="出库子单号" prop="stockoutDetailId">
+          <el-input v-model="form.stockoutDetailId" placeholder="请输入出库子单号" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="规格" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="图号" prop="cargoNo">
+          <el-input v-model="form.cargoNo" placeholder="请输入图号" />
+        </el-form-item>
+        <el-form-item label="物料状态" prop="productType">
+          <el-select v-model="form.productType" placeholder="请选择物料状态">
             <el-option
-              v-for="dict in dict.type.out_bill_type"
+              v-for="dict in dict.type.product_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="创建日期" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入创建日期" />
-        </el-form-item>
-        <el-form-item label="创建人ID" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人ID" />
-        </el-form-item>
-        <el-form-item label="出库状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.out_bill_status"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="出库来源" prop="stockoutSource">
-          <el-input v-model="form.stockoutSource" placeholder="请输入出库来源" />
-        </el-form-item>
-        <el-form-item label="出口" prop="exitId">
-          <el-input v-model="form.exitId" placeholder="请输入出口" />
-        </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
-        </el-form-item>
-        <el-form-item label="出库明细ID" prop="stockoutDetailId">
-          <el-input v-model="form.stockoutDetailId" placeholder="请输入出库明细ID" />
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
-        </el-form-item>
         <el-form-item label="出库数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入出库数量" />
         </el-form-item>
         <el-form-item label="分配数量" prop="allotQuantity">
           <el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
         </el-form-item>
-        <el-form-item label="分配编号" prop="assignNum">
-          <el-input v-model="form.assignNum" placeholder="请输入分配编号" />
+        <el-form-item label="实际数量" prop="assignNum">
+          <el-input v-model="form.assignNum" placeholder="请输入实际数量" />
         </el-form-item>
-        <el-form-item label="ERP出库单ID" prop="erpStockoutId">
-          <el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
+        <el-form-item label="合同号" prop="contract">
+          <el-input v-model="form.contract" placeholder="请输入合同号" />
         </el-form-item>
-        <el-form-item label="客户编号" prop="entryid">
-          <el-input v-model="form.entryid" placeholder="请输入客户编号" />
+        <el-form-item label="台次" prop="power">
+          <el-input v-model="form.power" placeholder="请输入台次" />
+        </el-form-item>
+        <el-form-item label="件次" prop="phase">
+          <el-input v-model="form.phase" placeholder="请输入件次" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入单价" />
+        </el-form-item>
+        <el-form-item label="出库金额" prop="priceTotal">
+          <el-input v-model="form.priceTotal" placeholder="请输入出库金额" />
+        </el-form-item>
+        <el-form-item label="客户编码" prop="customerNo">
+          <el-input v-model="form.customerNo" placeholder="请输入客户编码" />
         </el-form-item>
         <el-form-item label="客户名称" prop="customerName">
           <el-input v-model="form.customerName" placeholder="请输入客户名称" />
         </el-form-item>
-        <el-form-item label="物料主键" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料主键" />
+        <el-form-item label="单据状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择单据状态">
+            <el-option
+              v-for="dict in dict.type.out_bill_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
+        <el-form-item label="创建人" prop="createManId">
+          <el-input v-model="form.createManId" placeholder="请输入创建人" />
         </el-form-item>
-        <el-form-item label="产品分类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入产品分类" />
+        <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="form.createDate" placeholder="请输入创建时间" />
         </el-form-item>
-        <el-form-item label="品号描述" prop="price">
-          <el-input v-model="form.price" placeholder="请输入品号描述" />
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
-        <el-form-item label="英文描述" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入英文描述" />
+        <el-form-item label="套账" prop="account">
+          <el-select v-model="form.account" placeholder="请选择套账">
+            <el-option
+              v-for="dict in dict.type.account_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="图号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入图号" />
+        <el-form-item label="管理号" prop="managementNo">
+          <el-input v-model="form.managementNo" placeholder="请输入管理号" />
         </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
+        <el-form-item label="供应商编码" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入供应商编码" />
         </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
+        <el-form-item label="供应商" prop="supplierName">
+          <el-input v-model="form.supplierName" placeholder="请输入供应商" />
         </el-form-item>
-        <el-form-item label="型号" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="单件净重" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="请输入单件净重" />
+        <el-form-item label="用途" prop="purpose">
+          <el-select v-model="form.purpose" placeholder="请选择用途">
+            <el-option
+              v-for="dict in dict.type.purpose_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="颜色" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="请输入颜色" />
+        <el-form-item label="质量" prop="quality">
+          <el-select v-model="form.quality" placeholder="请选择质量">
+            <el-option
+              v-for="dict in dict.type.quality_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="序列号" prop="spare4">
-          <el-input v-model="form.spare4" placeholder="请输入序列号" />
+        <el-form-item label="来源" prop="source">
+          <el-select v-model="form.source" placeholder="请选择来源">
+            <el-option
+              v-for="dict in dict.type.origin_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="电压" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入电压" />
+        <el-form-item label="状态" prop="turnoverStatus">
+          <el-select v-model="form.turnoverStatus" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.turnover_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="功率" 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="用途2" prop="purpose2">
+          <el-input v-model="form.purpose2" placeholder="请输入用途2" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -894,7 +555,7 @@ import { listViewStockoutHistory, getViewStockoutHistory, delViewStockoutHistory
 
 export default {
   name: "ViewStockoutHistory",
-  dicts: ['out_bill_type', 'out_bill_status'],
+  dicts: ['product_type', 'quality_type', 'turnover_type', 'purpose_type', 'origin_type', 'account_type', 'out_bill_status'],
   data() {
     return {
       // 遮罩层
@@ -920,69 +581,35 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockoutId: null,
-        outType: null,
-        createDate: null,
-        createManId: null,
-        status: null,
-        stockoutSource: null,
-        exitId: null,
-        warehouseId: null,
         stockoutDetailId: null,
-        lotNo: null,
+        productId: null,
+        productName: null,
+        spec: null,
+        cargoNo: null,
+        productType: null,
         quantity: null,
         allotQuantity: null,
         assignNum: null,
-        erpStockoutId: null,
-        entryid: null,
-        customerName: null,
-        productGuid: null,
-        productId: null,
-        parentId: null,
+        contract: null,
+        power: null,
+        phase: null,
         price: null,
-        cargoNo: null,
+        priceTotal: null,
+        customerNo: null,
+        customerName: null,
+        status: null,
+        createManId: null,
+        createDate: 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
+        account: null,
+        managementNo: null,
+        supplierId: null,
+        supplierName: null,
+        purpose: null,
+        quality: null,
+        source: null,
+        turnoverStatus: null,
+        purpose2: null
       },
       // 表单参数
       form: {},
@@ -991,17 +618,14 @@ export default {
         stockoutId: [
           { required: true, message: "出库单号不能为空", trigger: "blur" }
         ],
-        outType: [
-          { required: true, message: "出库类型不能为空", trigger: "change" }
-        ],
-        createDate: [
-          { required: true, message: "创建日期不能为空", trigger: "blur" }
+        stockoutDetailId: [
+          { required: true, message: "出库子单号不能为空", trigger: "blur" }
         ],
         status: [
-          { required: true, message: "出库状态不能为空", trigger: "change" }
+          { required: true, message: "单据状态不能为空", trigger: "change" }
         ],
-        stockoutDetailId: [
-          { required: true, message: "出库明细ID不能为空", trigger: "blur" }
+        createDate: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
         ],
       }
     }
@@ -1028,69 +652,36 @@ export default {
     reset() {
       this.form = {
         stockoutId: null,
-        outType: null,
-        createDate: null,
-        createManId: null,
-        status: null,
-        stockoutSource: null,
-        exitId: null,
-        warehouseId: null,
         stockoutDetailId: null,
-        lotNo: null,
+        productId: null,
+        productName: null,
+        spec: null,
+        cargoNo: null,
+        productType: null,
         quantity: null,
         allotQuantity: null,
         assignNum: null,
-        erpStockoutId: null,
-        entryid: null,
-        customerName: null,
-        productGuid: null,
-        productId: null,
-        parentId: null,
+        contract: null,
+        power: null,
+        phase: null,
         price: null,
-        cargoNo: null,
+        priceTotal: null,
+        customerNo: null,
+        customerName: null,
+        status: null,
+        createManId: null,
+        createDate: null,
         unit: null,
-        spec: null,
+        account: null,
+        managementNo: null,
+        supplierId: null,
+        supplierName: 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
+        purpose: null,
+        quality: null,
+        source: null,
+        turnoverStatus: null,
+        purpose2: null
       }
       this.resetForm("form")
     },
@@ -1165,13 +756,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>