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-21 14:10:56 +08:00
parent df43ffd1b9
commit 55a3323a3e
7 changed files with 514 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
View File

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 手动分配库存对象 view_hand_allot_stock
*
*
* @author ruoyi
* @date 2025-09-16
*/
@@ -134,11 +134,11 @@ public class ViewHandAllotStock extends BaseEntity
/** 净重 */
@Excel(name = "净重")
private BigDecimal netWeight;
private String netWeight;
/** 毛重 */
@Excel(name = "毛重")
private BigDecimal grossWeight;
private String grossWeight;
/** 分销 */
@Excel(name = "分销")
@@ -164,372 +164,372 @@ public class ViewHandAllotStock extends BaseEntity
@Excel(name = "货位名称")
private String cargoSpaceName;
public void setStockId(String stockId)
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
public String getStockId()
{
return stockId;
}
public void setCargoSpaceId(String cargoSpaceId)
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceId()
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setStockStatus(String stockStatus)
public void setStockStatus(String stockStatus)
{
this.stockStatus = stockStatus;
}
public String getStockStatus()
public String getStockStatus()
{
return stockStatus;
}
public void setProductStatus(String productStatus)
public void setProductStatus(String productStatus)
{
this.productStatus = productStatus;
}
public String getProductStatus()
public String getProductStatus()
{
return productStatus;
}
public void setLotNo(String lotNo)
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
public String getLotNo()
{
return lotNo;
}
public void setInDate(String inDate)
public void setInDate(String inDate)
{
this.inDate = inDate;
}
public String getInDate()
public String getInDate()
{
return inDate;
}
public void setBackDate(String backDate)
public void setBackDate(String backDate)
{
this.backDate = backDate;
}
public String getBackDate()
public String getBackDate()
{
return backDate;
}
public void setProductGuid(String productGuid)
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
}
public String getProductGuid()
public String getProductGuid()
{
return productGuid;
}
public void setQuantity(BigDecimal quantity)
public void setQuantity(BigDecimal quantity)
{
this.quantity = quantity;
}
public BigDecimal getQuantity()
public BigDecimal getQuantity()
{
return quantity;
}
public void setJobId(String jobId)
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
public String getJobId()
{
return jobId;
}
public void setTrayCode(String trayCode)
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
public String getTrayCode()
{
return trayCode;
}
public void setOutQuantity(String outQuantity)
public void setOutQuantity(String outQuantity)
{
this.outQuantity = outQuantity;
}
public String getOutQuantity()
public String getOutQuantity()
{
return outQuantity;
}
public void setStockinDetailId(String stockinDetailId)
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
}
public String getStockinDetailId()
public String getStockinDetailId()
{
return stockinDetailId;
}
public void setStockinId(String stockinId)
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
public String getStockinId()
public String getStockinId()
{
return stockinId;
}
public void setInType(String inType)
public void setInType(String inType)
{
this.inType = inType;
}
public String getInType()
public String getInType()
{
return inType;
}
public void setInClassId(String inClassId)
public void setInClassId(String inClassId)
{
this.inClassId = inClassId;
}
public String getInClassId()
public String getInClassId()
{
return inClassId;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setStackingId(String stackingId)
public void setStackingId(String stackingId)
{
this.stackingId = stackingId;
}
public String getStackingId()
public String getStackingId()
{
return stackingId;
}
public void setSpare1(String spare1)
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
public String getSpare5()
{
return spare5;
}
public void setSpare6(String spare6)
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getSpare6()
public String getSpare6()
{
return spare6;
}
public void setProductId(String productId)
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
public String getProductId()
{
return productId;
}
public void setProductName(String productName)
public void setProductName(String productName)
{
this.productName = productName;
}
public String getProductName()
public String getProductName()
{
return productName;
}
public void setVoltage(String voltage)
public void setVoltage(String voltage)
{
this.voltage = voltage;
}
public String getVoltage()
public String getVoltage()
{
return voltage;
}
public void setPower(String power)
public void setPower(String power)
{
this.power = power;
}
public String getPower()
public String getPower()
{
return power;
}
public void setPhase(String phase)
public void setPhase(String phase)
{
this.phase = phase;
}
public String getPhase()
public String getPhase()
{
return phase;
}
public void setNetWeight(BigDecimal netWeight)
public void setNetWeight(String netWeight)
{
this.netWeight = netWeight;
}
public BigDecimal getNetWeight()
public String getNetWeight()
{
return netWeight;
}
public void setGrossWeight(BigDecimal grossWeight)
public void setGrossWeight(String grossWeight)
{
this.grossWeight = grossWeight;
}
public BigDecimal getGrossWeight()
public String getGrossWeight()
{
return grossWeight;
}
public void setDistribution(String distribution)
public void setDistribution(String distribution)
{
this.distribution = distribution;
}
public String getDistribution()
public String getDistribution()
{
return distribution;
}
public void setModel(String model)
public void setModel(String model)
{
this.model = model;
}
public String getModel()
public String getModel()
{
return model;
}
public void setOrderId(String orderId)
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
public String getOrderId()
{
return orderId;
}
public void setSpare7(String spare7)
public void setSpare7(String spare7)
{
this.spare7 = spare7;
}
public String getSpare7()
public String getSpare7()
{
return spare7;
}
public void setSpare8(String spare8)
public void setSpare8(String spare8)
{
this.spare8 = spare8;
}
public String getSpare8()
public String getSpare8()
{
return spare8;
}
public void setCargoSpaceName(String cargoSpaceName)
public void setCargoSpaceName(String cargoSpaceName)
{
this.cargoSpaceName = cargoSpaceName;
}
public String getCargoSpaceName()
public String getCargoSpaceName()
{
return cargoSpaceName;
}

207
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
View File

@@ -1,16 +1,12 @@
package com.ruoyi.stock.stock.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.domain.ExtraField;
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 org.springframework.ai.tool.annotation.ToolParam;
import java.util.List;
@@ -24,164 +20,201 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class BasStock extends BaseEntity
{
public class BasStock extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 库存id */
@Excel(name = "${stock.BasStock.stockId}")
/**
* 库存id
*/
@Excel(name = "库存id",sort=1)
private String stockId;
/** 货位id */
@Excel(name = "${stock.BasStock.cargoSpaceId}")
/**
* 货位id
*/
@Excel(name = "库位编码",sort=4)
private String cargoSpaceId;
/** 货位名称 */
@Excel(name = "${stock.BasStock.cargoSpaceName}")
/**
* 货位名称
*/
private String cargoSpaceName;
/** 库存状态 */
@Excel(name = "${stock.BasStock.stockStatus}", dictType = "stock_status")
/**
* 库存状态
*/
@Excel(name = "库存状态",sort=2,dictType = "stock_status")
private String stockStatus;
//货位库存状态
@Excel(name = "${stock.BasStock.cargoSpaceStockStatus}", dictType = "cargo_space_status")
private String cargoSpaceStockStatus;
//货位是否锁定
@Excel(name = "${stock.BasStock.cargoSpaceStatus}", dictType = "cargo_space_lock_status")
private String cargoSpaceStatus;
/** 物料状态 */
@Excel(name = "${stock.BasStock.productStatus}", dictType = "product_status")
/**
* 物料状态
*/
private String productStatus;
//额外字段
@Excels({
@Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 物料编码
@Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 物料描述
@Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
@Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
@Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
@Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
@Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
@Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
})
private ExtraField extraField;
/** 物料编码 */
// @Excel(name = "${stock.BasStock.productId}")
/**
* 物料编码
*/
@Excel(name = "物料编码",sort=6)
private String productId;
//物料描述
// @Excel(name = "${stock.BasStock.materialDesc}")
private String materialDesc;
//物料英文描述
// @Excel(name = "${stock.BasStock.englishDesc}")
@Excel(name = "产品状态",sort=13,dictType = "product_type")
private String spare1;
//净重
// @Excel(name = "${stock.BasStock.netWeight}")
private String spare2;
//长度
// @Excel(name = "${stock.BasStock.length}")
@Excel(name = "台次",sort=17)
private String spare5;
//宽度
// @Excel(name = "${stock.BasStock.width}")
@Excel(name = "金额",sort=12)
private String spare6;
//高度
// @Excel(name = "${stock.BasStock.height}")
@Excel(name = "盘点标识",sort=29,dictType = "check_flag")
private String spare7;
//体积
// @Excel(name = "${stock.BasStock.volume}")
@Excel(name = "质量",sort=19,dictType = "quality_type")
private String spare8;
private String voltage;
@Excel(name = "件次",sort=18)
private String power;
private String phase;
private String netWeight;
private String grossWeight;
private String distribution;
private String model;
@Excel(name = "合同号",sort=16)
private String orderId;
/** 库存数量 */
@Excel(name = "${stock.BasStock.quantity}")
/**
* 库存数量
*/
@Excel(name = "库存数量",sort=10)
private String quantity;
/** 作业ID */
@Excel(name = "${stock.BasStock.jobId}")
/**
* 作业ID
*/
private String jobId;
/** 托盘条码 */
@Excel(name = "${stock.BasStock.trayCode}")
/**
* 托盘条码
*/
@Excel(name = "托盘",sort=5)
private String trayCode;
/** 入库主单 */
@Excel(name = "${stock.BasStock.stockinId}")
/**
* 入库主单
*/
@Excel(name = "入库单号",sort=21)
private String stockinId;
/** 入库子单id */
@Excel(name = "${stock.BasStock.stockinDetailId}")
/**
* 入库子单id
*/
private String stockinDetailId;
/** 入库类型 */
@Excel(name = "${stock.BasStock.inType}")
/**
* 入库类型
*/
private String inType;
/** 仓库名称 */
@Excel(name = "${stock.BasStock.warehouseName}")
/**
* 仓库名称
*/
@Excel(name = "仓库",sort=26)
private String warehouseName;
/** 入库时间 */
@Excel(name = "${stock.BasStock.inDate}")
/**
* 入库时间
*/
@Excel(name = "首次入库时间",sort=27)
private String inDate;
private String inDateStart;
private String inDateEnd;
/** 批次号 */
// @Excel(name = "${stock.BasStock.lotNo}")
/**
* 批次号
*/
private String lotNo;
/** 回流时间 */
// @Excel(name = "${stock.BasStock.backDate}")
@Excel(name = "盘点时间",sort=30)
private String backDate;
/** 物料GUID */
// @Excel(name = "${stock.BasStock.productGuid}")
/**
* 物料GUID
*/
private String productGuid;
/** 出库数量 */
// @Excel(name = "${stock.BasStock.outQuantity}")
/**
* 出库数量
*/
private String outQuantity;
/** 入库班组ID */
// @Excel(name = "${stock.BasStock.inClassId}")
/**
* 入库班组ID
*/
private String inClassId;
/** 仓库 */
// @Excel(name = "${stock.BasStock.warehouseId}")
/**
* 仓库
*/
@Excel(name = "仓库编码",sort=24)
private String warehouseId;
private String roadwayId;
private String theFloor;
private String thePlatoon;
private String theColumn;
/** 垛型ID */
// @Excel(name = "${stock.BasStock.stackingId}")
/**
* 垛型ID
*/
@Excel(name = "最后出库时间",sort=28)
private String stackingId;
/** 备用字段3 */
// @Excel(name = "${stock.BasStock.spare3}")
/**
* 备用字段3
*/
@Excel(name = "套账",sort=3,dictType = "account_type" )
private String spare3;
/** 备用字段4 */
// @Excel(name = "${stock.BasStock.spare4}")
private String spare4;
//物料名称
// @Excel(name = "物料名称")
@Excel(name = "产品名称",sort=7)
private String productName;
private List<String> typeData;
//供应商ID
@Excel(name = "供应商",sort=22)
private String supplierId;
//供应商名称
@Excel(name = "供应商名称",sort=23)
private String supplierName;
//产品状态
private String productType;
//库外
private String outside;
//规格
@Excel(name = "规格",sort=8)
private String spec;
//常用编码
@Excel(name = "常用编码",sort=20)
private String parentId;
//单价
@Excel(name = "单价",sort=11)
private String price;
//单位
@Excel(name = "单位",sort=14)
private String unit;
//图号
@Excel(name = "图号",sort=15)
private String cargoNo;
@Excel(name = "备注",sort=31)
private String remark;
}

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

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inType" column="in_type" />
<result property="inClassId" column="in_class_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
@@ -29,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="voltage" column="voltage" />
<result property="power" column="power" />
<result property="phase" column="phase" />
@@ -43,31 +46,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<association property="extraField" javaType="ExtraField">
<result property="spec" column="spec" />
<result property="price" column="price" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<result property="parentId" column="parent_id" />
<result property="supplierName" column="supplier_name" />
<result property="supplierId" column="supplier_no" />
<result property="remark" column="remark" />
<!--<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</association>-->
</resultMap>
<sql id="selectBasStockVo">
select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
bs.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus
select bs.spare3, --账套
bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bs.product_name,--产品名称
bp.spec, -- 规格
bs.quantity, -- 数量
bs.spare6, -- 金额
bp.price, --单价
bp.spare1, --产品状态
bp.unit, -- 单位
bp.cargo_no, --图号
bs.order_id, --合同号
bs.spare5, --台次
bs.power, --件次
bs.spare8, --质量
bp.parent_id, --常用编码
bs.stockin_id, --入库单号
bs2.supplier_name, --供应商名称
bs2.supplier_no, --供应商编号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.stacking_id, --出库时间
bs.spare7, --盘点标识
bs.back_date, --盘点时间
bp.remark, --备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no --批次号
from bas_stock bs
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
left join bas_supplier bs2 on bs.phase = bs2.supplier_no
</sql>
<select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
@@ -109,6 +136,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
<if test="productId != null and productId != ''"> and bs.product_id = #{productId}</if>
<if test="cargoSpaceStockStatus != null and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="theFloor != null and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>
<if test="thePlatoon != null and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>
<if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
<if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
<if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
<if test="supplierId != null and supplierId != ''"> and bs2.supplier_no = #{supplierId}</if>
<if test="supplierName != null and supplierName != ''"> and bs2.supplier_name = #{supplierName}</if>
<if test="price != null and price != ''"> and bp.price = #{price}</if>
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>
<if test="productType != null and productType != ''"> and bp.spare1 = #{productType}</if>
</where>
</select>