diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 1f69c8007..cc2731c2f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -180,7 +180,11 @@ public class HandoverTaskOrderDomainService { .eq(OutMaterialDetail::getOutOrderNumber, orderNumber)); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); - BigDecimal checkQuantity = outMaterialDetail.getPickingQuantity(); + BigDecimal checkQuantity = outMaterialDetail.getCheckQuantity(); + BigDecimal checkArea = outMaterialDetail.getCheckArea(); + BigDecimal checkVolume = outMaterialDetail.getCheckVolume(); + BigDecimal checkGrossWeight = outMaterialDetail.getCheckGrossWeight(); + BigDecimal checkNetWeight = outMaterialDetail.getCheckNetWeight(); MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId); if (materialInventoryPO != null) { //更新库存数量 @@ -192,8 +196,23 @@ public class HandoverTaskOrderDomainService { BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(checkQuantity); //分配后冻结数量 BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(checkQuantity); + + + BigDecimal oldArea = materialInventoryPO.getArea(); + BigDecimal oldVolume = materialInventoryPO.getVolume(); + BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight(); + BigDecimal oldNetWeight = materialInventoryPO.getNetWeight(); + BigDecimal newArea = oldArea.subtract(checkArea); + BigDecimal newVolume = oldVolume.subtract(checkVolume); + BigDecimal newGrossWeight = oldGrossWeight.subtract(checkGrossWeight); + BigDecimal newNetWeight = oldNetWeight.subtract(checkNetWeight); + materialInventoryPO.setInventoryQuantity(newInventoryQuantity); materialInventoryPO.setFreezeQuantity(newFreezeQuantity); + materialInventoryPO.setArea(newArea); + materialInventoryPO.setVolume(newVolume); + materialInventoryPO.setGrossWeight(newGrossWeight); + materialInventoryPO.setNetWeight(newNetWeight); MaterialInventory materialInventory = new MaterialInventory(); BeanUtils.copyProperties(materialInventoryPO, materialInventory); materialInventoryMapper.updateById(materialInventory); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 632a2512a..39f84b234 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -388,4 +388,20 @@ public class OutMaterialDetail extends BaseVOEntity { @TableField(exist = false) private BigDecimal actualQuantity; + + @ApiModelProperty("复核总净重(KG)") + @Excel(name = "复核总净重(KG)") + private BigDecimal checkNetWeight; + + @ApiModelProperty("复核总毛重(KG)") + @Excel(name = "复核总毛重(KG)") + private BigDecimal checkGrossWeight; + + @ApiModelProperty("复核总体积(CBM)") + @Excel(name = "复核总体积(CBM)") + private BigDecimal checkVolume; + + @ApiModelProperty("复核总面积(SQM)") + @Excel(name = "复核总面积(SQM)") + private BigDecimal checkArea; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 4e4a38941..8e2894dc6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -748,6 +748,11 @@ public class OutMaterialDetailImpl extends ServiceImpl