修改库存管理 联查 查询条件 字典相关问题
This commit is contained in:
@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 库存冻结记录对象 bas_stock_freeze_record
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-28
|
||||
*/
|
||||
@@ -25,6 +25,7 @@ public class BasStockFreezeRecord extends BaseEntity
|
||||
/** 货位编码 */
|
||||
@Excel(name = "货位编码")
|
||||
private String cargoSpaceId;
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "托盘条码")
|
||||
@@ -61,6 +62,7 @@ public class BasStockFreezeRecord extends BaseEntity
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库")
|
||||
private String warehouseId;
|
||||
private String warehouseName;
|
||||
|
||||
/** 库存字表id */
|
||||
@Excel(name = "库存字表id")
|
||||
@@ -82,172 +84,188 @@ public class BasStockFreezeRecord extends BaseEntity
|
||||
@Excel(name = "物料guid")
|
||||
private String productGuid;
|
||||
|
||||
public void setWhGuid(String whGuid)
|
||||
public String getWarehouseName() {
|
||||
return warehouseName;
|
||||
}
|
||||
|
||||
public void setWarehouseName(String warehouseName) {
|
||||
this.warehouseName = warehouseName;
|
||||
}
|
||||
|
||||
public String getCargoSpaceName() {
|
||||
return cargoSpaceName;
|
||||
}
|
||||
|
||||
public void setCargoSpaceName(String cargoSpaceName) {
|
||||
this.cargoSpaceName = cargoSpaceName;
|
||||
}
|
||||
|
||||
public void setWhGuid(String whGuid)
|
||||
{
|
||||
this.whGuid = whGuid;
|
||||
}
|
||||
|
||||
public String getWhGuid()
|
||||
public String getWhGuid()
|
||||
{
|
||||
return whGuid;
|
||||
}
|
||||
|
||||
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 setTrayCode(String trayCode)
|
||||
public void setTrayCode(String trayCode)
|
||||
{
|
||||
this.trayCode = trayCode;
|
||||
}
|
||||
|
||||
public String getTrayCode()
|
||||
public String getTrayCode()
|
||||
{
|
||||
return trayCode;
|
||||
}
|
||||
|
||||
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 setPrintDate(String printDate)
|
||||
public void setPrintDate(String printDate)
|
||||
{
|
||||
this.printDate = printDate;
|
||||
}
|
||||
|
||||
public String getPrintDate()
|
||||
public String getPrintDate()
|
||||
{
|
||||
return printDate;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setOldStatus(String oldStatus)
|
||||
public void setOldStatus(String oldStatus)
|
||||
{
|
||||
this.oldStatus = oldStatus;
|
||||
}
|
||||
|
||||
public String getOldStatus()
|
||||
public String getOldStatus()
|
||||
{
|
||||
return oldStatus;
|
||||
}
|
||||
|
||||
public void setCurrStatus(String currStatus)
|
||||
public void setCurrStatus(String currStatus)
|
||||
{
|
||||
this.currStatus = currStatus;
|
||||
}
|
||||
|
||||
public String getCurrStatus()
|
||||
public String getCurrStatus()
|
||||
{
|
||||
return currStatus;
|
||||
}
|
||||
|
||||
public void setMethod(String method)
|
||||
public void setMethod(String method)
|
||||
{
|
||||
this.method = method;
|
||||
}
|
||||
|
||||
public String getMethod()
|
||||
public String getMethod()
|
||||
{
|
||||
return method;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setStockDetailId(String stockDetailId)
|
||||
public void setStockDetailId(String stockDetailId)
|
||||
{
|
||||
this.stockDetailId = stockDetailId;
|
||||
}
|
||||
|
||||
public String getStockDetailId()
|
||||
public String getStockDetailId()
|
||||
{
|
||||
return stockDetailId;
|
||||
}
|
||||
|
||||
public void setOperatingTarget(String operatingTarget)
|
||||
public void setOperatingTarget(String operatingTarget)
|
||||
{
|
||||
this.operatingTarget = operatingTarget;
|
||||
}
|
||||
|
||||
public String getOperatingTarget()
|
||||
public String getOperatingTarget()
|
||||
{
|
||||
return operatingTarget;
|
||||
}
|
||||
|
||||
public void setBarCodeOldQuantity(String barCodeOldQuantity)
|
||||
public void setBarCodeOldQuantity(String barCodeOldQuantity)
|
||||
{
|
||||
this.barCodeOldQuantity = barCodeOldQuantity;
|
||||
}
|
||||
|
||||
public String getBarCodeOldQuantity()
|
||||
public String getBarCodeOldQuantity()
|
||||
{
|
||||
return barCodeOldQuantity;
|
||||
}
|
||||
|
||||
public void setBarCodeQuantity(String barCodeQuantity)
|
||||
public void setBarCodeQuantity(String barCodeQuantity)
|
||||
{
|
||||
this.barCodeQuantity = barCodeQuantity;
|
||||
}
|
||||
|
||||
public String getBarCodeQuantity()
|
||||
public String getBarCodeQuantity()
|
||||
{
|
||||
return barCodeQuantity;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 库存操作记录对象 bas_stock_maintain_record
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-26
|
||||
*/
|
||||
@@ -25,6 +25,7 @@ public class BasStockMaintainRecord extends BaseEntity
|
||||
/** 货位编码 */
|
||||
@Excel(name = "货位编码")
|
||||
private String cargoSpaceId;
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "托盘条码")
|
||||
@@ -61,6 +62,7 @@ public class BasStockMaintainRecord extends BaseEntity
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库")
|
||||
private String warehouseId;
|
||||
private String warehouseName;
|
||||
|
||||
/** 库存字表id */
|
||||
@Excel(name = "库存字表id")
|
||||
@@ -82,172 +84,188 @@ public class BasStockMaintainRecord extends BaseEntity
|
||||
@Excel(name = "物料guid")
|
||||
private String productGuid;
|
||||
|
||||
public void setWhGuid(String whGuid)
|
||||
public String getWarehouseName() {
|
||||
return warehouseName;
|
||||
}
|
||||
|
||||
public void setWarehouseName(String warehouseName) {
|
||||
this.warehouseName = warehouseName;
|
||||
}
|
||||
|
||||
public String getCargoSpaceName() {
|
||||
return cargoSpaceName;
|
||||
}
|
||||
|
||||
public void setCargoSpaceName(String cargoSpaceName) {
|
||||
this.cargoSpaceName = cargoSpaceName;
|
||||
}
|
||||
|
||||
public void setWhGuid(String whGuid)
|
||||
{
|
||||
this.whGuid = whGuid;
|
||||
}
|
||||
|
||||
public String getWhGuid()
|
||||
public String getWhGuid()
|
||||
{
|
||||
return whGuid;
|
||||
}
|
||||
|
||||
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 setTrayCode(String trayCode)
|
||||
public void setTrayCode(String trayCode)
|
||||
{
|
||||
this.trayCode = trayCode;
|
||||
}
|
||||
|
||||
public String getTrayCode()
|
||||
public String getTrayCode()
|
||||
{
|
||||
return trayCode;
|
||||
}
|
||||
|
||||
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 setPrintDate(String printDate)
|
||||
public void setPrintDate(String printDate)
|
||||
{
|
||||
this.printDate = printDate;
|
||||
}
|
||||
|
||||
public String getPrintDate()
|
||||
public String getPrintDate()
|
||||
{
|
||||
return printDate;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setOldQuantity(String oldQuantity)
|
||||
public void setOldQuantity(String oldQuantity)
|
||||
{
|
||||
this.oldQuantity = oldQuantity;
|
||||
}
|
||||
|
||||
public String getOldQuantity()
|
||||
public String getOldQuantity()
|
||||
{
|
||||
return oldQuantity;
|
||||
}
|
||||
|
||||
public void setQuantity(String quantity)
|
||||
public void setQuantity(String quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getQuantity()
|
||||
public String getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setMethod(String method)
|
||||
public void setMethod(String method)
|
||||
{
|
||||
this.method = method;
|
||||
}
|
||||
|
||||
public String getMethod()
|
||||
public String getMethod()
|
||||
{
|
||||
return method;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setStockDetailId(String stockDetailId)
|
||||
public void setStockDetailId(String stockDetailId)
|
||||
{
|
||||
this.stockDetailId = stockDetailId;
|
||||
}
|
||||
|
||||
public String getStockDetailId()
|
||||
public String getStockDetailId()
|
||||
{
|
||||
return stockDetailId;
|
||||
}
|
||||
|
||||
public void setOperatingTarget(String operatingTarget)
|
||||
public void setOperatingTarget(String operatingTarget)
|
||||
{
|
||||
this.operatingTarget = operatingTarget;
|
||||
}
|
||||
|
||||
public String getOperatingTarget()
|
||||
public String getOperatingTarget()
|
||||
{
|
||||
return operatingTarget;
|
||||
}
|
||||
|
||||
public void setBarCodeOldQuantity(String barCodeOldQuantity)
|
||||
public void setBarCodeOldQuantity(String barCodeOldQuantity)
|
||||
{
|
||||
this.barCodeOldQuantity = barCodeOldQuantity;
|
||||
}
|
||||
|
||||
public String getBarCodeOldQuantity()
|
||||
public String getBarCodeOldQuantity()
|
||||
{
|
||||
return barCodeOldQuantity;
|
||||
}
|
||||
|
||||
public void setBarCodeQuantity(String barCodeQuantity)
|
||||
public void setBarCodeQuantity(String barCodeQuantity)
|
||||
{
|
||||
this.barCodeQuantity = barCodeQuantity;
|
||||
}
|
||||
|
||||
public String getBarCodeQuantity()
|
||||
public String getBarCodeQuantity()
|
||||
{
|
||||
return barCodeQuantity;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 库存信息Controller
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-24
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.stock.stock.domain;
|
||||
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
@@ -7,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 库存信息对象 bas_stock
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-24
|
||||
*/
|
||||
@@ -22,6 +23,7 @@ public class BasStock extends BaseEntity
|
||||
/** 货位id */
|
||||
@Excel(name = "货位id")
|
||||
private String cargoSpaceId;
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 库存状态 */
|
||||
@Excel(name = "库存状态")
|
||||
@@ -80,8 +82,10 @@ public class BasStock extends BaseEntity
|
||||
private String inClassId;
|
||||
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库")
|
||||
@Excel(name = "仓库Id")
|
||||
private String warehouseId;
|
||||
@Excel(name = "仓库")
|
||||
private String warehouseName;
|
||||
|
||||
/** 垛型ID */
|
||||
@Excel(name = "垛型ID")
|
||||
@@ -111,242 +115,286 @@ public class BasStock extends BaseEntity
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
public void setStockId(String stockId)
|
||||
private ExtraField extraField;
|
||||
private String productName;
|
||||
private String cargoSpaceStatus;
|
||||
|
||||
public String getCargoSpaceName() {
|
||||
return cargoSpaceName;
|
||||
}
|
||||
|
||||
public void setCargoSpaceName(String cargoSpaceName) {
|
||||
this.cargoSpaceName = cargoSpaceName;
|
||||
}
|
||||
|
||||
public String getCargoSpaceStatus() {
|
||||
return cargoSpaceStatus;
|
||||
}
|
||||
|
||||
public void setCargoSpaceStatus(String cargoSpaceStatus) {
|
||||
this.cargoSpaceStatus = cargoSpaceStatus;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getWarehouseName() {
|
||||
return warehouseName;
|
||||
}
|
||||
|
||||
public void setWarehouseName(String warehouseName) {
|
||||
this.warehouseName = warehouseName;
|
||||
}
|
||||
|
||||
public ExtraField getExtraField() {
|
||||
return extraField;
|
||||
}
|
||||
|
||||
public void setExtraField(ExtraField extraField) {
|
||||
this.extraField = extraField;
|
||||
}
|
||||
|
||||
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(String quantity)
|
||||
public void setQuantity(String quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getQuantity()
|
||||
public String 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;
|
||||
}
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
package com.ruoyi.stock.stock.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.stock.stock.domain.BasStock;
|
||||
|
||||
/**
|
||||
* 库存信息Service接口
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-24
|
||||
*/
|
||||
public interface IBasStockService
|
||||
public interface IBasStockService
|
||||
{
|
||||
/**
|
||||
* 查询库存信息
|
||||
*
|
||||
*
|
||||
* @param stockId 库存信息主键
|
||||
* @return 库存信息
|
||||
*/
|
||||
@@ -21,7 +23,7 @@ public interface IBasStockService
|
||||
|
||||
/**
|
||||
* 查询库存信息列表
|
||||
*
|
||||
*
|
||||
* @param basStock 库存信息
|
||||
* @return 库存信息集合
|
||||
*/
|
||||
@@ -29,7 +31,7 @@ public interface IBasStockService
|
||||
|
||||
/**
|
||||
* 新增库存信息
|
||||
*
|
||||
*
|
||||
* @param basStock 库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -37,7 +39,7 @@ public interface IBasStockService
|
||||
|
||||
/**
|
||||
* 修改库存信息
|
||||
*
|
||||
*
|
||||
* @param basStock 库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -45,7 +47,7 @@ public interface IBasStockService
|
||||
|
||||
/**
|
||||
* 批量删除库存信息
|
||||
*
|
||||
*
|
||||
* @param stockIds 需要删除的库存信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -53,7 +55,7 @@ public interface IBasStockService
|
||||
|
||||
/**
|
||||
* 删除库存信息信息
|
||||
*
|
||||
*
|
||||
* @param stockId 库存信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
|
||||
@@ -5,6 +5,12 @@ import java.util.List;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
|
||||
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
|
||||
import com.ruoyi.bas.cargoSpace.service.impl.BasCargoSpaceServiceImpl;
|
||||
import com.ruoyi.bas.warehouse.domain.BasWarehouse;
|
||||
import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
|
||||
import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService;
|
||||
@@ -32,6 +38,8 @@ public class BasStockServiceImpl implements IBasStockService
|
||||
private IBasStockMaintainRecordService basStockMaintainRecordService;
|
||||
@Autowired
|
||||
private IBasStockFreezeRecordService basStockFreezeRecordService;
|
||||
@Autowired
|
||||
private IBasCargoSpaceService basCargoSpaceService;
|
||||
|
||||
/**
|
||||
* 查询库存信息
|
||||
@@ -70,21 +78,25 @@ public class BasStockServiceImpl implements IBasStockService
|
||||
return basStockMapper.insertBasStock(basStock);
|
||||
}
|
||||
|
||||
private void insertMaintainRecord(BasStock oldStock,BasStock basStock, String operate) {
|
||||
BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord();
|
||||
basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID());
|
||||
basStockMaintainRecord.setStockId(basStock.getStockId());
|
||||
basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId());
|
||||
basStockMaintainRecord.setLotNo(basStock.getLotNo());
|
||||
basStockMaintainRecord.setTrayCode(basStock.getTrayCode());
|
||||
basStockMaintainRecord.setProductGuid(basStock.getProductGuid());
|
||||
basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
|
||||
basStockMaintainRecord.setCreateTime(new Date());
|
||||
basStockMaintainRecord.setOldQuantity(oldStock!=null?oldStock.getQuantity():"0");
|
||||
basStockMaintainRecord.setQuantity(basStock.getQuantity());
|
||||
basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId());
|
||||
basStockMaintainRecord.setMethod(operate);
|
||||
basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord);
|
||||
private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) {
|
||||
if (!oldStock.getQuantity().equals(basStock.getQuantity())){
|
||||
BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord();
|
||||
basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID());
|
||||
basStockMaintainRecord.setStockId(basStock.getStockId());
|
||||
basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId());
|
||||
basStockMaintainRecord.setLotNo(basStock.getLotNo());
|
||||
basStockMaintainRecord.setTrayCode(basStock.getTrayCode());
|
||||
basStockMaintainRecord.setProductGuid(basStock.getProductGuid());
|
||||
basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
|
||||
basStockMaintainRecord.setCreateTime(new Date());
|
||||
basStockMaintainRecord.setOldQuantity(oldStock != null ? oldStock.getQuantity() : "0");
|
||||
basStockMaintainRecord.setQuantity(basStock.getQuantity());
|
||||
basStockMaintainRecord.setProductId(basStock.getExtraField().getProductId());
|
||||
basStockMaintainRecord.setProductName(basStock.getExtraField().getMaterialDesc());
|
||||
basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId());
|
||||
basStockMaintainRecord.setMethod(operate);
|
||||
basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -98,25 +110,31 @@ public class BasStockServiceImpl implements IBasStockService
|
||||
{
|
||||
BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
|
||||
insertMaintainRecord(oldBasStock,basStock,"2");
|
||||
insertFreezeRecord(oldBasStock,basStock);
|
||||
BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId());
|
||||
insertFreezeRecord(oldBasCargoSpace,basStock);
|
||||
return basStockMapper.updateBasStock(basStock);
|
||||
}
|
||||
|
||||
private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) {
|
||||
if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){
|
||||
private void insertFreezeRecord(BasCargoSpace oldBasCargoSpace, BasStock basStock) {
|
||||
if (!oldBasCargoSpace.getLocked().equals(basStock.getCargoSpaceStatus())){
|
||||
BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord();
|
||||
basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID());
|
||||
basStockFreezeRecord.setStockId(basStock.getStockId());
|
||||
basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId());
|
||||
basStockFreezeRecord.setLotNo(basStock.getLotNo());
|
||||
basStockFreezeRecord.setTrayCode(basStock.getTrayCode());
|
||||
basStockFreezeRecord.setProductGuid(basStock.getProductGuid());
|
||||
basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
|
||||
basStockFreezeRecord.setCreateTime(new Date());
|
||||
basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus());
|
||||
basStockFreezeRecord.setCurrStatus(basStock.getStockStatus());
|
||||
basStockFreezeRecord.setOldStatus(oldBasCargoSpace.getLocked());
|
||||
basStockFreezeRecord.setCurrStatus(basStock.getCargoSpaceStatus());
|
||||
basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId());
|
||||
basStockFreezeRecord.setMethod("0");
|
||||
if ("N".equals(basStock.getCargoSpaceStatus())){
|
||||
basStockFreezeRecord.setMethod("解锁");
|
||||
}else {
|
||||
basStockFreezeRecord.setMethod("锁定");
|
||||
}
|
||||
BasCargoSpace basCargoSpace = new BasCargoSpace();
|
||||
basCargoSpace.setCargoSpaceId(basStock.getCargoSpaceId());
|
||||
basCargoSpace.setLocked(basStock.getCargoSpaceStatus());
|
||||
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
|
||||
basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord);
|
||||
}
|
||||
}
|
||||
@@ -156,4 +174,6 @@ public class BasStockServiceImpl implements IBasStockService
|
||||
public void insertBasStockList(List<BasStock> list) {
|
||||
basStockMapper.insertBasStockList(list);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user