From 9353a9d21a53a6956a4d24531dff32b66fdc8111 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 26 Apr 2024 15:17:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskQuestServiceImpl.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 37991fc78..5ce8d8385 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -603,21 +603,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = taskQuest.getList(); -// for (TaskQuestChildEntity taskQuestChildEntity : list) { -// taskQuestChildEntity.setWarehouseId(id); -// taskQuestChildEntity.setQuestId(taskQuest.getId()); -// -// } -// taskQuestChildService.saveBatch(list); -// //添加包件信息 -// List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); -// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); - } else { - addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); - } +// 存入子表 todo 暂时不要商场 +// if (!taskQuest.getList().isEmpty()) { +//// List list = taskQuest.getList(); +//// for (TaskQuestChildEntity taskQuestChildEntity : list) { +//// taskQuestChildEntity.setWarehouseId(id); +//// taskQuestChildEntity.setQuestId(taskQuest.getId()); +//// +//// } +//// taskQuestChildService.saveBatch(list); +//// //添加包件信息 +//// List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); +//// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); +// } else { +// addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); +// } + + addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); return save ? R.success("添加成功") : R.fail("添加失败"); } From 41a614138ec2e7cd5c3b988c62ae17f55dd08854 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 26 Apr 2024 15:34:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9FBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/ClerkCheckPushDataQueueHandler.java | 10 +++++++++- .../impl/DistributionDeliveryListServiceImpl.java | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java index 8491a8ccb..3bdc8ab10 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java @@ -235,7 +235,15 @@ public class ClerkCheckPushDataQueueHandler { if (ObjectUtils.isNotNull(user)) { assert user != null; signPushDataUnitDTO.setAdministratorsName(user.getName()); - signPushDataUnitDTO.setAdministratorsPhone(user.getPhone()); + if (ObjectUtils.isNotEmpty(user.getPhone())){ + signPushDataUnitDTO.setAdministratorsPhone(user.getPhone()); + }else { + if (ObjectUtils.isNotEmpty(user.getAccount())){ + signPushDataUnitDTO.setAdministratorsPhone(user.getAccount()); + }else { + log.info("用户无电话号码且账号信息为空>>用户名称:{}",user.getName()); + } + } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 3640f3a32..a57e6d52d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2058,6 +2058,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getOrderPackageCode, disStockListDetailEntity.getStockPackageCode()) + .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) + .eq(DistributionParcelListEntity::getMaterialCode, disStockListDetailEntity.getSku()) + ); + log.info(">>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},",disStockListDetailEntity.getStockPackageCode()); DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities); packageLockIds.add(distributionLoadscaninvnEntity.getInventoryPackageId()); distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);