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"
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
- 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
@@ -154,204 +87,105 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into view_stockout_history
stockout_id,
- out_type,
- create_date,
- create_man_id,
- status,
- stockout_source,
- exit_id,
- warehouse_id,
stockout_detail_id,
- lot_no,
+ product_id,
+ product_name,
+ spec,
+ cargo_no,
+ productType,
quantity,
allot_quantity,
assign_num,
- erp_stockout_id,
- entryid,
- customer_name,
- product_guid,
- product_id,
- parent_id,
+ contract,
+ power,
+ phase,
price,
- cargo_no,
+ priceTotal,
+ customer_no,
+ customer_name,
+ status,
+ create_man_id,
+ create_date,
unit,
- spec,
+ account,
+ managementNo,
+ supplier_id,
+ supplier_name,
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,
+ purpose,
+ quality,
+ source,
+ turnoverStatus,
+ purpose2,
#{stockoutId},
- #{outType},
- #{createDate},
- #{createManId},
- #{status},
- #{stockoutSource},
- #{exitId},
- #{warehouseId},
#{stockoutDetailId},
- #{lotNo},
+ #{productId},
+ #{productName},
+ #{spec},
+ #{cargoNo},
+ #{productType},
#{quantity},
#{allotQuantity},
#{assignNum},
- #{erpStockoutId},
- #{entryid},
- #{customerName},
- #{productGuid},
- #{productId},
- #{parentId},
+ #{contract},
+ #{power},
+ #{phase},
#{price},
- #{cargoNo},
+ #{priceTotal},
+ #{customerNo},
+ #{customerName},
+ #{status},
+ #{createManId},
+ #{createDate},
#{unit},
- #{spec},
+ #{account},
+ #{managementNo},
+ #{supplierId},
+ #{supplierName},
#{remark},
- #{spare1},
- #{spare2},
- #{spare3},
- #{spare4},
- #{spare5},
- #{spare6},
- #{productName},
- #{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},
+ #{purpose},
+ #{quality},
+ #{source},
+ #{turnoverStatus},
+ #{purpose2},
update view_stockout_history
- out_type = #{outType},
- create_date = #{createDate},
- create_man_id = #{createManId},
- status = #{status},
- stockout_source = #{stockoutSource},
- exit_id = #{exitId},
- warehouse_id = #{warehouseId},
stockout_detail_id = #{stockoutDetailId},
- lot_no = #{lotNo},
+ product_id = #{productId},
+ product_name = #{productName},
+ spec = #{spec},
+ cargo_no = #{cargoNo},
+ productType = #{productType},
quantity = #{quantity},
allot_quantity = #{allotQuantity},
assign_num = #{assignNum},
- erp_stockout_id = #{erpStockoutId},
- entryid = #{entryid},
- customer_name = #{customerName},
- product_guid = #{productGuid},
- product_id = #{productId},
- parent_id = #{parentId},
+ contract = #{contract},
+ power = #{power},
+ phase = #{phase},
price = #{price},
- cargo_no = #{cargoNo},
+ priceTotal = #{priceTotal},
+ customer_no = #{customerNo},
+ customer_name = #{customerName},
+ status = #{status},
+ create_man_id = #{createManId},
+ create_date = #{createDate},
unit = #{unit},
- spec = #{spec},
+ account = #{account},
+ managementNo = #{managementNo},
+ supplier_id = #{supplierId},
+ supplier_name = #{supplierName},
remark = #{remark},
- spare1 = #{spare1},
- spare2 = #{spare2},
- spare3 = #{spare3},
- spare4 = #{spare4},
- spare5 = #{spare5},
- spare6 = #{spare6},
- product_name = #{productName},
- spare7 = #{spare7},
- spare8 = #{spare8},
- spare9 = #{spare9},
- spare10 = #{spare10},
- spare11 = #{spare11},
- spare12 = #{spare12},
- spare13 = #{spare13},
- spare14 = #{spare14},
- spare15 = #{spare15},
- spare16 = #{spare16},
- spare17 = #{spare17},
- spare18 = #{spare18},
- spare19 = #{spare19},
- spare20 = #{spare20},
- spare21 = #{spare21},
- spare22 = #{spare22},
- spare23 = #{spare23},
- spare24 = #{spare24},
- spare25 = #{spare25},
- spare26 = #{spare26},
- spare27 = #{spare27},
- spare28 = #{spare28},
- spare29 = #{spare29},
- spare30 = #{spare30},
- spare31 = #{spare31},
- spare32 = #{spare32},
- spare33 = #{spare33},
- spare34 = #{spare34},
- spare35 = #{spare35},
- spare36 = #{spare36},
- spare37 = #{spare37},
- spare38 = #{spare38},
- spare39 = #{spare39},
+ purpose = #{purpose},
+ quality = #{quality},
+ source = #{source},
+ turnoverStatus = #{turnoverStatus},
+ purpose2 = #{purpose2},
where stockout_id = #{stockoutId}
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"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -524,38 +262,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
-
+
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{dict.label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+