diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 7db8e133e..c022ecaa9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -631,23 +631,23 @@ public class StockInOrderDomainService { // Integer level = (Integer) stringObjectMap.get("level"); // 如果 materialDetailId 不为空,则更新上架单明细 - if (stringObjectMap.containsKey("materialDetailId")) { - Long materialDetailId = (Long) stringObjectMap.get("materialDetailId"); - ShelfMaterialDetail detail = shelfMaterialDetailService.getById(materialDetailId); - detail.setShelvesQuantity(shelvesQuantity); - detail.setAlreadyShelvesQuantity(shelvesQuantity); - detail.setWarehouseId(warehouseId); - detail.setStorageSectionId(storageSectionId); - detail.setStorageLocationId(storageLocationId); - detail.setWarehouseCode(warehouseCode); - detail.setWarehouseName(warehouseName); - detail.setStorageCode(storageCode); - detail.setStorageName(storageName); - detail.setStorageLocationCode(storageLocationCode); - detail.setStorageLocationName(storageLocationName); - shelfMaterialDetailService.updateById(detail); - continue; - } +// if (stringObjectMap.containsKey("materialDetailId")) { +// Long materialDetailId = (Long) stringObjectMap.get("materialDetailId"); +// ShelfMaterialDetail detail = shelfMaterialDetailService.getById(materialDetailId); +// detail.setShelvesQuantity(shelvesQuantity); +// detail.setAlreadyShelvesQuantity(shelvesQuantity); +// detail.setWarehouseId(warehouseId); +// detail.setStorageSectionId(storageSectionId); +// detail.setStorageLocationId(storageLocationId); +// detail.setWarehouseCode(warehouseCode); +// detail.setWarehouseName(warehouseName); +// detail.setStorageCode(storageCode); +// detail.setStorageName(storageName); +// detail.setStorageLocationCode(storageLocationCode); +// detail.setStorageLocationName(storageLocationName); +// shelfMaterialDetailService.updateById(detail); +// continue; +// } // 如果 materialDetailId 为空,则创建上架单明细 List list = stockShelfOrderService.list(new QueryWrapper().lambda() @@ -665,6 +665,10 @@ public class StockInOrderDomainService { .eq(ShelfMaterialDetail::getMaterialBaseInfoId, materialBaseInfoId) .eq(ShelfMaterialDetail::getInUniqueId, uniqueId) .eq(ShelfMaterialDetail::getDelFlag, 1), false); + shelfMaterialDetailService.remove(new QueryWrapper().lambda() + .eq(ShelfMaterialDetail::getLevel, 2) + .ne(ShelfMaterialDetail::getParentUniqueId, 0l) + .eq(ShelfMaterialDetail::getDelFlag, 1)); if (one != null) { if (index == 0) { one.setShelvesQuantity(shelvesQuantity);