lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询统计-出库单据历史

Browse Source
This commit is contained in:
liuhanqing
2025-10-27 15:55:15 +08:00
parent b7c7597193
commit 444c1c2e2e
8 changed files with 1008 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java
View File

@@ -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")

593
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
View File

@@ -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();
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java
View File

@@ -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
{

4
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java
View File

@@ -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
{

4
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java
View File

@@ -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

410
ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
View File

@@ -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>

2
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -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, -- 金额

1393
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

File diff suppressed because it is too large Load Diff