From 6e3e559ac00183b06cc9d2ad05a08a437876dd6f Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 9 Jun 2025 17:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E8=81=94=E6=9F=A5=20=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=20=E5=AD=97=E5=85=B8=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freeze/domain/BasStockFreezeRecord.java | 88 +++++--- .../domain/BasStockMaintainRecord.java | 88 +++++--- .../stock/controller/BasStockController.java | 2 +- .../ruoyi/stock/stock/domain/BasStock.java | 148 ++++++++----- .../stock/stock/service/IBasStockService.java | 18 +- .../service/impl/BasStockServiceImpl.java | 68 ++++-- .../stock/BasStockFreezeRecordMapper.xml | 23 +- .../stock/BasStockMaintainRecordMapper.xml | 23 +- .../resources/mapper/stock/BasStockMapper.xml | 73 +++--- ruoyi-ui/src/lang/en.js | 24 +- ruoyi-ui/src/lang/zh.js | 32 ++- ruoyi-ui/src/views/stock/freeze/index.vue | 182 ++++++++------- ruoyi-ui/src/views/stock/management/index.vue | 208 ++++++++++-------- ruoyi-ui/src/views/stock/record/index.vue | 45 ++-- 14 files changed, 634 insertions(+), 388 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java index 8ab497f..be94b54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存冻结记录对象 bas_stock_freeze_record - * + * * @author ruoyi * @date 2025-05-28 */ @@ -25,6 +25,7 @@ public class BasStockFreezeRecord extends BaseEntity /** 货位编码 */ @Excel(name = "货位编码") private String cargoSpaceId; + private String cargoSpaceName; /** 托盘条码 */ @Excel(name = "托盘条码") @@ -61,6 +62,7 @@ public class BasStockFreezeRecord extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; /** 库存字表id */ @Excel(name = "库存字表id") @@ -82,172 +84,188 @@ public class BasStockFreezeRecord extends BaseEntity @Excel(name = "物料guid") private String productGuid; - public void setWhGuid(String whGuid) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public void setWhGuid(String whGuid) { this.whGuid = whGuid; } - public String getWhGuid() + public String getWhGuid() { return whGuid; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setPrintDate(String printDate) + public void setPrintDate(String printDate) { this.printDate = printDate; } - public String getPrintDate() + public String getPrintDate() { return printDate; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setOldStatus(String oldStatus) + public void setOldStatus(String oldStatus) { this.oldStatus = oldStatus; } - public String getOldStatus() + public String getOldStatus() { return oldStatus; } - public void setCurrStatus(String currStatus) + public void setCurrStatus(String currStatus) { this.currStatus = currStatus; } - public String getCurrStatus() + public String getCurrStatus() { return currStatus; } - public void setMethod(String method) + public void setMethod(String method) { this.method = method; } - public String getMethod() + public String getMethod() { return method; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStockDetailId(String stockDetailId) + public void setStockDetailId(String stockDetailId) { this.stockDetailId = stockDetailId; } - public String getStockDetailId() + public String getStockDetailId() { return stockDetailId; } - public void setOperatingTarget(String operatingTarget) + public void setOperatingTarget(String operatingTarget) { this.operatingTarget = operatingTarget; } - public String getOperatingTarget() + public String getOperatingTarget() { return operatingTarget; } - public void setBarCodeOldQuantity(String barCodeOldQuantity) + public void setBarCodeOldQuantity(String barCodeOldQuantity) { this.barCodeOldQuantity = barCodeOldQuantity; } - public String getBarCodeOldQuantity() + public String getBarCodeOldQuantity() { return barCodeOldQuantity; } - public void setBarCodeQuantity(String barCodeQuantity) + public void setBarCodeQuantity(String barCodeQuantity) { this.barCodeQuantity = barCodeQuantity; } - public String getBarCodeQuantity() + public String getBarCodeQuantity() { return barCodeQuantity; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java index cd7999c..47fe408 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存操作记录对象 bas_stock_maintain_record - * + * * @author ruoyi * @date 2025-05-26 */ @@ -25,6 +25,7 @@ public class BasStockMaintainRecord extends BaseEntity /** 货位编码 */ @Excel(name = "货位编码") private String cargoSpaceId; + private String cargoSpaceName; /** 托盘条码 */ @Excel(name = "托盘条码") @@ -61,6 +62,7 @@ public class BasStockMaintainRecord extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; /** 库存字表id */ @Excel(name = "库存字表id") @@ -82,172 +84,188 @@ public class BasStockMaintainRecord extends BaseEntity @Excel(name = "物料guid") private String productGuid; - public void setWhGuid(String whGuid) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public void setWhGuid(String whGuid) { this.whGuid = whGuid; } - public String getWhGuid() + public String getWhGuid() { return whGuid; } - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setPrintDate(String printDate) + public void setPrintDate(String printDate) { this.printDate = printDate; } - public String getPrintDate() + public String getPrintDate() { return printDate; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setOldQuantity(String oldQuantity) + public void setOldQuantity(String oldQuantity) { this.oldQuantity = oldQuantity; } - public String getOldQuantity() + public String getOldQuantity() { return oldQuantity; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setMethod(String method) + public void setMethod(String method) { this.method = method; } - public String getMethod() + public String getMethod() { return method; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStockDetailId(String stockDetailId) + public void setStockDetailId(String stockDetailId) { this.stockDetailId = stockDetailId; } - public String getStockDetailId() + public String getStockDetailId() { return stockDetailId; } - public void setOperatingTarget(String operatingTarget) + public void setOperatingTarget(String operatingTarget) { this.operatingTarget = operatingTarget; } - public String getOperatingTarget() + public String getOperatingTarget() { return operatingTarget; } - public void setBarCodeOldQuantity(String barCodeOldQuantity) + public void setBarCodeOldQuantity(String barCodeOldQuantity) { this.barCodeOldQuantity = barCodeOldQuantity; } - public String getBarCodeOldQuantity() + public String getBarCodeOldQuantity() { return barCodeOldQuantity; } - public void setBarCodeQuantity(String barCodeQuantity) + public void setBarCodeQuantity(String barCodeQuantity) { this.barCodeQuantity = barCodeQuantity; } - public String getBarCodeQuantity() + public String getBarCodeQuantity() { return barCodeQuantity; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java index 40874b7..fc7f45a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 库存信息Controller - * + * * @author ruoyi * @date 2025-05-24 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java index c809cfb..9ff8be9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java @@ -1,5 +1,6 @@ package com.ruoyi.stock.stock.domain; +import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存信息对象 bas_stock - * + * * @author ruoyi * @date 2025-05-24 */ @@ -22,6 +23,7 @@ public class BasStock extends BaseEntity /** 货位id */ @Excel(name = "货位id") private String cargoSpaceId; + private String cargoSpaceName; /** 库存状态 */ @Excel(name = "库存状态") @@ -80,8 +82,10 @@ public class BasStock extends BaseEntity private String inClassId; /** 仓库 */ - @Excel(name = "仓库") + @Excel(name = "仓库Id") private String warehouseId; + @Excel(name = "仓库") + private String warehouseName; /** 垛型ID */ @Excel(name = "垛型ID") @@ -111,242 +115,286 @@ public class BasStock extends BaseEntity @Excel(name = "备用字段6") private String spare6; - public void setStockId(String stockId) + private ExtraField extraField; + private String productName; + private String cargoSpaceStatus; + + public String getCargoSpaceName() { + return cargoSpaceName; + } + + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + + public String getCargoSpaceStatus() { + return cargoSpaceStatus; + } + + public void setCargoSpaceStatus(String cargoSpaceStatus) { + this.cargoSpaceStatus = cargoSpaceStatus; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public ExtraField getExtraField() { + return extraField; + } + + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } + + public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setStockStatus(String stockStatus) + public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } - public String getStockStatus() + public String getStockStatus() { return stockStatus; } - public void setProductStatus(String productStatus) + public void setProductStatus(String productStatus) { this.productStatus = productStatus; } - public String getProductStatus() + public String getProductStatus() { return productStatus; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setInDate(String inDate) + public void setInDate(String inDate) { this.inDate = inDate; } - public String getInDate() + public String getInDate() { return inDate; } - public void setBackDate(String backDate) + public void setBackDate(String backDate) { this.backDate = backDate; } - public String getBackDate() + public String getBackDate() { return backDate; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setJobId(String jobId) + public void setJobId(String jobId) { this.jobId = jobId; } - public String getJobId() + public String getJobId() { return jobId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setOutQuantity(String outQuantity) + public void setOutQuantity(String outQuantity) { this.outQuantity = outQuantity; } - public String getOutQuantity() + public String getOutQuantity() { return outQuantity; } - public void setStockinDetailId(String stockinDetailId) + public void setStockinDetailId(String stockinDetailId) { this.stockinDetailId = stockinDetailId; } - public String getStockinDetailId() + public String getStockinDetailId() { return stockinDetailId; } - public void setStockinId(String stockinId) + public void setStockinId(String stockinId) { this.stockinId = stockinId; } - public String getStockinId() + public String getStockinId() { return stockinId; } - public void setInType(String inType) + public void setInType(String inType) { this.inType = inType; } - public String getInType() + public String getInType() { return inType; } - public void setInClassId(String inClassId) + public void setInClassId(String inClassId) { this.inClassId = inClassId; } - public String getInClassId() + public String getInClassId() { return inClassId; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStackingId(String stackingId) + public void setStackingId(String stackingId) { this.stackingId = stackingId; } - public String getStackingId() + public String getStackingId() { return stackingId; } - public void setSpare1(String spare1) + public void setSpare1(String spare1) { this.spare1 = spare1; } - public String getSpare1() + public String getSpare1() { return spare1; } - public void setSpare2(String spare2) + public void setSpare2(String spare2) { this.spare2 = spare2; } - public String getSpare2() + public String getSpare2() { return spare2; } - public void setSpare3(String spare3) + public void setSpare3(String spare3) { this.spare3 = spare3; } - public String getSpare3() + public String getSpare3() { return spare3; } - public void setSpare4(String spare4) + public void setSpare4(String spare4) { this.spare4 = spare4; } - public String getSpare4() + public String getSpare4() { return spare4; } - public void setSpare5(String spare5) + public void setSpare5(String spare5) { this.spare5 = spare5; } - public String getSpare5() + public String getSpare5() { return spare5; } - public void setSpare6(String spare6) + public void setSpare6(String spare6) { this.spare6 = spare6; } - public String getSpare6() + public String getSpare6() { return spare6; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java index f448ecf..8048f50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java @@ -1,19 +1,21 @@ package com.ruoyi.stock.stock.service; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.stock.stock.domain.BasStock; /** * 库存信息Service接口 - * + * * @author ruoyi * @date 2025-05-24 */ -public interface IBasStockService +public interface IBasStockService { /** * 查询库存信息 - * + * * @param stockId 库存信息主键 * @return 库存信息 */ @@ -21,7 +23,7 @@ public interface IBasStockService /** * 查询库存信息列表 - * + * * @param basStock 库存信息 * @return 库存信息集合 */ @@ -29,7 +31,7 @@ public interface IBasStockService /** * 新增库存信息 - * + * * @param basStock 库存信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IBasStockService /** * 修改库存信息 - * + * * @param basStock 库存信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IBasStockService /** * 批量删除库存信息 - * + * * @param stockIds 需要删除的库存信息主键集合 * @return 结果 */ @@ -53,7 +55,7 @@ public interface IBasStockService /** * 删除库存信息信息 - * + * * @param stockId 库存信息主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index 7fb60ce..e534ff1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -5,6 +5,12 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; +import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; +import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.bas.cargoSpace.service.impl.BasCargoSpaceServiceImpl; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; +import com.ruoyi.bas.warehouse.service.IBasWarehouseService; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; @@ -32,6 +38,8 @@ public class BasStockServiceImpl implements IBasStockService private IBasStockMaintainRecordService basStockMaintainRecordService; @Autowired private IBasStockFreezeRecordService basStockFreezeRecordService; + @Autowired + private IBasCargoSpaceService basCargoSpaceService; /** * 查询库存信息 @@ -70,21 +78,25 @@ public class BasStockServiceImpl implements IBasStockService return basStockMapper.insertBasStock(basStock); } - private void insertMaintainRecord(BasStock oldStock,BasStock basStock, String operate) { - BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); - basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); - basStockMaintainRecord.setStockId(basStock.getStockId()); - basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); - basStockMaintainRecord.setLotNo(basStock.getLotNo()); - basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); - basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); - basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); - basStockMaintainRecord.setCreateTime(new Date()); - basStockMaintainRecord.setOldQuantity(oldStock!=null?oldStock.getQuantity():"0"); - basStockMaintainRecord.setQuantity(basStock.getQuantity()); - basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); - basStockMaintainRecord.setMethod(operate); - basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) { + if (!oldStock.getQuantity().equals(basStock.getQuantity())){ + BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); + basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockMaintainRecord.setStockId(basStock.getStockId()); + basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockMaintainRecord.setLotNo(basStock.getLotNo()); + basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); + basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); + basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockMaintainRecord.setCreateTime(new Date()); + basStockMaintainRecord.setOldQuantity(oldStock != null ? oldStock.getQuantity() : "0"); + basStockMaintainRecord.setQuantity(basStock.getQuantity()); + basStockMaintainRecord.setProductId(basStock.getExtraField().getProductId()); + basStockMaintainRecord.setProductName(basStock.getExtraField().getMaterialDesc()); + basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); + basStockMaintainRecord.setMethod(operate); + basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + } } /** @@ -98,25 +110,31 @@ public class BasStockServiceImpl implements IBasStockService { BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId()); insertMaintainRecord(oldBasStock,basStock,"2"); - insertFreezeRecord(oldBasStock,basStock); + BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId()); + insertFreezeRecord(oldBasCargoSpace,basStock); return basStockMapper.updateBasStock(basStock); } - private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) { - if (!oldBasStock.getStockStatus().equals(basStock.getStockStatus())){ + private void insertFreezeRecord(BasCargoSpace oldBasCargoSpace, BasStock basStock) { + if (!oldBasCargoSpace.getLocked().equals(basStock.getCargoSpaceStatus())){ BasStockFreezeRecord basStockFreezeRecord = new BasStockFreezeRecord(); basStockFreezeRecord.setWhGuid(IdUtil.fastSimpleUUID()); - basStockFreezeRecord.setStockId(basStock.getStockId()); basStockFreezeRecord.setCargoSpaceId(basStock.getCargoSpaceId()); - basStockFreezeRecord.setLotNo(basStock.getLotNo()); basStockFreezeRecord.setTrayCode(basStock.getTrayCode()); - basStockFreezeRecord.setProductGuid(basStock.getProductGuid()); basStockFreezeRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); basStockFreezeRecord.setCreateTime(new Date()); - basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus()); - basStockFreezeRecord.setCurrStatus(basStock.getStockStatus()); + basStockFreezeRecord.setOldStatus(oldBasCargoSpace.getLocked()); + basStockFreezeRecord.setCurrStatus(basStock.getCargoSpaceStatus()); basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId()); - basStockFreezeRecord.setMethod("0"); + if ("N".equals(basStock.getCargoSpaceStatus())){ + basStockFreezeRecord.setMethod("解锁"); + }else { + basStockFreezeRecord.setMethod("锁定"); + } + BasCargoSpace basCargoSpace = new BasCargoSpace(); + basCargoSpace.setCargoSpaceId(basStock.getCargoSpaceId()); + basCargoSpace.setLocked(basStock.getCargoSpaceStatus()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); basStockFreezeRecordService.insertBasStockFreezeRecord(basStockFreezeRecord); } } @@ -156,4 +174,6 @@ public class BasStockServiceImpl implements IBasStockService public void insertBasStockList(List list) { basStockMapper.insertBasStockList(list); } + + } diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml index 21c7c54..4af03ad 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,18 +23,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - 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 - + - + and stock_id = #{stockId} - and cargo_space_id = #{cargoSpaceId} - and tray_code = #{trayCode} + and bsmr.cargo_space_id = #{cargoSpaceId} + and bsmr.tray_code = #{trayCode} and product_id = #{productId} and product_name like concat('%', #{productName}, '%') and print_date = #{printDate} @@ -42,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and old_quantity = #{oldQuantity} and quantity = #{quantity} and method = #{method} - and warehouse_id = #{warehouseId} + and bsmr.warehouse_id = #{warehouseId} and stock_detail_id = #{stockDetailId} and operating_target = #{operatingTarget} and bar_code_old_quantity = #{barCodeOldQuantity} @@ -50,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_guid = #{productGuid} - + - and stock_id = #{stockId} - and cargo_space_id = #{cargoSpaceId} - and stock_status = #{stockStatus} - and product_status = #{productStatus} - and lot_no = #{lotNo} - and in_date = #{inDate} - and back_date = #{backDate} - and product_guid = #{productGuid} - and quantity = #{quantity} - and job_id = #{jobId} - and tray_code = #{trayCode} - and out_quantity = #{outQuantity} - and stockin_detail_id = #{stockinDetailId} - and stockin_id = #{stockinId} - and in_type = #{inType} - and in_class_id = #{inClassId} - and warehouse_id = #{warehouseId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and bs.stock_id = #{stockId} + and bs.cargo_space_id = #{cargoSpaceId} + and bs.stock_status = #{stockStatus} + and bs.product_status = #{productStatus} + and bs.lot_no = #{lotNo} + and bs.in_date = #{inDate} + and bs.back_date = #{backDate} + and bs.product_guid = #{productGuid} + and bp.product_name = #{productName} + and bs.quantity = #{quantity} + and bs.job_id = #{jobId} + and bs.tray_code = #{trayCode} + and bs.out_quantity = #{outQuantity} + and bs.stockin_detail_id = #{stockinDetailId} + and bs.stockin_id = #{stockinId} + and bs.in_type = #{inType} + and bs.in_class_id = #{inClassId} + and bs.warehouse_id = #{warehouseId} + and bs.stacking_id = #{stackingId} + and bs.spare1 = #{spare1} + and bs.spare2 = #{spare2} + and bs.spare3 = #{spare3} + and bs.spare4 = #{spare4} + and bs.spare5 = #{spare5} + and bs.spare6 = #{spare6} diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 19e1937..6fb135b 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -563,6 +563,7 @@ export default { stockManagement: { stockId: 'Stock ID', cargoSpaceId: 'Cargo Space ID', + cargoSpaceName: 'Cargo Space Name', stockStatus: 'Stock Status', productStatus: 'Product Status', lotNo: 'Lot No', @@ -611,12 +612,23 @@ export default { addSuccess: 'Added successfully', editSuccess: 'Modified 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: { stockId: 'Stock ID', cargoSpaceId: 'Cargo Space ID', + cargoSpaceName: '货位名称', trayCode: 'Tray Code', productId: 'Product ID', productName: 'Product Name', @@ -674,7 +686,8 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?', - fileName: 'record_{time}' + fileName: 'record_{time}', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -734,7 +747,8 @@ export default { addSuccess: 'Added successfully', editSuccess: 'Modified 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: { //收货单据新增 @@ -782,7 +796,7 @@ export default { LogManagement_OperationLog: 'OperationLog', //登录日志 LogManagement_LoginLog: 'LoginLog', - + //********************系统监控******************** SystemMonitor: 'SystemMonitor', // 在线用户 @@ -1812,7 +1826,7 @@ export default { //--------------当前页面交互框操作提示-------------- placeholderJobName: 'Enter JobName', placeholderJobGroup: 'Select JobGroup', - + //---------------二级窗口操作提示------------------ placeholderInvokeTarget: 'Enter InvokeTarget', placeholderCronExpression: 'Enter CronExpression', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 2749108..51c1668 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -567,6 +567,7 @@ export default { stockManagement: { stockId: '库存id', cargoSpaceId: '货位id', + cargoSpaceName: '货位名称', stockStatus: '库存状态', productStatus: '物料状态', lotNo: '批次号', @@ -577,11 +578,12 @@ export default { jobId: '作业ID', trayCode: '托盘条码', outQuantity: '出库数量', - stockinDetailId: '入库子单id', + stockinDetailId: '入库子单', stockinId: '入库主单', inType: '入库类型', inClassId: '入库班组ID', warehouseId: '仓库', + warehouseName: 'WarehouseName', stackingId: '垛型ID', operation: '操作', add: '新增', @@ -604,7 +606,7 @@ export default { inputJobId: '请输入作业ID', inputTrayCode: '请输入托盘条码', inputOutQuantity: '请输入出库数量', - inputStockinDetailId: '请输入入库子单id', + inputStockinDetailId: '请输入入库子单', inputStockinId: '请输入入库主单', inputInClassId: '请输入入库班组ID', inputWarehouseId: '请输入仓库', @@ -615,12 +617,25 @@ export default { addSuccess: '新增成功', editSuccess: '修改成功', deleteSuccess: '删除成功', - confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？' + confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？', + materialDesc:'物料描述', + materialInDesc:'物料描述', + englishDesc:'英文描述', + netWeight:'净重', + length:'长', + width:'宽', + height:'高', + volume:'体积', + productId:'物料编码', + cargoSpaceStatus: '货位状态' + + }, // *************库存操作记录*************** stockRecord: { stockId: '库存编码', cargoSpaceId: '货位编码', + cargoSpaceName: '货位名称', trayCode: '托盘条码', productId: '物品编码', productName: '物品名称', @@ -678,7 +693,8 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？', - fileName: '记录{time}' + fileName: '记录{time}', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -738,7 +754,11 @@ export default { addSuccess: '新增成功', editSuccess: '修改成功', deleteSuccess: '删除成功', - deleteConfirm: '是否确认删除所选库存冻结记录？' + deleteConfirm: '是否确认删除所选库存冻结记录？', + createTime: '创建时间', + oldStatus: '原状态', + currStatus: '新状态', + cargoSpaceName: '货位名称', }, menu: { @@ -1773,7 +1793,7 @@ export default { //--------------当前页面交互框操作提示-------------- placeholderJobName: '请输入任务名称', placeholderJobGroup: '请选择任务组名', - + //---------------二级窗口操作提示------------------ placeholderInvokeTarget: '请输入调用目标字符串', placeholderCronExpression: '请输入Cron执行表达式', diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue index 3fec1c2..b0da38d 100644 --- a/ruoyi-ui/src/views/stock/freeze/index.vue +++ b/ruoyi-ui/src/views/stock/freeze/index.vue @@ -1,14 +1,14 @@