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 13:22:19 +08:00
parent 2e760e7a3e
commit 89c47306ce
8 changed files with 433 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -40,7 +40,7 @@ public class ToWcsServiceImpl implements IToWcsService {
@Override @Override
@Scheduled(fixedDelay=1500) //@Scheduled(fixedDelay=1500)
public void pushOutMydoJob() { public void pushOutMydoJob() {
//查询所有未推送的料箱出库作业 //查询所有未推送的料箱出库作业
MydoJob mydoJobParam = new MydoJob(); MydoJob mydoJobParam = new MydoJob();

344
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
View File

@@ -1,11 +1,16 @@
package com.ruoyi.search.ViewStockDetail.domain; package com.ruoyi.search.ViewStockDetail.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 库存明细查询对象 view_stock_detail * 库存明细查询对象 view_stock_detail
@@ -21,271 +26,116 @@ public class ViewStockDetail extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 序号 */ @Excel(name = "库存编码")
// @Excel(name = "序号") private String stockId; // 库存编码
private Long onlyIdentity;
/** 库存ID */ @Excel(name = "账套",dictType = "account_type")
@Excel(name = "库存ID") private String spare3; // 账套
private String stockId;
@Excel(name = "订单号") @Excel(name = "库位编码")
private String orderId; private String cargoSpaceId; // 库位编码
/** 物料编码 */ @Excel(name = "托盘")
@Excel(name = "物料编码") private String trayCode; // 托盘
private String productId;
/** 物料名称 */ @Excel(name = "产品编码")
@Excel(name = "物料名称") private String productId; // 产品编码
private String productName;
/** 货位ID */ @Excel(name = "产品名称")
// @Excel(name = "货位ID") private String productName; // 产品名称
private String cargoSpaceId;
/** 货位名称 */
@Excel(name = "货位名称")
private String cargoSpaceName;
/** 托盘条码 */
@Excel(name = "托盘条码")
private String trayCode;
/** 数量 */
// @Excel(name = "数量")
private String quantity;
/** 作业ID */
@Excel(name = "作业ID")
private String jobId;
/** 批号 */
// @Excel(name = "批号")
private String lotNo;
/** 入库子单ID */
@Excel(name = "入库子单ID")
private String stockinDetailId;
/** 入库时间 */
@Excel(name = "入库时间")
private String inDate;
/** 仓库ID */
// @Excel(name = "仓库ID")
private String warehouseId;
/** 仓库名称 */
// @Excel(name = "仓库名称")
private String warehouseName;
/** 垛型ID */
// @Excel(name = "垛型ID")
private String stackingId;
/** 巷道ID */
@Excel(name = "巷道ID")
private String roadwayId;
/** 货位状态 1空2满 3入库分配 4出库分配 5入库盘点 6出库盘点 */
@Excel(name = "货位状态", dictType = "cargo_space_status")
private String cargoSpaceStatus;
/** 库存状态 1正常 2冻结 */
@Excel(name = "库存状态", dictType = "stock_status")
private String stockStatus;
/** 物料状态 1正常 2盘点待审批 3异常 */
@Excel(name = "物料状态", dictType = "product_status")
private String productStatus;
/** 是否锁定 Y锁、N开 */
// @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
private String locked;
/** 物料GUID */
@Excel(name = "物料GUID")
private String productGuid;
/** 规格 */
@Excel(name = "规格") @Excel(name = "规格")
private String spec; private String spec; // 规格
@Excel(name = "数量")
private BigDecimal quantity; // 数量
@Excel(name = "金额")
private String spare6; // 金额
@Excel(name = "单价")
private BigDecimal price; // 单价
@Excel(name = "产品状态",dictType = "turnover_type")
private String spare1; // 产品状态
/** 单位 */
@Excel(name = "单位") @Excel(name = "单位")
private String unit; private String unit; // 单位
/** 价格 */ @Excel(name = "图号")
@Excel(name = "价格") private String cargoNo; // 图号
private String price;
/** 产品分类 */ @Excel(name = "合同号")
@Excel(name = "产品分类") private String orderId; // 合同号
private String parentId;
/** 品号描述 */ @Excel(name = "台次")
@Excel(name = "品号描述") private String spare5; // 台次
private String cargoNo;
/** 英文名称 */ @Excel(name = "件次")
@Excel(name = "英文名称") private String power; // 件次
private String spare1;
/** 单件净重 */ @Excel(name = "质量",dictType = "quality_type")
@Excel(name = "单件净重") private String spare8; // 质量
private String spare2;
/** 颜色 */ @Excel(name = "常用编码")
@Excel(name = "颜色") private String parentId; // 常用编码
private String spare3;
/** 序列号 */ @Excel(name = "入库单号")
@Excel(name = "序列号") private String stockinId; // 入库单号
@Excel(name = "供应商名称")
private String supplierName; // 供应商名称
@Excel(name = "供应商编号")
private String supplierNo; // 供应商编号
@Excel(name = "仓库编码")
private String warehouseId; // 仓库编码
@Excel(name = "仓库名称")
private String warehouseName; // 仓库名称
@Excel(name = "首次入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inDate; // 入库时间
@Excel(name = "最后出库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date backDate; // 出库时间
@Excel(name = "盘点标识",dictType = "check_flag")
private String spare7; // 盘点标识
@Excel(name = "出库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date stackingId; // 盘点时间
@Excel(name = "备注")
private String remark; // 备注
@Excel(name = "库存状态")
private String stockStatus; // 库存状态
@Excel(name = "批次号")
private String lotNo; // 批次号
private BigDecimal outQuantity; // 出库数量
private String roadwayId;
private String theFloor;
private String thePlatoon;
private String theColumn;
private String supplierId;
private String inDateStart;
private String inDateEnd;
private String voltage;
private String productType;
private String outside;
private String spare4; private String spare4;
/** 电压 */
@Excel(name = "电压")
private String spare5;
/** 功率 */
@Excel(name = "功率")
private String spare6;
/** 相位 */
@Excel(name = "相位")
private String spare7;
/** 毛重 */
@Excel(name = "毛重")
private String spare8;
/** NC号 */
@Excel(name = "NC号")
private String spare9;
/** 电源线 */
@Excel(name = "电源线")
private String spare10;
/** 插头 */
@Excel(name = "插头")
private String spare11;
/** 接嘴 */
@Excel(name = "接嘴")
private String spare12;
/** 快捷码 */
@Excel(name = "快捷码")
private String spare13;
/** 库存单位编号 */
@Excel(name = "库存单位编号")
private String spare14;
/** 库存单位名称 */
@Excel(name = "库存单位名称")
private String spare15;
/** 品号群组 */
@Excel(name = "品号群组")
private String spare16;
/** 归类品 */
@Excel(name = "归类品")
private String spare17;
/** 计量体系 */
@Excel(name = "计量体系")
private String spare18;
/** 群组名称 */
@Excel(name = "群组名称")
private String spare19;
/** 批号管理 */
@Excel(name = "批号管理")
private String spare20;
/** 状态 */
@Excel(name = "状态")
private String spare21;
/** 产品大类 */
@Excel(name = "产品大类")
private String spare22;
/** 产品二类 */
@Excel(name = "产品二类")
private String spare23;
/** 产品线/产品系列 */
@Excel(name = "产品线/产品系列")
private String spare24;
/** BOM状态 */
@Excel(name = "BOM状态")
private String spare25;
/** 产品定位 */
@Excel(name = "产品定位")
private String spare26;
/** 电脑板型号 */
@Excel(name = "电脑板型号")
private String spare27;
/** 非标要求 */
@Excel(name = "非标要求")
private String spare28;
/** 品牌 */
@Excel(name = "品牌")
private String spare29;
/** 非标颜色 */
@Excel(name = "非标颜色")
private String spare30;
/** 主颜色 */
@Excel(name = "主颜色")
private String spare31;
/** 辅助颜色 */
@Excel(name = "辅助颜色")
private String spare32;
/** 是否标准款 */
@Excel(name = "是否标准款")
private String spare33;
/** 包装方式 */
@Excel(name = "包装方式")
private String spare34;
/** 主要包装方式 */
@Excel(name = "主要包装方式")
private String spare35;
/** 长 */
@Excel(name = "长")
private String spare36;
/** 宽 */
@Excel(name = "宽")
private String spare37;
/** 高 */
@Excel(name = "高")
private String spare38;
/** 包装材积 */
@Excel(name = "包装材积")
private String spare39;
/** 备注 */
@Excel(name = "描述")
private String remark;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
View File

@@ -40,7 +40,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
* @return 库存明细查询 * @return 库存明细查询
*/ */
@Override @Override
@DataScope(warehouseAlias = "vsd") //@DataScope(warehouseAlias = "vsd")
public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail) public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail)
{ {
return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail); return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail);

2
ruoyi-admin/src/main/resources/application.yml
View File

@@ -34,7 +34,7 @@ server:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: info com.ruoyi: debug
org.springframework: warn org.springframework: warn
# 用户配置 # 用户配置

205
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -5,114 +5,117 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper"> <mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
<resultMap type="ViewStockDetail" id="ViewStockDetailResult"> <resultMap type="ViewStockDetail" id="ViewStockDetailResult">
<result property="onlyIdentity" column="only_identity" /> <result property="spare3" column="spare3" />
<result property="stockId" column="stock_id" /> <result property="cargoSpaceId" column="cargo_space_id" />
<result property="cargoSpaceId" column="cargo_space_id" /> <result property="trayCode" column="tray_code" />
<result property="trayCode" column="tray_code" /> <result property="productId" column="product_id" />
<result property="quantity" column="quantity" /> <result property="productName" column="product_name" />
<result property="jobId" column="job_id" /> <result property="spec" column="spec" />
<result property="lotNo" column="lot_no" /> <result property="quantity" column="quantity" />
<result property="stockinDetailId" column="stockin_detail_id" /> <result property="spare6" column="spare6" />
<result property="inDate" column="in_date" /> <result property="price" column="price" />
<result property="warehouseId" column="warehouse_id" /> <result property="spare1" column="spare1" />
<result property="stackingId" column="stacking_id" /> <result property="unit" column="unit" />
<result property="cargoSpaceName" column="cargo_space_name" /> <result property="cargoNo" column="cargo_no" />
<result property="roadwayId" column="roadway_id" /> <result property="orderId" column="order_id" />
<result property="cargoSpaceStatus" column="cargo_space_status" /> <result property="spare5" column="spare5" />
<result property="locked" column="locked" /> <result property="power" column="power" />
<result property="productId" column="product_id" /> <result property="spare8" column="spare8" />
<result property="productName" column="product_name" /> <result property="parentId" column="parent_id" />
<result property="spec" column="spec" /> <result property="stockinId" column="stockin_id" />
<result property="unit" column="unit" /> <result property="supplierName" column="supplier_name" />
<result property="price" column="price" /> <result property="supplierNo" column="supplier_no" />
<result property="spare1" column="spare1" /> <result property="warehouseId" column="warehouse_id" />
<result property="spare2" column="spare2" /> <result property="warehouseName" column="warehouse_name" />
<result property="spare5" column="spare5" /> <result property="inDate" column="in_date" />
<result property="spare6" column="spare6" /> <result property="stackingId" column="stacking_id" />
<result property="spare7" column="spare7" /> <result property="spare7" column="spare7" />
<result property="spare8" column="spare8" /> <result property="backDate" column="back_date" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="warehouseName" column="warehouse_name" /> <result property="stockId" column="stock_id" />
<result property="stockStatus" column="stock_status" /> <result property="stockStatus" column="stock_status" />
<result property="productStatus" column="product_status" /> <result property="lotNo" column="lot_no" />
<result property="orderId" column="order_id" /> <result property="outQuantity" column="out_quantity" />
</resultMap> </resultMap>
<sql id="selectViewStockDetailVo"> <sql id="selectViewStockDetailVo">
SELECT select bs.spare3, --账套
ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity, bs.cargo_space_id, --库位编码
s.stock_id, bs.tray_code, --托盘
s.cargo_space_id, bs.product_id, --产品编码
s.tray_code, bs.product_name,--产品名称
s.quantity, bp.spec, -- 规格
s.job_id, bs.quantity, -- 数量
s.lot_no, bs.spare6, -- 金额
s.stockin_detail_id, bp.price, --单价
s.in_date, bp.spare1, --产品状态
s.warehouse_id, bp.unit, -- 单位
s.stacking_id, bp.cargo_no, --图号
s.order_id, bs.order_id, --合同号
cs.cargo_space_name, bs.spare5, --台次
cs.roadway_id, bs.power, --件次
cs.status AS cargo_space_status, bs.spare8, --质量
s.stock_status AS stock_status, bp.parent_id, --常用编码
s.product_status AS product_status, bs.stockin_id, --入库单号
cs.locked, bs2.supplier_name, --供应商名称
p.product_guid, bs2.supplier_no, --供应商编号
p.product_id, bw.warehouse_id, --仓库编码
p.product_name, bw.warehouse_name, --仓库名称
p.spec, bs.in_date, --入库时间
p.unit, bs.stacking_id, --出库时间
p.price, bs.spare7, --盘点标识
p.spare1, bs.back_date, --盘点时间
p.spare2, bp.remark, --备注
p.spare5, bs.stock_id, --库存编码
p.spare6, bs.stock_status, --库存状态
p.spare7, bs.lot_no, --批次号
p.spare8, bs.out_quantity
p.remark, from bas_stock bs
bw.warehouse_name left join bas_product bp on bs.product_id = bp.product_id
FROM left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
bas_stock s left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id left join bas_supplier bs2 on bs.phase = bs2.supplier_no
LEFT JOIN bas_product p ON p.product_guid = s.product_guid
LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id
WHERE
cs.status = '2'
</sql> </sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult"> <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
<include refid="selectViewStockDetailVo"/> <include refid="selectViewStockDetailVo"/>
<if test="stockId != null and stockId != ''"> and s.stock_id like concat('%',#{stockId}, '%')</if> <where>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and s.cargo_space_id = #{cargoSpaceId}</if> <if test="stockId != null and stockId != ''"> and bs.stock_id = #{stockId}</if>
<if test="trayCode != null and trayCode != ''"> and s.tray_code like concat('%',#{trayCode}, '%')</if> <if test="cargoSpaceId != null and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
<if test="quantity != null and quantity != ''"> and s.quantity = #{quantity}</if> <if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
<if test="jobId != null and jobId != ''"> and s.job_id = #{jobId}</if> <if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
<if test="lotNo != null and lotNo != ''"> and s.lot_no = #{lotNo}</if> <if test="inDate != null and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and s.stockin_detail_id = #{stockinDetailId}</if> <if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
<if test="inDate != null and inDate != ''"> and s.in_date = #{inDate}</if> <if test="productName != null and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if> <if test="quantity != null and quantity != ''"> and bs.quantity = #{quantity}</if>
<if test="warehouseName != null and warehouseName != ''"> and bw.warehouse_name like concat('%', #{warehouseName}, '%')</if> <if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
<if test="stackingId != null and stackingId != ''"> and s.stacking_id = #{stackingId}</if> <if test="outQuantity != null and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cs.cargo_space_name = #{cargoSpaceName}</if> <if test="stockinId != null and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
<if test="roadwayId != null and roadwayId != ''"> and cs.roadway_id = #{roadwayId}</if> <if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> and cs.status = #{cargoSpaceStatus}</if> <if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="stockStatus != null and stockStatus != ''"> and s.stock_status = #{stockStatus}</if> <if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="productStatus != null and productStatus != ''"> and s.product_status = #{productStatus}</if> <if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="locked != null and locked != ''"> and cs.locked = #{locked}</if> <if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="productId != null and productId != ''"> and p.product_id like concat('%',#{productId}, '%')</if> <if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="productName != null and productName != ''"> and p.product_name like concat('%', #{productName}, '%')</if> <if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
<if test="spec != null and spec != ''"> and p.spec = #{spec}</if> <if test="voltage != null and voltage != ''"> and bs.voltage = #{voltage}</if>
<if test="unit != null and unit != ''"> and p.unit = #{unit}</if> <if test="power != null and power != ''"> and bs.power = #{power}</if>
<if test="price != null and price != ''"> and p.price = #{price}</if> <if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
<if test="spare1 != null and spare1 != ''"> and p.spare1 = #{spare1}</if> <if test="productId != null and productId != ''"> and bs.product_id = #{productId}</if>
<if test="spare2 != null and spare2 != ''"> and p.spare2 = #{spare2}</if> <if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="spare5 != null and spare5 != ''"> and p.spare5 = #{spare5}</if> <if test="theFloor != null and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>
<if test="spare6 != null and spare6 != ''"> and p.spare6 = #{spare6}</if> <if test="thePlatoon != null and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>
<if test="spare7 != null and spare7 != ''"> and p.spare7 = #{spare7}</if> <if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
<if test="spare8 != null and spare8 != ''"> and p.spare8 = #{spare8}</if> <if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
<if test="remark != null and remark != ''"> and p.remark = #{remark}</if> <if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
<if test="orderId != null and orderId != ''"> and s.order_id like concat('%',#{orderId}, '%')</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> </select>
<select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult"> <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">

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

@@ -101,42 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult"> <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
<include refid="selectBasStockVo"/> <include refid="selectBasStockVo"/>
<where> <where>
<if test="stockId != null and stockId != ''"> and bs.stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and bs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and bs.product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and bs.product_guid = #{productGuid}</if>
<if test="productName != null and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null and quantity != ''"> and bs.quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and bs.job_id = #{jobId}</if>
<if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
<if test="outQuantity != null and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
<if test="stockinId != null and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and bs.in_type = #{inType}</if>
<if test="inClassId != null and inClassId != ''"> and bs.in_class_id = #{inClassId}</if>
<if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and bs.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
<if test="voltage != null and voltage != ''"> and bs.voltage = #{voltage}</if>
<if test="power != null and power != ''"> and bs.power = #{power}</if>
<if test="phase != null and phase != ''"> and bs.phase = #{phase}</if>
<if test="netWeight != null and netWeight != ''"> and bs.net_weight = #{netWeight}</if>
<if test="grossWeight != null and grossWeight != ''"> and bs.gross_weight = #{grossWeight}</if>
<if test="distribution != null and distribution != ''"> and bs.distribution = #{distribution}</if>
<if test="model != null and model != ''"> and bs.model = #{model}</if>
<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="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="theFloor != null and theFloor != ''"> and bcs.the_floor = #{theFloor}</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="thePlatoon != null and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>

348
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -1,42 +1,54 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="仓库名称" prop="warehouseId"> <el-form-item label="仓库" prop="warehouseId"><!--仓库-->
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable> <el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option <el-option
v-for="dict in warehouseOptions" v-for="item in warehouseOptions"
:key="dict.warehouseId" :key="item.warehouseId"
:label="dict.warehouseName" :label="item.warehouseName"
:value="dict.warehouseId" :value="item.warehouseId"
/> />
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<el-form-item label="库存ID" prop="stockId"> <el-form-item label="巷道" prop="roadwayId">
<el-input <el-input
v-model="queryParams.stockId" v-model="queryParams.roadwayId"
placeholder="请输入库存ID" placeholder="请输入巷道"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderId"> <el-form-item label="层" prop="theFloor">
<el-input <el-input
v-model="queryParams.orderId" v-model="queryParams.theFloor"
placeholder="请输入订单号" placeholder="请输入层"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap"> <el-form-item label="排" prop="thePlatoon">
<el-input <el-input
v-model="queryParams.stockinDetailId" v-model="queryParams.thePlatoon"
placeholder="请输入入库单号" placeholder="请输入排"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId"> <el-form-item label="物料编码" prop="productId">
<el-input <el-input
v-model="queryParams.productId" v-model="queryParams.productId"
@@ -45,6 +57,38 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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="parentId">
<el-input
v-model="queryParams.parentId"
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="productName"> <el-form-item label="物料名称" prop="productName">
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
@@ -53,37 +97,134 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="托盘条码" prop="trayCode"> <el-form-item label="入库单号" prop="stockinId">
<el-input <el-input
v-model="queryParams.trayCode" v-model="queryParams.stockinId"
placeholder="请输入托盘条码" placeholder="请输入入库单号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="物料状态" prop="productStatus">--> <el-form-item label="单价" prop="price">
<!-- <el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>--> <el-input
<!-- <el-option--> v-model="queryParams.price"
<!-- v-for="dict in dict.type.product_status"--> placeholder="请输入单价"
<!-- :key="dict.value"--> clearable
<!-- :label="dict.label"--> @keyup.enter.native="handleQuery"
<!-- :value="dict.value"--> />
<!-- />--> </el-form-item>
<!-- </el-select>-->
<!-- </el-form-item>--> <el-form-item label="托盘号" prop="trayCode">
<!-- <el-form-item label="库存状态" prop="stockStatus">--> <el-input
<!-- <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>--> v-model="queryParams.trayCode"
<!-- <el-option--> placeholder="请输入托盘号"
<!-- v-for="dict in dict.type.stock_status"--> clearable
<!-- :key="dict.value"--> @keyup.enter.native="handleQuery"
<!-- :label="dict.label"--> />
<!-- :value="dict.value"--> </el-form-item>
<!-- />--> <el-form-item label="合同号" prop="orderId">
<!-- </el-select>--> <el-input
<!-- </el-form-item>--> v-model="queryParams.orderId"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用途" prop="spare4">
<el-select v-model="queryParams.spare4" 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="inDateStart">
<el-date-picker clearable
v-model="queryParams.inDateStart"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择起始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="截止日期" prop="inDateEnd">
<el-date-picker clearable
v-model="queryParams.inDateEnd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择截止时间">
</el-date-picker>
</el-form-item>
<el-form-item label="周转类型" prop="voltage">
<el-select v-model="queryParams.voltage" 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="来源" prop="spare1">
<el-select v-model="queryParams.spare1" 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="spare3">
<el-select v-model="queryParams.spare3" 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="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="spare5">
<el-input
v-model="queryParams.spare5"
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="outside">
<el-input
v-model="queryParams.outside"
placeholder="请输入库外"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">清空</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!-- 重置 -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -134,90 +275,55 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650"> <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" /> <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
<!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> --> <el-table-column label="库存状态" align="center" prop="stockStatus" >
<el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
<el-table-column label="订单号" align="left" prop="orderId" width="160"/>
<el-table-column label="物料编号" align="left" prop="productId" width="160"/>
<el-table-column label="物料名称" align="left" prop="productName" width="160"/>
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
<!-- <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>-->
<el-table-column label="托盘条码" align="left" prop="trayCode" width="160"/>
<!-- <el-table-column label="数量" align="right" prop="quantity" width="120"/>-->
<el-table-column label="作业ID" align="left" prop="jobId" width="160"/>
<el-table-column label="批号" align="left" prop="lotNo" width="120"/>
<el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="160"/>
<el-table-column label="入库时间" align="left" prop="inDate" width="160"/>
<!-- <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>-->
<!-- <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>-->
<!-- <el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>-->
<el-table-column label="巷道ID" align="left" prop="roadwayId" width="160"/>
<el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="160">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column>
<el-table-column label="库存状态" align="left" prop="stockStatus" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/> <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料状态" align="left" prop="productStatus" width="160"> <el-table-column label="套账" align="center" prop="spare3">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/> <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="是否锁定" align="left" prop="locked" width="160">--> <el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
<!-- <template slot-scope="scope">--> <el-table-column label="托盘" align="center" prop="trayCode"/>
<!-- <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>--> <el-table-column label="产品编码" align="center" prop="productId"/>
<!-- </template>--> <el-table-column label="产品名称" align="center" prop="productName" width="160" />
<!-- </el-table-column>--> <el-table-column label="规格" align="center" prop="spec" width="160"/>
<!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> --> <el-table-column label="数量" align="center" prop="quantity"/>
<el-table-column label="规格" align="left" prop="spec" width="160"/> <el-table-column label="单价" align="center" prop="price"/>
<!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> --> <el-table-column label="金额" align="center" prop="spare6"/>
<el-table-column label="价格" align="right" prop="price" width="160"/> <el-table-column label="产品状态" align="center" prop="spare1">
<el-table-column label="产品分类" align="left" prop="parentId" width="160"/> <template slot-scope="scope">
<el-table-column label="品号描述" align="left" prop="cargoNo" width="160"/> <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
<el-table-column label="英文名称" align="left" prop="spare1" width="160"/> </template>
<!-- <el-table-column label="单件净重" align="right" prop="spare2" width="120"/> --> </el-table-column>
<!-- <el-table-column label="颜色" align="left" prop="spare3" width="120"/> --> <el-table-column label="单位" align="center" prop="unit"/>
<!-- <el-table-column label="序列号" align="left" prop="spare4" width="120"/> --> <el-table-column label="图号" align="center" prop="cargoNo"/>
<!-- <el-table-column label="电压" align="left" prop="spare5" width="120"/> --> <el-table-column label="合同号" align="center" prop="orderId"/>
<!-- <el-table-column label="功率" align="left" prop="spare6" width="120"/> --> <el-table-column label="台次" align="center" prop="spare5"/>
<!-- <el-table-column label="相位" align="left" prop="spare7" width="120"/> --> <el-table-column label="件次" align="center" prop="power"/>
<!-- <el-table-column label="毛重" align="right" prop="spare8" width="120"/> --> <el-table-column label="质量" align="center" prop="spare8">
<el-table-column label="NC号" align="left" prop="spare9" width="160"/> <template slot-scope="scope">
<el-table-column label="电源线" align="left" prop="spare10" width="160"/> <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
<el-table-column label="插头" align="left" prop="spare11" width="160"/> </template>
<el-table-column label="接嘴" align="left" prop="spare12" width="160"/> </el-table-column>
<el-table-column label="快捷码" align="left" prop="spare13" width="160"/> <el-table-column label="常用编码" align="center" prop="parentId"/>
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/> <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/> <el-table-column label="供应商编码" align="center" prop="supplierNo" width="160"/>
<el-table-column label="品号群组" align="left" prop="spare16" width="160"/> <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
<el-table-column label="归类品" align="left" prop="spare17" width="160"/> <el-table-column label="仓库编码" align="center" prop="warehouseId"/>
<el-table-column label="计量体系" align="left" prop="spare18" width="160"/> <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="群组名称" align="left" prop="spare19" width="160"/> <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
<el-table-column label="批号管理" align="left" prop="spare20" width="160"/> <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
<el-table-column label="状态" align="left" prop="spare21" width="160"/> <el-table-column label="盘点标识" align="center" prop="spare7">
<el-table-column label="产品大类" align="left" prop="spare22" width="160"/> <template slot-scope="scope">
<el-table-column label="产品二类" align="left" prop="spare23" width="160"/> <dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160"/> </template>
<el-table-column label="BOM状态" align="left" prop="spare25" width="160"/> </el-table-column>
<el-table-column label="产品定位" align="left" prop="spare26" width="160"/> <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
<el-table-column label="电脑板型号" align="left" prop="spare27" width="160"/> <el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="非标要求" align="left" prop="spare28" width="160"/>
<el-table-column label="品牌" align="left" prop="spare29" width="160"/>
<el-table-column label="非标颜色" align="left" prop="spare30" width="160"/>
<el-table-column label="主颜色" align="left" prop="spare31" width="160"/>
<el-table-column label="辅助颜色" align="left" prop="spare32" width="160"/>
<el-table-column label="是否标准款" align="left" prop="spare33" width="160"/>
<el-table-column label="包装方式" align="left" prop="spare34" width="160"/>
<el-table-column label="主要包装方式" align="left" prop="spare35" width="160"/>
<el-table-column label="长" align="right" prop="spare36" width="160"/>
<el-table-column label="宽" align="right" prop="spare37" width="160"/>
<el-table-column label="高" align="right" prop="spare38" width="160"/>
<el-table-column label="包装材积" align="right" prop="spare39" width="160"/>
<el-table-column label="描述" align="left" prop="remark" width="160"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
@@ -321,7 +427,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default { export default {
name: "ViewStockDetail", name: "ViewStockDetail",
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'], dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type','check_flag'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

1
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -586,6 +586,7 @@ export default {
spare5: null, spare5: null,
spare6: null, spare6: null,
theFloor: null, theFloor: null,
cargoSpaceStockStatus:2
}, },
queryWarehouse: { queryWarehouse: {
pageNum:1, pageNum:1,