From 76351c8f6ecca0e4bf6c37e8febf2d71cd677e82 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 3 Dec 2024 19:15:25 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E4=B8=BB=E8=A1=A8,?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB,Mapper.xml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E5=85=B1=E4=BA=AB=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E5=9B=BA=E5=AE=9A=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E3=80=81=E7=9B=98=E4=BA=8F=E6=95=B0?= =?UTF-8?q?=20=E6=89=80=E6=9C=89=E4=B8=8E=E6=95=B0=E9=87=8F=E6=9C=89?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E6=94=B9=E4=B8=BA?= =?UTF-8?q?Integer=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7Bom=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD=E7=9A=84=20?= =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=B7=A5=E5=BA=8F=E6=95=B0=E7=AD=89=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD?= =?UTF-8?q?=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=9F=E4=BA=A7Bom=E7=9A=84=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=96=B9=E6=B3=95?= =?UTF-8?q?,=E6=8A=8A=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E7=94=B1BigDecimal?= =?UTF-8?q?=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E6=8D=9F=E5=AF=B9=E8=B1=A1=20=E6=89=80=E6=9C=89=E4=B8=8E?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=83=BD=E6=94=B9=E4=B8=BAInteger=E7=B1=BB=E5=9E=8B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E5=AD=90=E8=A1=A8=E5=AF=B9=E8=B1=A1=20?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=8E=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E6=94=B9=E4=B8=BAInteger?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E7=9A=84=E5=AE=9E=E7=8E=B0=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=96=B9=E6=B3=95,=E6=8A=8A?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=B1BigDecimal=E6=94=B9=E4=B8=BAInteger?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=92=8C=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=AE=9E=E7=8E=B0=E5=B1=82=E6=96=B9=E6=B3=95?= =?UTF-8?q?,=E6=8A=8A=E5=85=A5=E5=BA=93=E6=95=B0=E7=AD=89=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=94=B1BigDecimal=E6=94=B9=E4=B8=BAInteger=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysMakeorderBom.java | 70 ++++++----- .../impl/SysMakeorderBomServiceImpl.java | 2 +- .../domain/WarehouseInventoryInquiry.java | 118 ++++++++++++------ .../WarehouseInventoryReportDamage.java | 28 ++--- .../WarehouseInventoryReportDamageChild.java | 16 +-- ...houseInventoryReportDamageServiceImpl.java | 22 ++-- .../impl/WarehouseOutOrderServiceImpl.java | 10 +- .../WarehouseStorageOrderServiceImpl.java | 18 +-- .../WarehouseInventoryInquiryMapper.xml | 18 ++- 9 files changed, 182 insertions(+), 120 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java index de8e5941..df1e61b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderBom.java @@ -94,24 +94,24 @@ public class SysMakeorderBom extends BaseEntity private Long sortNo; // 委外工序数 - private int processNum; + private Integer processNum; // 已委外数量 - private int hasOutNum; + private Integer hasOutNum; // 可用库存数 - private BigDecimal storageNum; + private Integer storageNum; // 已领料数 - private int hasPickNum; + private Integer hasPickNum; // 订单数量 - private int orderNum; + private Integer orderNum; // 客户期望交付时间 private Date deliveryTime; - private int finishNum; + private Integer finishNum; // 已完成数 public void setId(Long id) @@ -285,67 +285,69 @@ public class SysMakeorderBom extends BaseEntity this.warehouseDept = warehouseDept; } - public int getProcessNum() { + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + + public Date getDeliveryTime() { + return deliveryTime; + } + + public void setDeliveryTime(Date deliveryTime) { + this.deliveryTime = deliveryTime; + } + + + public Integer getProcessNum() { return processNum; } - public void setProcessNum(int processNum) { + public void setProcessNum(Integer processNum) { this.processNum = processNum; } - public int getHasOutNum() { + public Integer getHasOutNum() { return hasOutNum; } - public void setHasOutNum(int hasOutNum) { + public void setHasOutNum(Integer hasOutNum) { this.hasOutNum = hasOutNum; } - public BigDecimal getStorageNum() { + public Integer getStorageNum() { return storageNum; } - public void setStorageNum(BigDecimal storageNum) { + public void setStorageNum(Integer storageNum) { this.storageNum = storageNum; } - public int getHasPickNum() { + public Integer getHasPickNum() { return hasPickNum; } - public void setHasPickNum(int hasPickNum) { + public void setHasPickNum(Integer hasPickNum) { this.hasPickNum = hasPickNum; } - public String getMaterialModel() { - return materialModel; - } - - public void setMaterialModel(String materialModel) { - this.materialModel = materialModel; - } - - public int getOrderNum() { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum(int orderNum) { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } - public Date getDeliveryTime() { - return deliveryTime; - } - - public void setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - } - - public int getFinishNum() { + public Integer getFinishNum() { return finishNum; } - public void setFinishNum(int finishNum) { + public void setFinishNum(Integer finishNum) { this.finishNum = finishNum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java index eccf8f69..000282e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderBomServiceImpl.java @@ -81,7 +81,7 @@ public class SysMakeorderBomServiceImpl implements ISysMakeorderBomService // 获取可用库存数 WarehouseInventoryInquiry inquiry = inquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(bom.getMaterialNo()); if(inquiry == null){ - bom.setStorageNum(BigDecimal.ZERO); + bom.setStorageNum(0); }else{ bom.setStorageNum(inquiry.getAvailableStockNum()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java index 15b08207..d7b2b02d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryInquiry.java @@ -67,27 +67,39 @@ public class WarehouseInventoryInquiry extends BaseEntity /** 物料历史总数量 */ @Excel(name = "物料历史总数量", sort = 8) - private BigDecimal historicalTotal; + private Integer historicalTotal; + + /** 共享可用库存数 */ + private Integer sharedAvailableStockNum; + + /** 固定可用库存数*/ + private Integer fixedAvailableStockNum; + + /** 锁定库存数*/ + private Integer lockStockNum; + + /** 盘亏数*/ + private Integer stockLossesNum; /** 可用库存数 */ @Excel(name = "可用库存数", sort = 9) - private BigDecimal availableStockNum; + private Integer availableStockNum; /** 物料归属可用库存数 */ // @Excel(name = "物料归属可用库存数") - private BigDecimal attributionAvailableStockNum; + private Integer attributionAvailableStockNum; /** 物料无归属可用库存数 */ // @Excel(name = "物料无归属可用库存数") - private BigDecimal noattributionAvailableStockNum; + private Integer noattributionAvailableStockNum; /** 物料使用数 */ @Excel(name = "使用数", sort = 10) - private BigDecimal useNum; + private Integer useNum; /** 物料报损数 */ @Excel(name = "报损数", sort = 11) - private BigDecimal reportDamageNum; + private Integer reportDamageNum; /** 物料使用状态（0 使用中、1 已作废） */ @Excel(name = "使用状态", sort = 12, dictType = "useStatus") @@ -200,61 +212,89 @@ public class WarehouseInventoryInquiry extends BaseEntity { return materialSpecification; } - public void setHistoricalTotal(BigDecimal historicalTotal) - { + + + public Integer getHistoricalTotal() { + return historicalTotal; + } + + public void setHistoricalTotal(Integer historicalTotal) { this.historicalTotal = historicalTotal; } - public BigDecimal getHistoricalTotal() - { - return historicalTotal; + public Integer getSharedAvailableStockNum() { + return sharedAvailableStockNum; } - public void setAvailableStockNum(BigDecimal availableStockNum) - { - this.availableStockNum = availableStockNum; + + public void setSharedAvailableStockNum(Integer sharedAvailableStockNum) { + this.sharedAvailableStockNum = sharedAvailableStockNum; } - public BigDecimal getAvailableStockNum() - { + public Integer getFixedAvailableStockNum() { + return fixedAvailableStockNum; + } + + public void setFixedAvailableStockNum(Integer fixedAvailableStockNum) { + this.fixedAvailableStockNum = fixedAvailableStockNum; + } + + public Integer getLockStockNum() { + return lockStockNum; + } + + public void setLockStockNum(Integer lockStockNum) { + this.lockStockNum = lockStockNum; + } + + public Integer getStockLossesNum() { + return stockLossesNum; + } + + public void setStockLossesNum(Integer stockLossesNum) { + this.stockLossesNum = stockLossesNum; + } + + public Integer getAvailableStockNum() { return availableStockNum; } - public void setAttributionAvailableStockNum(BigDecimal attributionAvailableStockNum) - { - this.attributionAvailableStockNum = attributionAvailableStockNum; + + public void setAvailableStockNum(Integer availableStockNum) { + this.availableStockNum = availableStockNum; } - public BigDecimal getAttributionAvailableStockNum() - { + public Integer getAttributionAvailableStockNum() { return attributionAvailableStockNum; } - public void setNoattributionAvailableStockNum(BigDecimal noattributionAvailableStockNum) - { - this.noattributionAvailableStockNum = noattributionAvailableStockNum; + + public void setAttributionAvailableStockNum(Integer attributionAvailableStockNum) { + this.attributionAvailableStockNum = attributionAvailableStockNum; } - public BigDecimal getNoattributionAvailableStockNum() - { + public Integer getNoattributionAvailableStockNum() { return noattributionAvailableStockNum; } - public void setUseNum(BigDecimal useNum) - { - this.useNum = useNum; + + public void setNoattributionAvailableStockNum(Integer noattributionAvailableStockNum) { + this.noattributionAvailableStockNum = noattributionAvailableStockNum; } - public BigDecimal getUseNum() - { + public Integer getUseNum() { return useNum; } - public void setReportDamageNum(BigDecimal reportDamageNum) - { - this.reportDamageNum = reportDamageNum; + + public void setUseNum(Integer useNum) { + this.useNum = useNum; } - public BigDecimal getReportDamageNum() - { + public Integer getReportDamageNum() { return reportDamageNum; } - public void setMaterialUseStatus(String materialUseStatus) + + public void setReportDamageNum(Integer reportDamageNum) { + this.reportDamageNum = reportDamageNum; + } + + public void setMaterialUseStatus(String materialUseStatus) { this.materialUseStatus = materialUseStatus; } @@ -307,6 +347,10 @@ public class WarehouseInventoryInquiry extends BaseEntity .append("materialModel", getMaterialModel()) .append("materialSpecification", getMaterialSpecification()) .append("historicalTotal", getHistoricalTotal()) + .append("sharedAvailableStockNum", getSharedAvailableStockNum()) + .append("fixedAvailableStockNum", getFixedAvailableStockNum()) + .append("lockStockNum", getLockStockNum()) + .append("stockLossesNum", getStockLossesNum()) .append("availableStockNum", getAvailableStockNum()) .append("attributionAvailableStockNum", getAttributionAvailableStockNum()) .append("noattributionAvailableStockNum", getNoattributionAvailableStockNum()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java index 9742b786..56af7099 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java @@ -55,11 +55,11 @@ public class WarehouseInventoryReportDamage extends BaseEntity /** 物料数合计 */ @Excel(name = "物料数合计") - private int materialTotal; + private Integer materialTotal; /** 数量合计 */ @Excel(name = "数量合计") - private BigDecimal numTotal; + private Integer numTotal; /** 仓库ID */ @Excel(name = "仓库ID") @@ -198,25 +198,25 @@ public class WarehouseInventoryReportDamage extends BaseEntity { return materialName; } - public void setMaterialTotal(int materialTotal) - { - this.materialTotal = materialTotal; - } - public int getMaterialTotal() - { + + public Integer getMaterialTotal() { return materialTotal; } - public void setNumTotal(BigDecimal numTotal) - { - this.numTotal = numTotal; + + public void setMaterialTotal(Integer materialTotal) { + this.materialTotal = materialTotal; } - public BigDecimal getNumTotal() - { + public Integer getNumTotal() { return numTotal; } - public void setWarehouseCode(String warehouseCode) + + public void setNumTotal(Integer numTotal) { + this.numTotal = numTotal; + } + + public void setWarehouseCode(String warehouseCode) { this.warehouseCode = warehouseCode; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java index 81bea8e1..f579c2e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java @@ -59,7 +59,7 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity /** 实际报废数量 */ @Excel(name = "实际报废数量", sort = 6) - private BigDecimal actualScrapQuantity; + private Integer actualScrapQuantity; /** 报废类型 */ @Excel(name = "报废类型", sort = 8) @@ -189,16 +189,16 @@ public class WarehouseInventoryReportDamageChild extends BaseEntity { return materialBrand; } - public void setActualScrapQuantity(BigDecimal actualScrapQuantity) - { - this.actualScrapQuantity = actualScrapQuantity; - } - public BigDecimal getActualScrapQuantity() - { + public Integer getActualScrapQuantity() { return actualScrapQuantity; } - public void setScrapType(String scrapType) + + public void setActualScrapQuantity(Integer actualScrapQuantity) { + this.actualScrapQuantity = actualScrapQuantity; + } + + public void setScrapType(String scrapType) { this.scrapType = scrapType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java index 92c41a3b..6e8966d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java @@ -195,7 +195,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve String loginName = ShiroUtils.getLoginName(); warehouseInventoryReportDamage.setCreateBy(loginName); warehouseInventoryReportDamage.setCreateTime(DateUtils.getNowDate()); - BigDecimal sumTotal = BigDecimal.ZERO; + Integer sumTotal = 0; //报损子表数据 //判断子表数据是否为空 if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){ @@ -206,7 +206,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve throw new BusinessException("物料"+reportDamageChild.getMaterialNo()+"库存查询记录为空！请检查"); } //子表数据不为空，则插入子表数据 - sumTotal = sumTotal.add(reportDamageChild.getActualScrapQuantity()); + sumTotal += reportDamageChild.getActualScrapQuantity(); reportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); reportDamageChild.setReportDamageCode(newCode); if(warehouseInventoryReportDamage.getApplyTime()!=null){ @@ -242,12 +242,12 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve if(detailInsertResult<=0){ throw new BusinessException("新增库存历史失败！"); } - BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum(); - reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity()); - inventoryInquiry.setReportDamageNum(reportDamageNum); - BigDecimal availableNum = inventoryInquiry.getAvailableStockNum(); - availableNum = availableNum.subtract(damageChild.getActualScrapQuantity()); - inventoryInquiry.setAvailableStockNum(availableNum); +// BigDecimal reportDamageNum = inventoryInquiry.getReportDamageNum(); +// reportDamageNum = reportDamageNum.add(damageChild.getActualScrapQuantity()); +// inventoryInquiry.setReportDamageNum(reportDamageNum); +// BigDecimal availableNum = inventoryInquiry.getAvailableStockNum(); +// availableNum = availableNum.subtract(damageChild.getActualScrapQuantity()); +// inventoryInquiry.setAvailableStockNum(availableNum); inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); return inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); @@ -264,7 +264,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve // inquiryDetail.setMaterialUnit(damageChild.getMaterialUnit()); // inquiryDetail.setMaterialType(damageChild.getMaterialType()); inquiryDetail.setInventoryIncreaseDecrease("0"); - BigDecimal decreaseNum = damageChild.getActualScrapQuantity(); + Integer decreaseNum = damageChild.getActualScrapQuantity(); // inquiryDetail.setAvailableStockNum(decreaseNum); inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); @@ -283,13 +283,13 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve String loginName = ShiroUtils.getLoginName(); warehouseInventoryReportDamage.setUpdateBy(loginName); warehouseInventoryReportDamage.setUpdateTime(DateUtils.getNowDate()); - BigDecimal sumTotal = BigDecimal.ZERO; + Integer sumTotal = 0; if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){ //清除现在的子表信息 warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode()); for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()){ //子表数据不为空，则插入子表数据 - sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity()); + sumTotal += warehouseInventoryReportDamageChild.getActualScrapQuantity(); warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); warehouseInventoryReportDamageChild.setReportDamageCode(warehouseInventoryReportDamage.getReportDamageCode()); warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index c7969ed7..633d0bb2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -568,16 +568,16 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService // 更新物料对应库存查询记录 public int updateWarehouseInventoryInquiry(WarehouseOutOrderDetail outOrderDetail,WarehouseInventoryInquiry inventoryInquiry){ // 更新可用库存数 - BigDecimal stockNum = inventoryInquiry.getAvailableStockNum(); - if((stockNum.compareTo(BigDecimal.ZERO) <= 0)){ + Integer stockNum = inventoryInquiry.getAvailableStockNum(); + if(stockNum <= 0){ throw new BusinessException("出库失败！该物料无可用库存数"); } int outNum = outOrderDetail.getActualOutOrderSum(); - stockNum = stockNum.subtract(BigDecimal.valueOf(outNum)); + stockNum -= outNum; inventoryInquiry.setAvailableStockNum(stockNum); // 更新使用数 - BigDecimal useNum = inventoryInquiry.getUseNum(); - useNum = useNum.add(BigDecimal.valueOf(outNum)); + Integer useNum = inventoryInquiry.getUseNum(); + useNum += outNum; inventoryInquiry.setUseNum(useNum); inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 6b1ac73f..440a6a1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -736,11 +736,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS } //查询该物料报损数，更新库存查询报损数 List damageChildren = damageChildMapper.selectWarehouseInventoryReportDamageChildByMaterialNo(materialNo); - BigDecimal scrapSum = BigDecimal.ZERO; + Integer scrapSum = 0; if(StringUtils.isNotEmpty(damageChildren)){ for (WarehouseInventoryReportDamageChild damageChild:damageChildren) { - BigDecimal scrapNum = damageChild.getActualScrapQuantity(); - scrapSum = scrapSum.add(scrapSum); + Integer scrapNum = damageChild.getActualScrapQuantity(); + scrapSum += scrapSum; } } // 存在库存查询记录，更新可用库存数 @@ -748,14 +748,14 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS WarehouseInventoryInquiry inventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); // 增加可用库存数 Integer storage = warehouseStorageOrderDetail.getStorageNum(); - BigDecimal storagenum = BigDecimal.valueOf(storage); - BigDecimal avaliableStorage = inventoryInquiry.getAvailableStockNum(); - avaliableStorage = avaliableStorage.add(storagenum); + Integer storagenum = storage; + Integer avaliableStorage = inventoryInquiry.getAvailableStockNum(); + avaliableStorage += storagenum; inventoryInquiry.setAvailableStockNum(avaliableStorage); inventoryInquiry.setReportDamageNum(scrapSum); // 设置历史总数 - BigDecimal historicalTotal = inventoryInquiry.getHistoricalTotal(); - historicalTotal = historicalTotal.add(storagenum); + Integer historicalTotal = inventoryInquiry.getHistoricalTotal(); + historicalTotal += storagenum; inventoryInquiry.setHistoricalTotal(historicalTotal); inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); @@ -771,7 +771,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS inventoryInquiry.setMaterialType(warehouseStorageOrderDetail.getMaterialType()); inventoryInquiry.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod()); Integer storage = warehouseStorageOrderDetail.getStorageNum(); - BigDecimal storagenum = BigDecimal.valueOf(storage); + Integer storagenum = storage; // 设置历史总数 inventoryInquiry.setHistoricalTotal(storagenum); inventoryInquiry.setAvailableStockNum(storagenum); diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml index d2c6b79f..02da5d15 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryInquiryMapper.xml @@ -18,6 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -35,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select inventory_inquiry_id, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification,warehouse_dept, - historical_total, available_stock_num, attribution_available_stock_num, + historical_total, shared_available_stock_num, lock_stock_num, fixed_available_stock_num, stock_losses_num,available_stock_num, attribution_available_stock_num, noattribution_available_stock_num, use_num, report_damage_num, material_use_status, remark, create_time, create_by, update_by, update_time from warehouse_inventory_inquiry @@ -83,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_specification, warehouse_dept, historical_total, + shared_available_stock_num, + lock_stock_num, + fixed_available_stock_num, + stock_losses_num, available_stock_num, attribution_available_stock_num, noattribution_available_stock_num, @@ -108,6 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialSpecification}, #{warehouseDept}, #{historicalTotal}, + #{sharedAvailableStockNum}, + #{lockStockNum}, + #{fixedAvailableStockNum}, + #{stockLossesNum}, #{availableStockNum}, #{attributionAvailableStockNum}, #{noattributionAvailableStockNum}, @@ -137,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_specification = #{materialSpecification}, warehouse_dept = #{warehouseDept}, historical_total = #{historicalTotal}, + shared_available_stock_num = #{sharedAvailableStockNum}, + lock_stock_num = #{lockStockNum}, + fixed_available_stock_num = #{fixedAvailableStockNum}, + stock_losses_num = #{stockLossesNum}, available_stock_num = #{availableStockNum}, attribution_available_stock_num = #{attributionAvailableStockNum}, noattribution_available_stock_num = #{noattributionAvailableStockNum},