From e604670bcf540e648bf6ef8f5594dbe2451a32c7 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Mon, 30 Mar 2026 15:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BA=93=E7=BC=96=E5=8F=B7=E5=92=8CLOT?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=88=E5=89=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA=E7=89=A9=E6=96=99=E6=98=8E=E7=BB=86=E8=A1=A8shelf=5Fm?= =?UTF-8?q?aterial=5Fdetail=E9=9C=80=E5=AD=98=E5=85=A5LOT=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialInventory/entity/MaterialInventory.java | 9 +++++++++ .../repository/po/MaterialInventoryPO.java | 8 ++++++++ .../entity/ShelfMaterialDetail.java | 4 ++++ .../service/StockShelfOrderDomainService.java | 11 +++++++++-- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java index ccaae3094..3bc7f928c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java @@ -227,4 +227,13 @@ public class MaterialInventory extends BaseVOEntity { @ApiModelProperty("条码") @Excel(name = "条码") private String barCode; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("LOT编号") + @Excel(name = "LOT编号") + private String LotNumber; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java index 10ba70242..f94b929ee 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java @@ -221,4 +221,12 @@ public class MaterialInventoryPO extends MaterialBasePO { @ApiModelProperty("条码") @Excel(name = "条码") private String barCode; + + @ApiModelProperty("入库单号") + @Excel(name = "入库单号") + private String inOrderNumber; + + @ApiModelProperty("LOT编号") + @Excel(name = "LOT编号") + private String LotNumber; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index 76e627527..f9c806f74 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -325,4 +325,8 @@ public class ShelfMaterialDetail extends BaseVOEntity { @ApiModelProperty("总面积(SQM)") @Excel(name = "总面积(SQM)") private BigDecimal totalArea; + + @ApiModelProperty("LOT编号") + @Excel(name = "LOT编号") + private String LotNumber; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index 026122a87..d291bb1aa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -649,12 +649,14 @@ public class StockShelfOrderDomainService { .collect(Collectors.toList()); } Long shipperId = stockReceiptOrderDO.getShipperId(); - MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId); + MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId,stockReceiptOrderDO.getInOrderNumber()); List materialInventoryPOS = materialInventoryMapper.selectListByWhere(param); MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectById(materialBaseInfoId); LoginUser loginUser = SecurityUtils.getLoginUser(); if (materialInventoryPOS.size() == 0) { MaterialInventory materialInventory = new MaterialInventory(); + materialInventory.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber()); + materialInventory.setLotNumber(shelfMaterialDetail.getLotNumber()); //仓库信息 materialInventory.setWarehouseId(stockReceiptOrderDO.getWarehouseId()); materialInventory.setWarehouseCode(stockReceiptOrderDO.getWarehouseCode()); @@ -802,6 +804,9 @@ public class StockShelfOrderDomainService { inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord); } else if (materialInventoryPOS.size() == 1) { MaterialInventory materialInventory = new MaterialInventory(); + materialInventory.setInOrderNumber(stockReceiptOrderDO.getInOrderNumber()); + materialInventory.setLotNumber(shelfMaterialDetail.getLotNumber()); + BigDecimal shelvesQuantity = shelfMaterialDetail.getShelvesQuantity(); shelvesQuantity = shelvesQuantity != null ? shelvesQuantity : BigDecimal.ZERO; MaterialInventoryPO materialInventoryPO = materialInventoryPOS.get(0); @@ -923,7 +928,7 @@ public class StockShelfOrderDomainService { } } - private MaterialInventory getParam(ShelfMaterialDetail shelfMaterialDetail, List fieldNames,Long shipperId){ + private MaterialInventory getParam(ShelfMaterialDetail shelfMaterialDetail, List fieldNames,Long shipperId,String inOrderNumber){ MaterialInventory param = new MaterialInventory(); param.setShipperId(shipperId); param.setWarehouseId(shelfMaterialDetail.getWarehouseId()); @@ -932,6 +937,8 @@ public class StockShelfOrderDomainService { param.setStorageLocationId(shelfMaterialDetail.getStorageLocationId()); param.setOrganizationId(shelfMaterialDetail.getOrganizationId()); param.setBatchNumber(shelfMaterialDetail.getBatchNumber()); + param.setLotNumber(shelfMaterialDetail.getLotNumber()); + param.setInOrderNumber(inOrderNumber); if (fieldNames.size() > 0) { for (String fieldName : fieldNames) { switch (fieldName) {