From cdd57524e22c01942f6ad9c80afa1f07d6eb14d6 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 29 Nov 2024 15:06:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/vo/CarsLoadAllOrderVO.java | 1 + .../mapper/TrunklineCarsLoadMapper.xml | 2 + .../service/impl/OpenOrderServiceImpl.java | 52 ++++++++++++------- .../impl/TrunklineCarsLoadServiceImpl.java | 39 ++++++++++++-- 4 files changed, 70 insertions(+), 24 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java index f2299ce5e..3b7129886 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java @@ -42,5 +42,6 @@ public class CarsLoadAllOrderVO implements Serializable { private String productName;//品类 private String type;//类型 private Date warehouseEntryTimeEnd;//入库时间 + private Date warehouseEntryTimeStart;//入库时间 } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 4f3510ecf..958404069 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -260,6 +260,7 @@ t.waybill_id waybillId, t.waybill_number waybillNo, t.entry_time_end warehouseEntryTimeEnd, + t.entry_time_start warehouseEntryTimeStart, t.tray_name trayName, lww.document_making_time createTime, lww.destination destination, @@ -284,6 +285,7 @@ ldsa.is_zero, IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num, max(ldpl.warehouse_entry_time_end) entry_time_end, + min(ldpl.warehouse_entry_time_end) entry_time_start, IF(ldsa.is_zero = 1,ldsa.trays,GROUP_CONCAT(DISTINCT ldpl.pallet)) tray_name from logpm_distribution_stock_article ldsa left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index f5cde3506..4560aaf21 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -763,6 +763,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); + //把updateAdvanceDetailList转化成以orderPackageCode为key的Map + Map advanceDetailEntityMap = updateAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity())); + List orderPackageCodes = new ArrayList<>(); String finalWaybillNo = waybillNo; @@ -790,6 +793,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Set stockArticleIds = new TreeSet<>(); parcelListEntities.forEach(parcelListEntity -> { + TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailEntityMap.get(parcelListEntity.getOrderPackageCode()); + if(!Objects.isNull(trunklineAdvanceDetailEntity)){ + parcelListEntity.setWeight(trunklineAdvanceDetailEntity.getWeight()); + parcelListEntity.setVolume(trunklineAdvanceDetailEntity.getVolume()); + } Long packageWarehouseId = parcelListEntity.getWarehouseId(); parcelListEntity.setWaybillId(waybillId); parcelListEntity.setWaybillNumber(finalWaybillNo); @@ -2320,6 +2328,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName()); updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName()); updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName()); + updateMaterialEntity.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume())); updateMaterialList.add(updateMaterialEntity); }); @@ -2530,11 +2539,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setServiceNum(advanceEntity.getServiceNum()); advanceDetailModel.setPackageStatus("0"); - String volume1 = importStandardOuPaiDTO.getVolume(); - if (StringUtil.isBlank(volume1)) { - volume1 = "0"; - } - advanceDetailModel.setVolume(new BigDecimal(volume1)); +// String volume1 = importStandardOuPaiDTO.getVolume(); +// if (StringUtil.isBlank(volume1)) { +// volume1 = "0"; +// } +// advanceDetailModel.setVolume(new BigDecimal(volume1)); String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName()) ? importStandardOuPaiDTO.getMaterialName() : ""; @@ -2543,23 +2552,28 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setMaterialCode(materialCode); advanceDetailModel.setMaterialName(materialName); + BigDecimal volume1 = advanceDetailModel.getVolume(); + if(volume1.compareTo(BigDecimal.ZERO) == 0){ + BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); + + if (!Objects.isNull(basicMaterialEntity)) { + advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); + + String weight = basicMaterialEntity.getWeight(); + if (StringUtil.isBlank(weight)) { + weight = "0"; + } + String volume2 = basicMaterialEntity.getVolume(); + if (StringUtil.isBlank(volume2)) { + volume2 = "0"; + } + advanceDetailModel.setWeight(new BigDecimal(weight)); + advanceDetailModel.setVolume(new BigDecimal(volume2)); + } + } - BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); - if (!Objects.isNull(basicMaterialEntity)) { - advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); - String weight = basicMaterialEntity.getWeight(); - if (StringUtil.isBlank(weight)) { - weight = "0"; - } - String volume2 = basicMaterialEntity.getVolume(); - if (StringUtil.isBlank(volume2)) { - volume2 = "0"; - } - advanceDetailModel.setWeight(new BigDecimal(weight)); - advanceDetailModel.setVolume(new BigDecimal(volume2)); - } // if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) { // Long materialId = materialMap.get(materialCode); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index b34325890..421e76039 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -4157,6 +4157,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl