zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库存信息、库存平面图样式

Browse Source
This commit is contained in:
猫猫guowen
2026-01-28 14:11:46 +08:00
parent 0ffe411dba
commit f3c02e3eb2
10 changed files with 416 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java
View File

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 手动分配库存Controller
*
* @author ruoyi
* @date 2025-09-16
* @date 2026-01-28
*/
@RestController
@RequestMapping("/out/handAllotStock")

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

@@ -1,6 +1,5 @@
package com.ruoyi.out.handAllotStock.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -10,14 +9,14 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 手动分配库存对象 view_hand_allot_stock
*
* @author ruoyi
* @date 2025-09-16
* @date 2026-01-28
*/
public class ViewHandAllotStock extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 库存编码 */
@Excel(name = "库存编码")
/** 库存id */
@Excel(name = "库存id")
private String stockId;
/** 货位编码 */
@@ -28,32 +27,32 @@ public class ViewHandAllotStock extends BaseEntity
@Excel(name = "库存状态")
private String stockStatus;
/** 物品状态 */
@Excel(name = "物品状态")
/** 物料状态 */
@Excel(name = "物料状态")
private String productStatus;
/** 批次号 */
@Excel(name = "批次号")
/** 批号 */
@Excel(name = "批号")
private String lotNo;
/** 入库时间 */
@Excel(name = "入库时间")
private String inDate;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 回流时间 */
@Excel(name = "回流时间")
private String backDate;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 物料GUID */
@Excel(name = "物料GUID")
private String productGuid;
/** 数量 */
@Excel(name = "数量")
private BigDecimal quantity;
/** 库存数量 */
@Excel(name = "库存数量")
private String quantity;
/** 作业编码 */
@Excel(name = "作业编码")
/** 作业ID */
@Excel(name = "作业ID")
private String jobId;
/** 托盘条码 */
@@ -64,96 +63,96 @@ public class ViewHandAllotStock extends BaseEntity
@Excel(name = "出库数量")
private String outQuantity;
/** 入库子单号 */
@Excel(name = "入库子单号")
/** 入库子单id */
@Excel(name = "入库子单id")
private String stockinDetailId;
/** 入库单号 */
@Excel(name = "入库单号")
/** 入库主单 */
@Excel(name = "入库主单")
private String stockinId;
/** 入库类型 */
@Excel(name = "入库类型")
private String inType;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 入库班组ID */
@Excel(name = "入库班组ID")
private String inClassId;
/** 仓库编码 */
@Excel(name = "仓库编码")
/** 仓库 */
@Excel(name = "仓库")
private String warehouseId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 供应商名称 */
@Excel(name = "供应商名称")
private String stackingId;
/** 规格 */
@Excel(name = "规格")
/** 层级关系546 */
@Excel(name = "层级关系546")
private String spare1;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 上层物料546 */
@Excel(name = "上层物料546")
private String spare2;
/** 单位 */
@Excel(name = "单位")
/** 顶层物料546 */
@Excel(name = "顶层物料546")
private String spare3;
/** 型号 */
@Excel(name = "型号")
/** 项目号546 */
@Excel(name = "项目号546")
private String spare4;
/** 颜色 */
@Excel(name = "颜色")
/** 合同号546 */
@Excel(name = "合同号546")
private String spare5;
/** 序列号 */
@Excel(name = "序列号")
/** 销售订单号546 */
@Excel(name = "销售订单号546")
private String spare6;
/** 品号 */
@Excel(name = "品号")
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 品名 */
@Excel(name = "品名")
/** 物料名称 */
@Excel(name = "物料名称")
private String productName;
/** 电压 */
@Excel(name = "电压")
/** 供应商编码546 */
@Excel(name = "供应商编码546")
private String voltage;
/** 功率 */
@Excel(name = "功率")
/** 规格型号546 */
@Excel(name = "规格型号546")
private String power;
/** 相位 */
@Excel(name = "相位")
/** 计量单位546 */
@Excel(name = "计量单位546")
private String phase;
/** 净重 */
@Excel(name = "净重")
private BigDecimal netWeight;
/** 毛重 */
@Excel(name = "毛重")
private BigDecimal grossWeight;
/** 分销 */
@Excel(name = "分销")
private String distribution;
/** 机型 */
@Excel(name = "机型")
private String model;
/** 订单号 */
@Excel(name = "订单号")
private String orderId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String netWeight;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String grossWeight;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String distribution;
/** 是否满盘546,0否1是 */
@Excel(name = "是否满盘546,0否1是")
private String model;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String orderId;
/** 盘点记录 0-未盘点 1-已盘点 */
@Excel(name = "盘点记录 0-未盘点 1-已盘点")
private String spare7;
/** $column.columnComment */
@@ -164,358 +163,506 @@ public class ViewHandAllotStock extends BaseEntity
@Excel(name = "货位名称")
private String cargoSpaceName;
@Excel(name = "排")
private String thePlatoon;
@Excel(name = "列")
private String theColumn;
@Excel(name = "层")
private String theFloor;
/** 巷道 */
@Excel(name = "巷道")
private String roadwayId;
/** 排 */
@Excel(name = "排")
private Long thePlatoon;
/** 列 */
@Excel(name = "列")
private Long theColumn;
/** 层 */
@Excel(name = "层")
private Long theFloor;
/** 货位状态 */
@Excel(name = "货位状态")
private String status;
/** 货位锁 */
@Excel(name = "货位锁")
private String locked;
public String getStockId() {
return stockId;
}
public void setStockId(String stockId) {
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getCargoSpaceId() {
return cargoSpaceId;
public String getStockId()
{
return stockId;
}
public void setCargoSpaceId(String cargoSpaceId) {
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getStockStatus() {
return stockStatus;
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setStockStatus(String stockStatus) {
public void setStockStatus(String stockStatus)
{
this.stockStatus = stockStatus;
}
public String getProductStatus() {
return productStatus;
public String getStockStatus()
{
return stockStatus;
}
public void setProductStatus(String productStatus) {
public void setProductStatus(String productStatus)
{
this.productStatus = productStatus;
}
public String getLotNo() {
return lotNo;
public String getProductStatus()
{
return productStatus;
}
public void setLotNo(String lotNo) {
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getInDate() {
return inDate;
public String getLotNo()
{
return lotNo;
}
public void setInDate(String inDate) {
public void setInDate(String inDate)
{
this.inDate = inDate;
}
public String getBackDate() {
return backDate;
public String getInDate()
{
return inDate;
}
public void setBackDate(String backDate) {
public void setBackDate(String backDate)
{
this.backDate = backDate;
}
public String getProductGuid() {
return productGuid;
public String getBackDate()
{
return backDate;
}
public void setProductGuid(String productGuid) {
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
}
public BigDecimal getQuantity() {
return quantity;
public String getProductGuid()
{
return productGuid;
}
public void setQuantity(BigDecimal quantity) {
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public String getJobId() {
return jobId;
public String getQuantity()
{
return quantity;
}
public void setJobId(String jobId) {
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getTrayCode() {
return trayCode;
public String getJobId()
{
return jobId;
}
public void setTrayCode(String trayCode) {
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getOutQuantity() {
return outQuantity;
public String getTrayCode()
{
return trayCode;
}
public void setOutQuantity(String outQuantity) {
public void setOutQuantity(String outQuantity)
{
this.outQuantity = outQuantity;
}
public String getStockinDetailId() {
return stockinDetailId;
public String getOutQuantity()
{
return outQuantity;
}
public void setStockinDetailId(String stockinDetailId) {
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
}
public String getStockinId() {
return stockinId;
public String getStockinDetailId()
{
return stockinDetailId;
}
public void setStockinId(String stockinId) {
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
public String getInType() {
return inType;
public String getStockinId()
{
return stockinId;
}
public void setInType(String inType) {
public void setInType(String inType)
{
this.inType = inType;
}
public String getInClassId() {
return inClassId;
public String getInType()
{
return inType;
}
public void setInClassId(String inClassId) {
public void setInClassId(String inClassId)
{
this.inClassId = inClassId;
}
public String getWarehouseId() {
return warehouseId;
public String getInClassId()
{
return inClassId;
}
public void setWarehouseId(String warehouseId) {
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getStackingId() {
return stackingId;
public String getWarehouseId()
{
return warehouseId;
}
public void setStackingId(String stackingId) {
public void setStackingId(String stackingId)
{
this.stackingId = stackingId;
}
public String getSpare1() {
return spare1;
public String getStackingId()
{
return stackingId;
}
public void setSpare1(String spare1) {
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2) {
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare3() {
return spare3;
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3) {
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare4() {
return spare4;
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4) {
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare5() {
return spare5;
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5) {
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
public String getSpare5()
{
return spare5;
}
public void setSpare6(String spare6) {
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getProductId() {
return productId;
public String getSpare6()
{
return spare6;
}
public void setProductId(String productId) {
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductName() {
return productName;
public String getProductId()
{
return productId;
}
public void setProductName(String productName) {
public void setProductName(String productName)
{
this.productName = productName;
}
public String getVoltage() {
return voltage;
public String getProductName()
{
return productName;
}
public void setVoltage(String voltage) {
public void setVoltage(String voltage)
{
this.voltage = voltage;
}
public String getPower() {
return power;
public String getVoltage()
{
return voltage;
}
public void setPower(String power) {
public void setPower(String power)
{
this.power = power;
}
public String getPhase() {
return phase;
public String getPower()
{
return power;
}
public void setPhase(String phase) {
public void setPhase(String phase)
{
this.phase = phase;
}
public BigDecimal getNetWeight() {
return netWeight;
public String getPhase()
{
return phase;
}
public void setNetWeight(BigDecimal netWeight) {
public void setNetWeight(String netWeight)
{
this.netWeight = netWeight;
}
public BigDecimal getGrossWeight() {
return grossWeight;
public String getNetWeight()
{
return netWeight;
}
public void setGrossWeight(BigDecimal grossWeight) {
public void setGrossWeight(String grossWeight)
{
this.grossWeight = grossWeight;
}
public String getDistribution() {
return distribution;
public String getGrossWeight()
{
return grossWeight;
}
public void setDistribution(String distribution) {
public void setDistribution(String distribution)
{
this.distribution = distribution;
}
public String getModel() {
return model;
public String getDistribution()
{
return distribution;
}
public void setModel(String model) {
public void setModel(String model)
{
this.model = model;
}
public String getOrderId() {
return orderId;
public String getModel()
{
return model;
}
public void setOrderId(String orderId) {
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getSpare7() {
return spare7;
public String getOrderId()
{
return orderId;
}
public void setSpare7(String spare7) {
public void setSpare7(String spare7)
{
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
public String getSpare7()
{
return spare7;
}
public void setSpare8(String spare8) {
public void setSpare8(String spare8)
{
this.spare8 = spare8;
}
public String getCargoSpaceName() {
return cargoSpaceName;
public String getSpare8()
{
return spare8;
}
public void setCargoSpaceName(String cargoSpaceName) {
public void setCargoSpaceName(String cargoSpaceName)
{
this.cargoSpaceName = cargoSpaceName;
}
public String getThePlatoon() {
return thePlatoon;
public String getCargoSpaceName()
{
return cargoSpaceName;
}
public void setThePlatoon(String thePlatoon) {
this.thePlatoon = thePlatoon;
}
public String getTheColumn() {
return theColumn;
}
public void setTheColumn(String theColumn) {
this.theColumn = theColumn;
}
public String getTheFloor() {
return theFloor;
}
public void setTheFloor(String theFloor) {
this.theFloor = theFloor;
}
public String getRoadwayId() {
return roadwayId;
}
public void setRoadwayId(String roadwayId) {
public void setRoadwayId(String roadwayId)
{
this.roadwayId = roadwayId;
}
public String getStatus() {
return status;
public String getRoadwayId()
{
return roadwayId;
}
public void setStatus(String status) {
public void setThePlatoon(Long thePlatoon)
{
this.thePlatoon = thePlatoon;
}
public Long getThePlatoon()
{
return thePlatoon;
}
public void setTheColumn(Long theColumn)
{
this.theColumn = theColumn;
}
public Long getTheColumn()
{
return theColumn;
}
public void setTheFloor(Long theFloor)
{
this.theFloor = theFloor;
}
public Long getTheFloor()
{
return theFloor;
}
public void setStatus(String status)
{
this.status = status;
}
public String getLocked() {
public String getStatus()
{
return status;
}
public void setLocked(String locked)
{
this.locked = locked;
}
public String getLocked()
{
return locked;
}
public void setLocked(String locked) {
this.locked = locked;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockId", getStockId())
.append("cargoSpaceId", getCargoSpaceId())
.append("stockStatus", getStockStatus())
.append("productStatus", getProductStatus())
.append("lotNo", getLotNo())
.append("inDate", getInDate())
.append("backDate", getBackDate())
.append("productGuid", getProductGuid())
.append("quantity", getQuantity())
.append("jobId", getJobId())
.append("trayCode", getTrayCode())
.append("outQuantity", getOutQuantity())
.append("stockinDetailId", getStockinDetailId())
.append("stockinId", getStockinId())
.append("inType", getInType())
.append("inClassId", getInClassId())
.append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.append("productId", getProductId())
.append("productName", getProductName())
.append("voltage", getVoltage())
.append("power", getPower())
.append("phase", getPhase())
.append("netWeight", getNetWeight())
.append("grossWeight", getGrossWeight())
.append("distribution", getDistribution())
.append("model", getModel())
.append("orderId", getOrderId())
.append("spare7", getSpare7())
.append("spare8", getSpare8())
.append("cargoSpaceName", getCargoSpaceName())
.append("roadwayId", getRoadwayId())
.append("thePlatoon", getThePlatoon())
.append("theColumn", getTheColumn())
.append("theFloor", getTheFloor())
.append("status", getStatus())
.append("locked", getLocked())
.toString();
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/mapper/ViewHandAllotStockMapper.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
* 手动分配库存Mapper接口
*
* @author ruoyi
* @date 2025-09-16
* @date 2026-01-28
*/
public interface ViewHandAllotStockMapper
{

2
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/IViewHandAllotStockService.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
* 手动分配库存Service接口
*
* @author ruoyi
* @date 2025-09-16
* @date 2026-01-28
*/
public interface IViewHandAllotStockService
{

2
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
View File

@@ -11,7 +11,7 @@ import com.ruoyi.out.handAllotStock.service.IViewHandAllotStockService;
* 手动分配库存Service业务层处理
*
* @author ruoyi
* @date 2025-09-16
* @date 2026-01-28
*/
@Service
public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService

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

@@ -6,14 +6,14 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
url: jdbc:sqlserver://172.16.4.141:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
username: sa
password: Flrd0914.
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url: jdbc:mariadb://172.16.2.170:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mariadb://172.16.4.141:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Flrd0914.
# 初始连接数

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

@@ -71,7 +71,7 @@ spring:
# redis 配置
redis:
# 地址
host: 172.16.2.170
host: 172.16.4.141
# 端口，默认为6379
port: 6379
# 数据库索引

55
ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
View File

@@ -51,26 +51,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewHandAllotStockVo">
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid,
quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id,
warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name,
voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8,
cargo_space_name,roadway_id,the_platoon,the_column,the_floor,status,locked from view_hand_allot_stock
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, roadway_id, the_platoon, the_column, the_floor, status, locked from view_hand_allot_stock
</sql>
<select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
<include refid="selectViewHandAllotStockVo"/>
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="inDate != null and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="backDate != null and backDate != ''"> and back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
@@ -85,24 +80,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</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="voltage != null and voltage != ''"> and voltage = #{voltage}</if>
<if test="power != null and power != ''"> and power = #{power}</if>
<if test="phase != null and phase != ''"> and phase = #{phase}</if>
<if test="netWeight != null "> and net_weight = #{netWeight}</if>
<if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
<if test="netWeight != null and netWeight != ''"> and net_weight = #{netWeight}</if>
<if test="grossWeight != null and grossWeight != ''"> and gross_weight = #{grossWeight}</if>
<if test="distribution != null and distribution != ''"> and distribution = #{distribution}</if>
<if test="model != null and model != ''"> and model = #{model}</if>
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="thePlatoon != null and thePlatoon != ''"> and the_platoon=#{thePlatoon}</if>
<if test="theColumn != null and theColumn != ''"> and the_column=#{theColumn}</if>
<if test="theFloor != null and theFloor != ''"> and the_floor=#{theFloor}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id=#{roadwayId}</if>
<if test="locked != null and locked != ''"> and locked=#{locked}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and the_column = #{theColumn}</if>
<if test="theFloor != null "> and the_floor = #{theFloor}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="locked != null and locked != ''"> and locked = #{locked}</if>
</where>
</select>
@@ -151,6 +148,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="cargoSpaceName != null">cargo_space_name,</if>
<if test="roadwayId != null">roadway_id,</if>
<if test="thePlatoon != null">the_platoon,</if>
<if test="theColumn != null">the_column,</if>
<if test="theFloor != null">the_floor,</if>
<if test="status != null">status,</if>
<if test="locked != null">locked,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockId != null and stockId != ''">#{stockId},</if>
@@ -190,6 +193,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="cargoSpaceName != null">#{cargoSpaceName},</if>
<if test="roadwayId != null">#{roadwayId},</if>
<if test="thePlatoon != null">#{thePlatoon},</if>
<if test="theColumn != null">#{theColumn},</if>
<if test="theFloor != null">#{theFloor},</if>
<if test="status != null">#{status},</if>
<if test="locked != null">#{locked},</if>
</trim>
</insert>
@@ -232,6 +241,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
<if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
<if test="theColumn != null">the_column = #{theColumn},</if>
<if test="theFloor != null">the_floor = #{theFloor},</if>
<if test="status != null">status = #{status},</if>
<if test="locked != null">locked = #{locked},</if>
</trim>
where stock_id = #{stockId}
</update>

10
ruoyi-ui/src/views/kpi/spacePlan/index.vue
View File

@@ -15,7 +15,7 @@
<!-- </el-form-item>-->
<!-- 层数 -->
<el-form-item label="层数">
<el-select v-model="queryParams.theFloor" style="width: 150px" @change="handleFloorChange">
<el-select v-model="queryParams.theFloor" style="width: 200px" @change="handleFloorChange">
<el-option v-for="item in floorOptions" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
@@ -29,7 +29,7 @@
</div>
<div class="chart-container">
<div id="container" v-show="queryParams.warehouseId !== '04'" style="height: 80vh"></div>
<div id="container" v-show="queryParams.warehouseId !== '04'" style="height: 60vh"></div>
</div>
</div>
</template>
@@ -182,8 +182,8 @@ export default {
},
grid: {
width: '90%',
height: '70%',
top: '20%',
height: '75%',
top: '15%',
left: '5%'
},
xAxis: {
@@ -405,7 +405,7 @@ export default {
.search-box {
background-color: #fff;
padding: 20px;
padding: 20px 0 0 20px;
margin-bottom: 20px;
border-radius: 4px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);

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

@@ -196,7 +196,7 @@
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态" style="width: 100%">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"