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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-09 17:39:24 +08:00
parent 77e927ae51 6e3e559ac0
commit be72a0ac13
14 changed files with 634 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 库存冻结记录对象 bas_stock_freeze_record * 库存冻结记录对象 bas_stock_freeze_record
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-28 * @date 2025-05-28
*/ */
@@ -25,6 +25,7 @@ public class BasStockFreezeRecord extends BaseEntity
/** 货位编码 */ /** 货位编码 */
@Excel(name = "货位编码") @Excel(name = "货位编码")
private String cargoSpaceId; private String cargoSpaceId;
private String cargoSpaceName;
/** 托盘条码 */ /** 托盘条码 */
@Excel(name = "托盘条码") @Excel(name = "托盘条码")
@@ -61,6 +62,7 @@ public class BasStockFreezeRecord extends BaseEntity
/** 仓库 */ /** 仓库 */
@Excel(name = "仓库") @Excel(name = "仓库")
private String warehouseId; private String warehouseId;
private String warehouseName;
/** 库存字表id */ /** 库存字表id */
@Excel(name = "库存字表id") @Excel(name = "库存字表id")
@@ -82,172 +84,188 @@ public class BasStockFreezeRecord extends BaseEntity
@Excel(name = "物料guid") @Excel(name = "物料guid")
private String productGuid; 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; this.whGuid = whGuid;
} }
public String getWhGuid() public String getWhGuid()
{ {
return whGuid; return whGuid;
} }
public void setStockId(String stockId) public void setStockId(String stockId)
{ {
this.stockId = stockId; this.stockId = stockId;
} }
public String getStockId() public String getStockId()
{ {
return stockId; return stockId;
} }
public void setCargoSpaceId(String cargoSpaceId) public void setCargoSpaceId(String cargoSpaceId)
{ {
this.cargoSpaceId = cargoSpaceId; this.cargoSpaceId = cargoSpaceId;
} }
public String getCargoSpaceId() public String getCargoSpaceId()
{ {
return cargoSpaceId; return cargoSpaceId;
} }
public void setTrayCode(String trayCode) public void setTrayCode(String trayCode)
{ {
this.trayCode = trayCode; this.trayCode = trayCode;
} }
public String getTrayCode() public String getTrayCode()
{ {
return trayCode; return trayCode;
} }
public void setProductId(String productId) public void setProductId(String productId)
{ {
this.productId = productId; this.productId = productId;
} }
public String getProductId() public String getProductId()
{ {
return productId; return productId;
} }
public void setProductName(String productName) public void setProductName(String productName)
{ {
this.productName = productName; this.productName = productName;
} }
public String getProductName() public String getProductName()
{ {
return productName; return productName;
} }
public void setPrintDate(String printDate) public void setPrintDate(String printDate)
{ {
this.printDate = printDate; this.printDate = printDate;
} }
public String getPrintDate() public String getPrintDate()
{ {
return printDate; return printDate;
} }
public void setLotNo(String lotNo) public void setLotNo(String lotNo)
{ {
this.lotNo = lotNo; this.lotNo = lotNo;
} }
public String getLotNo() public String getLotNo()
{ {
return lotNo; return lotNo;
} }
public void setOldStatus(String oldStatus) public void setOldStatus(String oldStatus)
{ {
this.oldStatus = oldStatus; this.oldStatus = oldStatus;
} }
public String getOldStatus() public String getOldStatus()
{ {
return oldStatus; return oldStatus;
} }
public void setCurrStatus(String currStatus) public void setCurrStatus(String currStatus)
{ {
this.currStatus = currStatus; this.currStatus = currStatus;
} }
public String getCurrStatus() public String getCurrStatus()
{ {
return currStatus; return currStatus;
} }
public void setMethod(String method) public void setMethod(String method)
{ {
this.method = method; this.method = method;
} }
public String getMethod() public String getMethod()
{ {
return method; return method;
} }
public void setWarehouseId(String warehouseId) public void setWarehouseId(String warehouseId)
{ {
this.warehouseId = warehouseId; this.warehouseId = warehouseId;
} }
public String getWarehouseId() public String getWarehouseId()
{ {
return warehouseId; return warehouseId;
} }
public void setStockDetailId(String stockDetailId) public void setStockDetailId(String stockDetailId)
{ {
this.stockDetailId = stockDetailId; this.stockDetailId = stockDetailId;
} }
public String getStockDetailId() public String getStockDetailId()
{ {
return stockDetailId; return stockDetailId;
} }
public void setOperatingTarget(String operatingTarget) public void setOperatingTarget(String operatingTarget)
{ {
this.operatingTarget = operatingTarget; this.operatingTarget = operatingTarget;
} }
public String getOperatingTarget() public String getOperatingTarget()
{ {
return operatingTarget; return operatingTarget;
} }
public void setBarCodeOldQuantity(String barCodeOldQuantity) public void setBarCodeOldQuantity(String barCodeOldQuantity)
{ {
this.barCodeOldQuantity = barCodeOldQuantity; this.barCodeOldQuantity = barCodeOldQuantity;
} }
public String getBarCodeOldQuantity() public String getBarCodeOldQuantity()
{ {
return barCodeOldQuantity; return barCodeOldQuantity;
} }
public void setBarCodeQuantity(String barCodeQuantity) public void setBarCodeQuantity(String barCodeQuantity)
{ {
this.barCodeQuantity = barCodeQuantity; this.barCodeQuantity = barCodeQuantity;
} }
public String getBarCodeQuantity() public String getBarCodeQuantity()
{ {
return barCodeQuantity; return barCodeQuantity;
} }
public void setProductGuid(String productGuid) public void setProductGuid(String productGuid)
{ {
this.productGuid = productGuid; this.productGuid = productGuid;
} }
public String getProductGuid() public String getProductGuid()
{ {
return productGuid; return productGuid;
} }

88
ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 库存操作记录对象 bas_stock_maintain_record * 库存操作记录对象 bas_stock_maintain_record
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-26 * @date 2025-05-26
*/ */
@@ -25,6 +25,7 @@ public class BasStockMaintainRecord extends BaseEntity
/** 货位编码 */ /** 货位编码 */
@Excel(name = "货位编码") @Excel(name = "货位编码")
private String cargoSpaceId; private String cargoSpaceId;
private String cargoSpaceName;
/** 托盘条码 */ /** 托盘条码 */
@Excel(name = "托盘条码") @Excel(name = "托盘条码")
@@ -61,6 +62,7 @@ public class BasStockMaintainRecord extends BaseEntity
/** 仓库 */ /** 仓库 */
@Excel(name = "仓库") @Excel(name = "仓库")
private String warehouseId; private String warehouseId;
private String warehouseName;
/** 库存字表id */ /** 库存字表id */
@Excel(name = "库存字表id") @Excel(name = "库存字表id")
@@ -82,172 +84,188 @@ public class BasStockMaintainRecord extends BaseEntity
@Excel(name = "物料guid") @Excel(name = "物料guid")
private String productGuid; 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; this.whGuid = whGuid;
} }
public String getWhGuid() public String getWhGuid()
{ {
return whGuid; return whGuid;
} }
public void setStockId(String stockId) public void setStockId(String stockId)
{ {
this.stockId = stockId; this.stockId = stockId;
} }
public String getStockId() public String getStockId()
{ {
return stockId; return stockId;
} }
public void setCargoSpaceId(String cargoSpaceId) public void setCargoSpaceId(String cargoSpaceId)
{ {
this.cargoSpaceId = cargoSpaceId; this.cargoSpaceId = cargoSpaceId;
} }
public String getCargoSpaceId() public String getCargoSpaceId()
{ {
return cargoSpaceId; return cargoSpaceId;
} }
public void setTrayCode(String trayCode) public void setTrayCode(String trayCode)
{ {
this.trayCode = trayCode; this.trayCode = trayCode;
} }
public String getTrayCode() public String getTrayCode()
{ {
return trayCode; return trayCode;
} }
public void setProductId(String productId) public void setProductId(String productId)
{ {
this.productId = productId; this.productId = productId;
} }
public String getProductId() public String getProductId()
{ {
return productId; return productId;
} }
public void setProductName(String productName) public void setProductName(String productName)
{ {
this.productName = productName; this.productName = productName;
} }
public String getProductName() public String getProductName()
{ {
return productName; return productName;
} }
public void setPrintDate(String printDate) public void setPrintDate(String printDate)
{ {
this.printDate = printDate; this.printDate = printDate;
} }
public String getPrintDate() public String getPrintDate()
{ {
return printDate; return printDate;
} }
public void setLotNo(String lotNo) public void setLotNo(String lotNo)
{ {
this.lotNo = lotNo; this.lotNo = lotNo;
} }
public String getLotNo() public String getLotNo()
{ {
return lotNo; return lotNo;
} }
public void setOldQuantity(String oldQuantity) public void setOldQuantity(String oldQuantity)
{ {
this.oldQuantity = oldQuantity; this.oldQuantity = oldQuantity;
} }
public String getOldQuantity() public String getOldQuantity()
{ {
return oldQuantity; return oldQuantity;
} }
public void setQuantity(String quantity) public void setQuantity(String quantity)
{ {
this.quantity = quantity; this.quantity = quantity;
} }
public String getQuantity() public String getQuantity()
{ {
return quantity; return quantity;
} }
public void setMethod(String method) public void setMethod(String method)
{ {
this.method = method; this.method = method;
} }
public String getMethod() public String getMethod()
{ {
return method; return method;
} }
public void setWarehouseId(String warehouseId) public void setWarehouseId(String warehouseId)
{ {
this.warehouseId = warehouseId; this.warehouseId = warehouseId;
} }
public String getWarehouseId() public String getWarehouseId()
{ {
return warehouseId; return warehouseId;
} }
public void setStockDetailId(String stockDetailId) public void setStockDetailId(String stockDetailId)
{ {
this.stockDetailId = stockDetailId; this.stockDetailId = stockDetailId;
} }
public String getStockDetailId() public String getStockDetailId()
{ {
return stockDetailId; return stockDetailId;
} }
public void setOperatingTarget(String operatingTarget) public void setOperatingTarget(String operatingTarget)
{ {
this.operatingTarget = operatingTarget; this.operatingTarget = operatingTarget;
} }
public String getOperatingTarget() public String getOperatingTarget()
{ {
return operatingTarget; return operatingTarget;
} }
public void setBarCodeOldQuantity(String barCodeOldQuantity) public void setBarCodeOldQuantity(String barCodeOldQuantity)
{ {
this.barCodeOldQuantity = barCodeOldQuantity; this.barCodeOldQuantity = barCodeOldQuantity;
} }
public String getBarCodeOldQuantity() public String getBarCodeOldQuantity()
{ {
return barCodeOldQuantity; return barCodeOldQuantity;
} }
public void setBarCodeQuantity(String barCodeQuantity) public void setBarCodeQuantity(String barCodeQuantity)
{ {
this.barCodeQuantity = barCodeQuantity; this.barCodeQuantity = barCodeQuantity;
} }
public String getBarCodeQuantity() public String getBarCodeQuantity()
{ {
return barCodeQuantity; return barCodeQuantity;
} }
public void setProductGuid(String productGuid) public void setProductGuid(String productGuid)
{ {
this.productGuid = productGuid; this.productGuid = productGuid;
} }
public String getProductGuid() public String getProductGuid()
{ {
return productGuid; return productGuid;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java
View File

@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/** /**
* 库存信息Controller * 库存信息Controller
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-24 * @date 2025-05-24
*/ */

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

@@ -1,5 +1,6 @@
package com.ruoyi.stock.stock.domain; 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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
@@ -7,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 库存信息对象 bas_stock * 库存信息对象 bas_stock
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-24 * @date 2025-05-24
*/ */
@@ -22,6 +23,7 @@ public class BasStock extends BaseEntity
/** 货位id */ /** 货位id */
@Excel(name = "货位id") @Excel(name = "货位id")
private String cargoSpaceId; private String cargoSpaceId;
private String cargoSpaceName;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "库存状态") @Excel(name = "库存状态")
@@ -80,8 +82,10 @@ public class BasStock extends BaseEntity
private String inClassId; private String inClassId;
/** 仓库 */ /** 仓库 */
@Excel(name = "仓库") @Excel(name = "仓库Id")
private String warehouseId; private String warehouseId;
@Excel(name = "仓库")
private String warehouseName;
/** 垛型ID */ /** 垛型ID */
@Excel(name = "垛型ID") @Excel(name = "垛型ID")
@@ -111,242 +115,286 @@ public class BasStock extends BaseEntity
@Excel(name = "备用字段6") @Excel(name = "备用字段6")
private String spare6; 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; this.stockId = stockId;
} }
public String getStockId() public String getStockId()
{ {
return stockId; return stockId;
} }
public void setCargoSpaceId(String cargoSpaceId) public void setCargoSpaceId(String cargoSpaceId)
{ {
this.cargoSpaceId = cargoSpaceId; this.cargoSpaceId = cargoSpaceId;
} }
public String getCargoSpaceId() public String getCargoSpaceId()
{ {
return cargoSpaceId; return cargoSpaceId;
} }
public void setStockStatus(String stockStatus) public void setStockStatus(String stockStatus)
{ {
this.stockStatus = stockStatus; this.stockStatus = stockStatus;
} }
public String getStockStatus() public String getStockStatus()
{ {
return stockStatus; return stockStatus;
} }
public void setProductStatus(String productStatus) public void setProductStatus(String productStatus)
{ {
this.productStatus = productStatus; this.productStatus = productStatus;
} }
public String getProductStatus() public String getProductStatus()
{ {
return productStatus; return productStatus;
} }
public void setLotNo(String lotNo) public void setLotNo(String lotNo)
{ {
this.lotNo = lotNo; this.lotNo = lotNo;
} }
public String getLotNo() public String getLotNo()
{ {
return lotNo; return lotNo;
} }
public void setInDate(String inDate) public void setInDate(String inDate)
{ {
this.inDate = inDate; this.inDate = inDate;
} }
public String getInDate() public String getInDate()
{ {
return inDate; return inDate;
} }
public void setBackDate(String backDate) public void setBackDate(String backDate)
{ {
this.backDate = backDate; this.backDate = backDate;
} }
public String getBackDate() public String getBackDate()
{ {
return backDate; return backDate;
} }
public void setProductGuid(String productGuid) public void setProductGuid(String productGuid)
{ {
this.productGuid = productGuid; this.productGuid = productGuid;
} }
public String getProductGuid() public String getProductGuid()
{ {
return productGuid; return productGuid;
} }
public void setQuantity(String quantity) public void setQuantity(String quantity)
{ {
this.quantity = quantity; this.quantity = quantity;
} }
public String getQuantity() public String getQuantity()
{ {
return quantity; return quantity;
} }
public void setJobId(String jobId) public void setJobId(String jobId)
{ {
this.jobId = jobId; this.jobId = jobId;
} }
public String getJobId() public String getJobId()
{ {
return jobId; return jobId;
} }
public void setTrayCode(String trayCode) public void setTrayCode(String trayCode)
{ {
this.trayCode = trayCode; this.trayCode = trayCode;
} }
public String getTrayCode() public String getTrayCode()
{ {
return trayCode; return trayCode;
} }
public void setOutQuantity(String outQuantity) public void setOutQuantity(String outQuantity)
{ {
this.outQuantity = outQuantity; this.outQuantity = outQuantity;
} }
public String getOutQuantity() public String getOutQuantity()
{ {
return outQuantity; return outQuantity;
} }
public void setStockinDetailId(String stockinDetailId) public void setStockinDetailId(String stockinDetailId)
{ {
this.stockinDetailId = stockinDetailId; this.stockinDetailId = stockinDetailId;
} }
public String getStockinDetailId() public String getStockinDetailId()
{ {
return stockinDetailId; return stockinDetailId;
} }
public void setStockinId(String stockinId) public void setStockinId(String stockinId)
{ {
this.stockinId = stockinId; this.stockinId = stockinId;
} }
public String getStockinId() public String getStockinId()
{ {
return stockinId; return stockinId;
} }
public void setInType(String inType) public void setInType(String inType)
{ {
this.inType = inType; this.inType = inType;
} }
public String getInType() public String getInType()
{ {
return inType; return inType;
} }
public void setInClassId(String inClassId) public void setInClassId(String inClassId)
{ {
this.inClassId = inClassId; this.inClassId = inClassId;
} }
public String getInClassId() public String getInClassId()
{ {
return inClassId; return inClassId;
} }
public void setWarehouseId(String warehouseId) public void setWarehouseId(String warehouseId)
{ {
this.warehouseId = warehouseId; this.warehouseId = warehouseId;
} }
public String getWarehouseId() public String getWarehouseId()
{ {
return warehouseId; return warehouseId;
} }
public void setStackingId(String stackingId) public void setStackingId(String stackingId)
{ {
this.stackingId = stackingId; this.stackingId = stackingId;
} }
public String getStackingId() public String getStackingId()
{ {
return stackingId; return stackingId;
} }
public void setSpare1(String spare1) public void setSpare1(String spare1)
{ {
this.spare1 = spare1; this.spare1 = spare1;
} }
public String getSpare1() public String getSpare1()
{ {
return spare1; return spare1;
} }
public void setSpare2(String spare2) public void setSpare2(String spare2)
{ {
this.spare2 = spare2; this.spare2 = spare2;
} }
public String getSpare2() public String getSpare2()
{ {
return spare2; return spare2;
} }
public void setSpare3(String spare3) public void setSpare3(String spare3)
{ {
this.spare3 = spare3; this.spare3 = spare3;
} }
public String getSpare3() public String getSpare3()
{ {
return spare3; return spare3;
} }
public void setSpare4(String spare4) public void setSpare4(String spare4)
{ {
this.spare4 = spare4; this.spare4 = spare4;
} }
public String getSpare4() public String getSpare4()
{ {
return spare4; return spare4;
} }
public void setSpare5(String spare5) public void setSpare5(String spare5)
{ {
this.spare5 = spare5; this.spare5 = spare5;
} }
public String getSpare5() public String getSpare5()
{ {
return spare5; return spare5;
} }
public void setSpare6(String spare6) public void setSpare6(String spare6)
{ {
this.spare6 = spare6; this.spare6 = spare6;
} }
public String getSpare6() public String getSpare6()
{ {
return spare6; return spare6;
} }

18
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
View File

@@ -1,19 +1,21 @@
package com.ruoyi.stock.stock.service; package com.ruoyi.stock.stock.service;
import java.util.List; import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.domain.BasStock;
/** /**
* 库存信息Service接口 * 库存信息Service接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-05-24 * @date 2025-05-24
*/ */
public interface IBasStockService public interface IBasStockService
{ {
/** /**
* 查询库存信息 * 查询库存信息
* *
* @param stockId 库存信息主键 * @param stockId 库存信息主键
* @return 库存信息 * @return 库存信息
*/ */
@@ -21,7 +23,7 @@ public interface IBasStockService
/** /**
* 查询库存信息列表 * 查询库存信息列表
* *
* @param basStock 库存信息 * @param basStock 库存信息
* @return 库存信息集合 * @return 库存信息集合
*/ */
@@ -29,7 +31,7 @@ public interface IBasStockService
/** /**
* 新增库存信息 * 新增库存信息
* *
* @param basStock 库存信息 * @param basStock 库存信息
* @return 结果 * @return 结果
*/ */
@@ -37,7 +39,7 @@ public interface IBasStockService
/** /**
* 修改库存信息 * 修改库存信息
* *
* @param basStock 库存信息 * @param basStock 库存信息
* @return 结果 * @return 结果
*/ */
@@ -45,7 +47,7 @@ public interface IBasStockService
/** /**
* 批量删除库存信息 * 批量删除库存信息
* *
* @param stockIds 需要删除的库存信息主键集合 * @param stockIds 需要删除的库存信息主键集合
* @return 结果 * @return 结果
*/ */
@@ -53,7 +55,7 @@ public interface IBasStockService
/** /**
* 删除库存信息信息 * 删除库存信息信息
* *
* @param stockId 库存信息主键 * @param stockId 库存信息主键
* @return 结果 * @return 结果
*/ */

68
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
View File

@@ -5,6 +5,12 @@ import java.util.List;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil; 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.common.utils.SecurityUtils;
import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord;
import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService;
@@ -32,6 +38,8 @@ public class BasStockServiceImpl implements IBasStockService
private IBasStockMaintainRecordService basStockMaintainRecordService; private IBasStockMaintainRecordService basStockMaintainRecordService;
@Autowired @Autowired
private IBasStockFreezeRecordService basStockFreezeRecordService; private IBasStockFreezeRecordService basStockFreezeRecordService;
@Autowired
private IBasCargoSpaceService basCargoSpaceService;
/** /**
* 查询库存信息 * 查询库存信息
@@ -70,21 +78,25 @@ public class BasStockServiceImpl implements IBasStockService
return basStockMapper.insertBasStock(basStock); return basStockMapper.insertBasStock(basStock);
} }
private void insertMaintainRecord(BasStock oldStock,BasStock basStock, String operate) { private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) {
BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); if (!oldStock.getQuantity().equals(basStock.getQuantity())){
basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord();
basStockMaintainRecord.setStockId(basStock.getStockId()); basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID());
basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); basStockMaintainRecord.setStockId(basStock.getStockId());
basStockMaintainRecord.setLotNo(basStock.getLotNo()); basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId());
basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); basStockMaintainRecord.setLotNo(basStock.getLotNo());
basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); basStockMaintainRecord.setTrayCode(basStock.getTrayCode());
basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); basStockMaintainRecord.setProductGuid(basStock.getProductGuid());
basStockMaintainRecord.setCreateTime(new Date()); basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
basStockMaintainRecord.setOldQuantity(oldStock!=null?oldStock.getQuantity():"0"); basStockMaintainRecord.setCreateTime(new Date());
basStockMaintainRecord.setQuantity(basStock.getQuantity()); basStockMaintainRecord.setOldQuantity(oldStock != null ? oldStock.getQuantity() : "0");
basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); basStockMaintainRecord.setQuantity(basStock.getQuantity());
basStockMaintainRecord.setMethod(operate); basStockMaintainRecord.setProductId(basStock.getExtraField().getProductId());
basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); 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()); BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
insertMaintainRecord(oldBasStock,basStock,"2"); insertMaintainRecord(oldBasStock,basStock,"2");
insertFreezeRecord(oldBasStock,basStock); BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId());
insertFreezeRecord(oldBasCargoSpace,basStock);
return basStockMapper.updateBasStock(basStock); return basStockMapper.updateBasStock(basStock);
} }
private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) { private void insertFreezeRecord(BasCargoSpace oldBasCargoSpace, BasStock basStock) {
if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){ if (!oldBasCargoSpace.getLocked().equals(basStock.getCargoSpaceStatus())){
BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord(); BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord();
basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID()); basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID());
basStockFreezeRecord.setStockId(basStock.getStockId());
basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId()); basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId());
basStockFreezeRecord.setLotNo(basStock.getLotNo());
basStockFreezeRecord.setTrayCode(basStock.getTrayCode()); basStockFreezeRecord.setTrayCode(basStock.getTrayCode());
basStockFreezeRecord.setProductGuid(basStock.getProductGuid());
basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
basStockFreezeRecord.setCreateTime(new Date()); basStockFreezeRecord.setCreateTime(new Date());
basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus()); basStockFreezeRecord.setOldStatus(oldBasCargoSpace.getLocked());
basStockFreezeRecord.setCurrStatus(basStock.getStockStatus()); basStockFreezeRecord.setCurrStatus(basStock.getCargoSpaceStatus());
basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId()); 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); basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord);
} }
} }
@@ -156,4 +174,6 @@ public class BasStockServiceImpl implements IBasStockService
public void insertBasStockList(List<BasStock> list) { public void insertBasStockList(List<BasStock> list) {
basStockMapper.insertBasStockList(list); basStockMapper.insertBasStockList(list);
} }
} }

23
ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper"> <mapper namespace="com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper">
<resultMap type="BasStockFreezeRecord" id="BasStockFreezeRecordResult"> <resultMap type="BasStockFreezeRecord" id="BasStockFreezeRecordResult">
<result property="whGuid" column="wh_guid" /> <result property="whGuid" column="wh_guid" />
<result property="stockId" column="stock_id" /> <result property="stockId" column="stock_id" />
@@ -23,18 +23,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="barCodeOldQuantity" column="bar_code_old_quantity" /> <result property="barCodeOldQuantity" column="bar_code_old_quantity" />
<result property="barCodeQuantity" column="bar_code_quantity" /> <result property="barCodeQuantity" column="bar_code_quantity" />
<result property="productGuid" column="product_guid" /> <result property="productGuid" column="product_guid" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="warehouseName" column="warehouse_name" />
</resultMap> </resultMap>
<sql id="selectBasStockFreezeRecordVo"> <sql id="selectBasStockFreezeRecordVo">
select wh_guid, stock_id, cargo_space_id, tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid from bas_stock_freeze_record select wh_guid, stock_id, bsfr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsfr.tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, bsfr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
from bas_stock_freeze_record bsfr
left join bas_cargo_space bcs on bsfr.cargo_space_id=bcs.cargo_space_id
left join bas_warehouse bw on bsfr.warehouse_id=bw.warehouse_id
</sql> </sql>
<select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult"> <select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
<include refid="selectBasStockFreezeRecordVo"/> <include refid="selectBasStockFreezeRecordVo"/>
<where> <where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if> <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="cargoSpaceId != null and cargoSpaceId != ''"> and bsfr.cargo_space_id = #{cargoSpaceId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if> <if test="trayCode != null and trayCode != ''"> and bsfr.tray_code = #{trayCode}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</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="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if> <if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
@@ -42,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="oldStatus != null and oldStatus != ''"> and old_status = #{oldStatus}</if> <if test="oldStatus != null and oldStatus != ''"> and old_status = #{oldStatus}</if>
<if test="currStatus != null and currStatus != ''"> and curr_status = #{currStatus}</if> <if test="currStatus != null and currStatus != ''"> and curr_status = #{currStatus}</if>
<if test="method != null and method != ''"> and method = #{method}</if> <if test="method != null and method != ''"> and method = #{method}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="warehouseId != null and warehouseId != ''"> and bsfr.warehouse_id = #{warehouseId}</if>
<if test="stockDetailId != null and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if> <if test="stockDetailId != null and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if>
<if test="operatingTarget != null and operatingTarget != ''"> and operating_target = #{operatingTarget}</if> <if test="operatingTarget != null and operatingTarget != ''"> and operating_target = #{operatingTarget}</if>
<if test="barCodeOldQuantity != null and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if> <if test="barCodeOldQuantity != null and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if>
@@ -50,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if> <if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
</where> </where>
</select> </select>
<select id="selectBasStockFreezeRecordByWhGuid" parameterType="String" resultMap="BasStockFreezeRecordResult"> <select id="selectBasStockFreezeRecordByWhGuid" parameterType="String" resultMap="BasStockFreezeRecordResult">
<include refid="selectBasStockFreezeRecordVo"/> <include refid="selectBasStockFreezeRecordVo"/>
where wh_guid = #{whGuid} where wh_guid = #{whGuid}
@@ -129,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteBasStockFreezeRecordByWhGuids" parameterType="String"> <delete id="deleteBasStockFreezeRecordByWhGuids" parameterType="String">
delete from bas_stock_freeze_record where wh_guid in delete from bas_stock_freeze_record where wh_guid in
<foreach item="whGuid" collection="array" open="(" separator="," close=")"> <foreach item="whGuid" collection="array" open="(" separator="," close=")">
#{whGuid} #{whGuid}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

23
ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.stock.maintain.mapper.BasStockMaintainRecordMapper"> <mapper namespace="com.ruoyi.stock.maintain.mapper.BasStockMaintainRecordMapper">
<resultMap type="BasStockMaintainRecord" id="BasStockMaintainRecordResult"> <resultMap type="BasStockMaintainRecord" id="BasStockMaintainRecordResult">
<result property="whGuid" column="wh_guid" /> <result property="whGuid" column="wh_guid" />
<result property="stockId" column="stock_id" /> <result property="stockId" column="stock_id" />
@@ -23,18 +23,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="barCodeOldQuantity" column="bar_code_old_quantity" /> <result property="barCodeOldQuantity" column="bar_code_old_quantity" />
<result property="barCodeQuantity" column="bar_code_quantity" /> <result property="barCodeQuantity" column="bar_code_quantity" />
<result property="productGuid" column="product_guid" /> <result property="productGuid" column="product_guid" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="warehouseName" column="warehouse_name" />
</resultMap> </resultMap>
<sql id="selectBasStockMaintainRecordVo"> <sql id="selectBasStockMaintainRecordVo">
select wh_guid, stock_id, cargo_space_id, tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid from bas_stock_maintain_record select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
from bas_stock_maintain_record bsmr
left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id
left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id
</sql> </sql>
<select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult"> <select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult">
<include refid="selectBasStockMaintainRecordVo"/> <include refid="selectBasStockMaintainRecordVo"/>
<where> <where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if> <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="cargoSpaceId != null and cargoSpaceId != ''"> and bsmr.cargo_space_id = #{cargoSpaceId}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if> <if test="trayCode != null and trayCode != ''"> and bsmr.tray_code = #{trayCode}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</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="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if> <if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
@@ -42,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="oldQuantity != null and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if> <if test="oldQuantity != null and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if> <if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="method != null and method != ''"> and method = #{method}</if> <if test="method != null and method != ''"> and method = #{method}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="warehouseId != null and warehouseId != ''"> and bsmr.warehouse_id = #{warehouseId}</if>
<if test="stockDetailId != null and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if> <if test="stockDetailId != null and stockDetailId != ''"> and stock_detail_id = #{stockDetailId}</if>
<if test="operatingTarget != null and operatingTarget != ''"> and operating_target = #{operatingTarget}</if> <if test="operatingTarget != null and operatingTarget != ''"> and operating_target = #{operatingTarget}</if>
<if test="barCodeOldQuantity != null and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if> <if test="barCodeOldQuantity != null and barCodeOldQuantity != ''"> and bar_code_old_quantity = #{barCodeOldQuantity}</if>
@@ -50,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if> <if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
</where> </where>
</select> </select>
<select id="selectBasStockMaintainRecordByWhGuid" parameterType="String" resultMap="BasStockMaintainRecordResult"> <select id="selectBasStockMaintainRecordByWhGuid" parameterType="String" resultMap="BasStockMaintainRecordResult">
<include refid="selectBasStockMaintainRecordVo"/> <include refid="selectBasStockMaintainRecordVo"/>
where wh_guid = #{whGuid} where wh_guid = #{whGuid}
@@ -129,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteBasStockMaintainRecordByWhGuids" parameterType="String"> <delete id="deleteBasStockMaintainRecordByWhGuids" parameterType="String">
delete from bas_stock_maintain_record where wh_guid in delete from bas_stock_maintain_record where wh_guid in
<foreach item="whGuid" collection="array" open="(" separator="," close=")"> <foreach item="whGuid" collection="array" open="(" separator="," close=")">
#{whGuid} #{whGuid}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

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

@@ -29,39 +29,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" /> <result property="spare4" column="spare4" />
<result property="spare5" column="spare5" /> <result property="spare5" column="spare5" />
<result property="spare6" column="spare6" /> <result property="spare6" column="spare6" />
<result property="cargoSpaceStatus" column="locked" />
<result property="warehouseName" column="warehouse_name" />
<result property="cargoSpaceName" column="cargo_space_name" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap> </resultMap>
<sql id="selectBasStockVo"> <sql id="selectBasStockVo">
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 from bas_stock select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
bcs.locked,bcs.cargo_space_name
from bas_stock bs
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
</sql> </sql>
<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 stock_id = #{stockId}</if> <if test="stockId != null and stockId != ''"> and bs.stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if> <if test="cargoSpaceId != null and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if> <if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if> <if test="productStatus != null and productStatus != ''"> and bs.product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if> <if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if> <if test="inDate != null and inDate != ''"> and bs.in_date = #{inDate}</if>
<if test="backDate != null and backDate != ''"> and back_date = #{backDate}</if> <if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if> <if test="productGuid != null and productGuid != ''"> and bs.product_guid = #{productGuid}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if> <if test="productName != null and productName != ''"> and bp.product_name = #{productName}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if> <if test="quantity != null and quantity != ''"> and bs.quantity = #{quantity}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if> <if test="jobId != null and jobId != ''"> and bs.job_id = #{jobId}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if> <if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if> <if test="outQuantity != null and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if> <if test="stockinDetailId != null and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if> <if test="stockinId != null and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
<if test="inClassId != null and inClassId != ''"> and in_class_id = #{inClassId}</if> <if test="inType != null and inType != ''"> and bs.in_type = #{inType}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="inClassId != null and inClassId != ''"> and bs.in_class_id = #{inClassId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if> <if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if> <if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if> <if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if> <if test="spare2 != null and spare2 != ''"> and bs.spare2 = #{spare2}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if> <if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if> <if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if> <if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
</where> </where>
</select> </select>

24
ruoyi-ui/src/lang/en.js
View File

@@ -563,6 +563,7 @@ export default {
stockManagement: { stockManagement: {
stockId: 'Stock ID', stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID', cargoSpaceId: 'Cargo Space ID',
cargoSpaceName: 'Cargo Space Name',
stockStatus: 'Stock Status', stockStatus: 'Stock Status',
productStatus: 'Product Status', productStatus: 'Product Status',
lotNo: 'Lot No', lotNo: 'Lot No',
@@ -611,12 +612,23 @@ export default {
addSuccess: 'Added successfully', addSuccess: 'Added successfully',
editSuccess: 'Modified successfully', editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully', deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?' confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?',
productId:'物料编码',
materialDesc:'物料描述',
englishDesc:'英文描述',
netWeight:'净重',
length:'长',
width:'宽',
height:'高',
volume:'体积',
cargoSpaceStatus:'货位状态'
}, },
// *************库存操作记录*************** // *************库存操作记录***************
stockRecord: { stockRecord: {
stockId: 'Stock ID', stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID', cargoSpaceId: 'Cargo Space ID',
cargoSpaceName: '货位名称',
trayCode: 'Tray Code', trayCode: 'Tray Code',
productId: 'Product ID', productId: 'Product ID',
productName: 'Product Name', productName: 'Product Name',
@@ -674,7 +686,8 @@ export default {
editSuccess: 'Modified successfully', editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully', deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?', confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
fileName: 'record_{time}' fileName: 'record_{time}',
createTime: '创建时间',
}, },
// **************库存冻结记录************** // **************库存冻结记录**************
stockFreeze: { stockFreeze: {
@@ -734,7 +747,8 @@ export default {
addSuccess: 'Added successfully', addSuccess: 'Added successfully',
editSuccess: 'Modified successfully', editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully', deleteSuccess: 'Deleted successfully',
deleteConfirm: 'Are you sure to delete the selected stock freeze records?' deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
createTime: '创建时间',
}, },
menu: { menu: {
//收货单据新增 //收货单据新增
@@ -782,7 +796,7 @@ export default {
LogManagement_OperationLog: 'OperationLog', LogManagement_OperationLog: 'OperationLog',
//登录日志 //登录日志
LogManagement_LoginLog: 'LoginLog', LogManagement_LoginLog: 'LoginLog',
//********************系统监控******************** //********************系统监控********************
SystemMonitor: 'SystemMonitor', SystemMonitor: 'SystemMonitor',
// 在线用户 // 在线用户
@@ -1812,7 +1826,7 @@ export default {
//--------------当前页面交互框操作提示-------------- //--------------当前页面交互框操作提示--------------
placeholderJobName: 'Enter JobName', placeholderJobName: 'Enter JobName',
placeholderJobGroup: 'Select JobGroup', placeholderJobGroup: 'Select JobGroup',
//---------------二级窗口操作提示------------------ //---------------二级窗口操作提示------------------
placeholderInvokeTarget: 'Enter InvokeTarget', placeholderInvokeTarget: 'Enter InvokeTarget',
placeholderCronExpression: 'Enter CronExpression', placeholderCronExpression: 'Enter CronExpression',

32
ruoyi-ui/src/lang/zh.js
View File

@@ -567,6 +567,7 @@ export default {
stockManagement: { stockManagement: {
stockId: '库存id', stockId: '库存id',
cargoSpaceId: '货位id', cargoSpaceId: '货位id',
cargoSpaceName: '货位名称',
stockStatus: '库存状态', stockStatus: '库存状态',
productStatus: '物料状态', productStatus: '物料状态',
lotNo: '批次号', lotNo: '批次号',
@@ -577,11 +578,12 @@ export default {
jobId: '作业ID', jobId: '作业ID',
trayCode: '托盘条码', trayCode: '托盘条码',
outQuantity: '出库数量', outQuantity: '出库数量',
stockinDetailId: '入库子单id', stockinDetailId: '入库子单',
stockinId: '入库主单', stockinId: '入库主单',
inType: '入库类型', inType: '入库类型',
inClassId: '入库班组ID', inClassId: '入库班组ID',
warehouseId: '仓库', warehouseId: '仓库',
warehouseName: 'WarehouseName',
stackingId: '垛型ID', stackingId: '垛型ID',
operation: '操作', operation: '操作',
add: '新增', add: '新增',
@@ -604,7 +606,7 @@ export default {
inputJobId: '请输入作业ID', inputJobId: '请输入作业ID',
inputTrayCode: '请输入托盘条码', inputTrayCode: '请输入托盘条码',
inputOutQuantity: '请输入出库数量', inputOutQuantity: '请输入出库数量',
inputStockinDetailId: '请输入入库子单id', inputStockinDetailId: '请输入入库子单',
inputStockinId: '请输入入库主单', inputStockinId: '请输入入库主单',
inputInClassId: '请输入入库班组ID', inputInClassId: '请输入入库班组ID',
inputWarehouseId: '请输入仓库', inputWarehouseId: '请输入仓库',
@@ -615,12 +617,25 @@ export default {
addSuccess: '新增成功', addSuccess: '新增成功',
editSuccess: '修改成功', editSuccess: '修改成功',
deleteSuccess: '删除成功', deleteSuccess: '删除成功',
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？' confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？',
materialDesc:'物料描述',
materialInDesc:'物料描述',
englishDesc:'英文描述',
netWeight:'净重',
length:'长',
width:'宽',
height:'高',
volume:'体积',
productId:'物料编码',
cargoSpaceStatus: '货位状态'
}, },
// *************库存操作记录*************** // *************库存操作记录***************
stockRecord: { stockRecord: {
stockId: '库存编码', stockId: '库存编码',
cargoSpaceId: '货位编码', cargoSpaceId: '货位编码',
cargoSpaceName: '货位名称',
trayCode: '托盘条码', trayCode: '托盘条码',
productId: '物品编码', productId: '物品编码',
productName: '物品名称', productName: '物品名称',
@@ -678,7 +693,8 @@ export default {
editSuccess: '修改成功', editSuccess: '修改成功',
deleteSuccess: '删除成功', deleteSuccess: '删除成功',
confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？', confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？',
fileName: '记录{time}' fileName: '记录{time}',
createTime: '创建时间',
}, },
// **************库存冻结记录************** // **************库存冻结记录**************
stockFreeze: { stockFreeze: {
@@ -738,7 +754,11 @@ export default {
addSuccess: '新增成功', addSuccess: '新增成功',
editSuccess: '修改成功', editSuccess: '修改成功',
deleteSuccess: '删除成功', deleteSuccess: '删除成功',
deleteConfirm: '是否确认删除所选库存冻结记录？' deleteConfirm: '是否确认删除所选库存冻结记录？',
createTime: '创建时间',
oldStatus: '原状态',
currStatus: '新状态',
cargoSpaceName: '货位名称',
}, },
menu: { menu: {
@@ -1773,7 +1793,7 @@ export default {
//--------------当前页面交互框操作提示-------------- //--------------当前页面交互框操作提示--------------
placeholderJobName: '请输入任务名称', placeholderJobName: '请输入任务名称',
placeholderJobGroup: '请选择任务组名', placeholderJobGroup: '请选择任务组名',
//---------------二级窗口操作提示------------------ //---------------二级窗口操作提示------------------
placeholderInvokeTarget: '请输入调用目标字符串', placeholderInvokeTarget: '请输入调用目标字符串',
placeholderCronExpression: '请输入Cron执行表达式', placeholderCronExpression: '请输入Cron执行表达式',

182
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -1,14 +1,14 @@
<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="$t('stockFreeze.stockId')" prop="stockId"> <!-- 库存编码 --> <!-- <el-form-item :label="$t('stockFreeze.stockId')" prop="stockId"> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.stockId" <!-- v-model="queryParams.stockId"-->
:placeholder="$t('stockFreeze.inputStockId')" <!-- :placeholder="$t('stockFreeze.inputStockId')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 --> <el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input <el-input
v-model="queryParams.cargoSpaceId" v-model="queryParams.cargoSpaceId"
@@ -25,14 +25,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockFreeze.productId')" prop="productId"> <!-- 物品编码 --> <!-- <el-form-item :label="$t('stockFreeze.productId')" prop="productId"> &lt;!&ndash; 物品编码 &ndash;&gt;
<el-input <el-input
v-model="queryParams.productId" v-model="queryParams.productId"
:placeholder="$t('stockFreeze.inputProductId')" :placeholder="$t('stockFreeze.inputProductId')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 --> <el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 -->
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
@@ -41,78 +41,80 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> <!-- 生产日期 --> <!-- <el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input <el-input
v-model="queryParams.printDate" v-model="queryParams.printDate"
:placeholder="$t('stockFreeze.inputPrintDate')" :placeholder="$t('stockFreeze.inputPrintDate')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> <!-- 批号 --> <!-- <el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.lotNo" <!-- v-model="queryParams.lotNo"-->
:placeholder="$t('stockFreeze.inputLotNo')" <!-- :placeholder="$t('stockFreeze.inputLotNo')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.method')" prop="method"> <!-- 操作 --> <!-- <el-form-item :label="$t('stockFreeze.method')" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.method" <!-- v-model="queryParams.method"-->
:placeholder="$t('stockFreeze.inputMethod')" <!-- :placeholder="$t('stockFreeze.inputMethod')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 --> <el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input <el-select v-model="queryParams.warehouseId" :placeholder="$t('stockFreeze.warehouseId')">
v-model="queryParams.warehouseId" <el-option
:placeholder="$t('stockFreeze.inputWarehouseId')" v-for="item in warehouseOptions"
clearable :key="item.warehouseId"
@keyup.enter.native="handleQuery" :label="item.warehouseName"
/> :value="item.warehouseId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id --> <!-- <el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.stockDetailId" <!-- v-model="queryParams.stockDetailId"-->
:placeholder="$t('stockFreeze.inputStockDetailId')" <!-- :placeholder="$t('stockFreeze.inputStockDetailId')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 --> <!-- <el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.operatingTarget" <!-- v-model="queryParams.operatingTarget"-->
:placeholder="$t('stockFreeze.inputOperatingTarget')" <!-- :placeholder="$t('stockFreeze.inputOperatingTarget')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 --> <!-- <el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.barCodeOldQuantity" <!-- v-model="queryParams.barCodeOldQuantity"-->
:placeholder="$t('stockFreeze.inputBarCodeOldQuantity')" <!-- :placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 --> <!-- <el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<el-input <!-- <el-input-->
v-model="queryParams.barCodeQuantity" <!-- v-model="queryParams.barCodeQuantity"-->
:placeholder="$t('stockFreeze.inputBarCodeQuantity')" <!-- :placeholder="$t('stockFreeze.inputBarCodeQuantity')"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> <!-- 物料guid --> <!-- <el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> &lt;!&ndash; 物料guid &ndash;&gt;
<el-input <el-input
v-model="queryParams.productGuid" v-model="queryParams.productGuid"
:placeholder="$t('stockFreeze.inputProductGuid')" :placeholder="$t('stockFreeze.inputProductGuid')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockFreeze.search')}}</el-button> <!-- 搜索 --> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockFreeze.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockFreeze.reset')}}</el-button> <!-- 重置 --> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockFreeze.reset')}}</el-button> <!-- 重置 -->
@@ -167,20 +169,32 @@
<el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> <!-- 库存编码 --> <!-- <el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 --> <el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('stockFreeze.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> <el-table-column :label="$t('stockFreeze.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> <!-- 物品编码 --> <!-- <el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> &lt;!&ndash; 物品编码 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> <!-- 物品名称 --> <!-- <el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> &lt;!&ndash; 物品名称 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> <!-- 生产日期 --> <!-- <el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> <!-- 批号 --> <!-- <el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.oldStatus')" align="center" prop="oldStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.oldStatus"/>
</template>
</el-table-column><!-- 原库位状态 -->
<el-table-column :label="$t('stockFreeze.currStatus')" align="center" prop="currStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.currStatus"/>
</template>
</el-table-column><!-- 现库位状态 -->
<el-table-column :label="$t('stockFreeze.method')" align="center" prop="method" /> <!-- 操作 --> <el-table-column :label="$t('stockFreeze.method')" align="center" prop="method" /> <!-- 操作 -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 --> <el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id --> <el-table-column :label="$t('stockFreeze.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 --> <!-- <el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 --> <!-- <el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 --> <!-- <el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid --> <!-- <el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 --> <el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -265,9 +279,11 @@
<script> <script>
import { listFreeze, getFreeze, delFreeze, addFreeze, updateFreeze } from "@/api/stock/freeze" import { listFreeze, getFreeze, delFreeze, addFreeze, updateFreeze } from "@/api/stock/freeze"
import {listWarehouse} from "@/api/bas/warehouse"
export default { export default {
name: "Freeze", name: "Freeze",
dicts:['cargo_space_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@@ -284,6 +300,7 @@ export default {
total: 0, total: 0,
// 库存冻结记录表格数据 // 库存冻结记录表格数据
freezeList: [], freezeList: [],
warehouseOptions:[],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@@ -360,8 +377,15 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getWarehouseList();
}, },
methods: { methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存冻结记录列表 */ /** 查询库存冻结记录列表 */
getList() { getList() {
this.loading = true this.loading = true

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

@@ -93,6 +93,15 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockManagement.materialDesc')" prop="productName"><!-- 物料描述 -->
<el-input
v-model="queryParams.productName"
:placeholder="$t('stockManagement.materialDesc')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="出库数量" prop="outQuantity"> <!-- <el-form-item label="出库数量" prop="outQuantity">
<el-input <el-input
v-model="queryParams.outQuantity" v-model="queryParams.outQuantity"
@@ -126,21 +135,16 @@
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id --> <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
<el-input <el-select v-model="queryParams.warehouseId" :placeholder="$t('stockManagement.warehouseId')">
v-model="queryParams.warehouseId" <el-option
:placeholder="$t('stockManagement.inputWarehouseId')" v-for="item in warehouseOptions"
clearable :key="item.warehouseId"
@keyup.enter.native="handleQuery" :label="item.warehouseName"
/> :value="item.warehouseId"
</el-form-item> />
<el-form-item :label="$t('stockManagement.stackingId')" prop="stackingId"><!-- 垛型ID --> </el-select>
<el-input
v-model="queryParams.stackingId"
:placeholder="$t('stockManagement.inputStackingId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="备用字段1" prop="spare1"> <!-- <el-form-item label="备用字段1" prop="spare1">
<el-input <el-input
v-model="queryParams.spare1" v-model="queryParams.spare1"
@@ -196,7 +200,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@@ -204,8 +208,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['stock:management:add']" v-hasPermi="['stock:management:add']"
>{{$t('stockManagement.add')}} <!-- 新增 --></el-button> >{{$t('stockManagement.add')}} &lt;!&ndash; 新增 &ndash;&gt;</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@@ -245,30 +249,43 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id --> <el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id --> <el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus"> <!-- 库存状态 --> <el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus"> <!-- 库存状态 -->
<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="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 --> <el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/> <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 --> <el-table-column :label="$t('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 --> <!-- <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> <!-- 回流时间 --> <el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID --> <el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 --> <el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID --> <el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> <el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 --> <!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 --> <el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 --> <el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID --> <!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 --> <el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID --> <el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 --> <el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -316,73 +333,83 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!-- 物料状态 --> <el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> <!-- 货位状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')"> <el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
<el-option <el-option
v-for="dict in dict.type.product_status" v-for="dict in dict.type.cargo_space_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> <!-- 批次号 --> <!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> &lt;!&ndash; 物料状态 &ndash;&gt;-->
<el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" /> <!-- <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
</el-form-item> <!-- <el-option-->
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> <!-- 入库时间 --> <!-- v-for="dict in dict.type.product_status"-->
<el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" /> <!-- :key="dict.value"-->
</el-form-item> <!-- :label="dict.label"-->
<el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> <!-- 回流时间 --> <!-- :value="dict.value"-->
<el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" /> <!-- ></el-option>-->
</el-form-item> <!-- </el-select>-->
<el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> <!-- 物料GUID --> <!-- </el-form-item>-->
<el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" /> <!-- <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
</el-form-item> <!-- <el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<!-- <el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 --> <el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" /> <el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> <!-- 作业ID --> <!-- <el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
<el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" /> <!-- <el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 --> <!-- <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" /> <!-- <el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> <!-- 出库数量 --> <!-- <el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" /> <!-- <el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单id --> <!-- <el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> &lt;!&ndash; 入库子单id &ndash;&gt;-->
<el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" /> <!-- <el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> <!-- 入库主单 --> <!-- <el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> &lt;!&ndash; 入库主单 &ndash;&gt;-->
<el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" /> <!-- <el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> <!-- 入库班组ID --> <!-- <el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" /> <!-- <el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 --> <!-- <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" /> <!-- <el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="垛型ID" prop="stackingId"> <!-- <el-form-item label="垛型ID" prop="stackingId">-->
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" /> <!-- <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段1" prop="spare1"> <!-- <el-form-item label="备用字段1" prop="spare1">-->
<el-input v-model="form.spare1" placeholder="请输入备用字段1" /> <!-- <el-input v-model="form.spare1" placeholder="请输入备用字段1" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段2" prop="spare2"> <!-- <el-form-item label="备用字段2" prop="spare2">-->
<el-input v-model="form.spare2" placeholder="请输入备用字段2" /> <!-- <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段3" prop="spare3"> <!-- <el-form-item label="备用字段3" prop="spare3">-->
<el-input v-model="form.spare3" placeholder="请输入备用字段3" /> <!-- <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段4" prop="spare4"> <!-- <el-form-item label="备用字段4" prop="spare4">-->
<el-input v-model="form.spare4" placeholder="请输入备用字段4" /> <!-- <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段5" prop="spare5"> <!-- <el-form-item label="备用字段5" prop="spare5">-->
<el-input v-model="form.spare5" placeholder="请输入备用字段5" /> <!-- <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备用字段6" prop="spare6"> <!-- <el-form-item label="备用字段6" prop="spare6">-->
<el-input v-model="form.spare6" placeholder="请输入备用字段6" /> <!-- <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button> <el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
@@ -394,10 +421,10 @@
<script> <script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management" import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
export default { export default {
name: "Management", name: "Management",
dicts: ['product_status', 'stock_status'], dicts: ['product_status', 'stock_status','cargo_space_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@@ -414,6 +441,8 @@ export default {
total: 0, total: 0,
// 库存信息表格数据 // 库存信息表格数据
managementList: [], managementList: [],
// 仓库选项
warehouseOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@@ -451,16 +480,23 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
stockId: [ /*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空 { required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
], ]*/
} }
} }
}, },
created() { created() {
this.getList() this.getList()
this.getWarehouseList();
}, },
methods: { methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存信息列表 */ /** 查询库存信息列表 */
getList() { getList() {
this.loading = true this.loading = true

45
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -41,14 +41,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> <!-- 生产日期 --> <!-- <el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input <el-input
v-model="queryParams.printDate" v-model="queryParams.printDate"
:placeholder="$t('stockRecord.inputPrintDate')" :placeholder="$t('stockRecord.inputPrintDate')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 --> <el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input <el-input
v-model="queryParams.lotNo" v-model="queryParams.lotNo"
@@ -85,12 +85,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 --> <el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input <el-select v-model="queryParams.warehouseId" :placeholder="$t('stockRecord.warehouseId')">
v-model="queryParams.warehouseId" <el-option
:placeholder="$t('stockRecord.inputWarehouseId')" v-for="item in warehouseOptions"
clearable :key="item.warehouseId"
@keyup.enter.native="handleQuery" :label="item.warehouseName"
/> :value="item.warehouseId"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="库存字表id" prop="stockDetailId"> <!-- <el-form-item label="库存字表id" prop="stockDetailId">
<el-input <el-input
@@ -188,10 +190,11 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockRecord.stockId')" align="center" prop="stockId" /> <!-- 库存编码 --> <el-table-column :label="$t('stockRecord.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 --> <el-table-column :label="$t('stockRecord.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> <el-table-column :label="$t('stockRecord.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockRecord.productId')" align="center" prop="productId" /> <!-- 物品编码 --> <el-table-column :label="$t('stockRecord.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockRecord.productName')" align="center" prop="productName" /> <!-- 物品名称 --> <el-table-column :label="$t('stockRecord.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> <!-- 生产日期 --> <!-- <el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.lotNo')" align="center" prop="lotNo" /> <!-- 批号 --> <el-table-column :label="$t('stockRecord.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('stockRecord.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 初始数量 --> <el-table-column :label="$t('stockRecord.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column :label="$t('stockRecord.quantity')" align="center" prop="quantity" /> <!-- 操作后数量 --> <el-table-column :label="$t('stockRecord.quantity')" align="center" prop="quantity" /> <!-- 操作后数量 -->
@@ -200,12 +203,13 @@
<dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/> <dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 --> <el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id --> <el-table-column :label="$t('stockRecord.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 --> <!-- <el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 --> <!-- <el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 --> <!-- <el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid --> <!-- <el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<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
@@ -303,6 +307,7 @@
<script> <script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/stock/record"; import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/stock/record";
import {listWarehouse} from "@/api/bas/warehouse"
export default { export default {
name: "Record", name: "Record",
@@ -323,6 +328,7 @@ export default {
total: 0, total: 0,
// 库存操作记录表格数据 // 库存操作记录表格数据
recordList: [], recordList: [],
warehouseOptions:[],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@@ -404,9 +410,16 @@ export default {
}; };
}, },
created() { created() {
this.getList(); this.getList()
this.getWarehouseList();
}, },
methods: { methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存操作记录列表 */ /** 查询库存操作记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;