From 12e6ef9d9e64744f3d8746204334718aef8c74e9 Mon Sep 17 00:00:00 2001 From: shuishangtang <836181219@qq.com> Date: Fri, 10 Nov 2023 14:15:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E3=80=81=E5=B8=82?= =?UTF-8?q?=E9=85=8D=E5=92=8C=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=B8=AD=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/excel/DistributionCityExcel.java | 4 ++-- .../com/logpm/distribution/excel/DistributionMarketExcel.java | 2 +- .../com/logpm/distribution/excel/DistributionSelfExcel.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java index 4c5c06d9a..02583d4db 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java @@ -62,7 +62,7 @@ public class DistributionCityExcel implements Serializable { private String stockupArea; @ColumnWidth(20) - @ExcelProperty("指派状态;1-未指派、2-已指派") + @ExcelProperty("指派状态") private String assignStatus; @ColumnWidth(20) @@ -71,7 +71,7 @@ public class DistributionCityExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("备货人员") - private Long forklift; + private String forkliftName; @ColumnWidth(20) @ExcelProperty("所在托盘") diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java index d633b0446..97a0538a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java @@ -66,7 +66,7 @@ public class DistributionMarketExcel implements Serializable { private String stockupArea; @ColumnWidth(20) - @ExcelProperty("指派状态;1-未指派、2-已指派") + @ExcelProperty("指派状态") private String assignStatus; @ColumnWidth(20) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java index d8f593ed5..fbaaf8137 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java @@ -62,7 +62,7 @@ public class DistributionSelfExcel implements Serializable { private String stockupArea; @ColumnWidth(20) - @ExcelProperty("指派状态;1-未指派、2-已指派") + @ExcelProperty("指派状态") private String assignStatus; @ColumnWidth(20) @@ -71,7 +71,7 @@ public class DistributionSelfExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("备货人员") - private Long forklift; + private String forkliftName; @ColumnWidth(20) @ExcelProperty("所在托盘") From 26439b9129db7e9793e59058c32a4873d3cae87c Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 10 Nov 2023 15:05:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionStockupServiceImpl.java | 19 +++++-- .../api/WarehouseTaskApiController.java | 2 +- .../warehouse/service/ITaskQuestService.java | 4 ++ .../service/impl/TaskQuestServiceImpl.java | 53 +++++++++++++------ 4 files changed, 58 insertions(+), 20 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 1fbbd1802..735144d71 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1758,16 +1758,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list1 = new ArrayList<>(); + voList.forEach(i -> { //查询是否已备货 DistributionParcelListEntity byId = distributionParcelListService.getById(i.getParcelListId()); if(ObjectUtils.isNotNull(byId) && !byId.getOrderPackageStockupStatus().equals(OrderPackageStockupStatusConstant.yibeihu.getValue())){ DistributionStockEntity distributionStock = new DistributionStockEntity(); //修改包件备货状态 - DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); - parcelList.setId(i.getParcelListId()); - parcelList.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue()); - distributionParcelListService.updateById(parcelList); + +// DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); +// parcelList.setId(i.getParcelListId()); +// parcelList.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue()); +// distributionParcelListService.updateById(parcelList); //判断备货任务是否完成 if(one.getStockUpType().equals("3")){ @@ -1830,6 +1832,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl collect = voList.stream().map(DistributionStockPackageVO::getParcelListId).collect(Collectors.toList()); + boolean update = distributionParcelListService.update(Wrappers.lambdaUpdate() + .in(DistributionParcelListEntity::getId, collect) + .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue()) + ); + if(!update){ + log.info("包件备货信息修改失败!!"); + throw new ServiceException("包件备货信息修改失败！！"); + } //判断备货任务是否完成 if(one.getStockUpType().equals("3")){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java index 4dac1f33a..bb0de6ccb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java @@ -252,7 +252,7 @@ public class WarehouseTaskApiController { map.put("allocationCode",allocationCode); map.put("allNum",allNUm); map.put("finishNum",finishNUm); - map.put("list", ObjectUtils.isNotNull(list.getRecords()) ? list.getRecords() : null); + map.put("list", ObjectUtils.isNotNull(list) ? list.getRecords() : null); return R.data(map); }catch (CustomerException e){ log.warn(e.message); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index 4edbb36cc..b0bcd8361 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -112,6 +112,10 @@ public interface ITaskQuestService extends BaseService { */ IPage allocationDetailByStock(IPage page,TaskSearchDTO taskSearchDTO); + /** + * 修改包件信息 + * @param taskSearchDTO + */ void updateQuestSetail(TaskSearchDTO taskSearchDTO); /** 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 13b157f4f..3a324cf4f 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 @@ -1140,13 +1140,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questChildEntitys = taskQuestChildService.list(queryWrapper); List marketNames = null; - for (TaskQuestChildEntity childEntity : questChildEntitys) { - if (Objects.isNull(marketNames)) { - marketNames = new ArrayList<>(); + if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){ + for (TaskQuestChildEntity childEntity : questChildEntitys) { + if (Objects.isNull(marketNames)) { + marketNames = new ArrayList<>(); + } + marketNames.add(childEntity.getRefName()); } - marketNames.add(childEntity.getRefName()); + taskSearchDTO.setMarketNames(marketNames); } - taskSearchDTO.setMarketNames(marketNames); + //判断是否有明细数据存入 // QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); @@ -1198,13 +1201,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questChildEntitys = taskQuestChildService.list(queryWrapper); List marketNames = null; - for (TaskQuestChildEntity childEntity : questChildEntitys) { - if (Objects.isNull(marketNames)) { - marketNames = new ArrayList<>(); + + if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){ + for (TaskQuestChildEntity childEntity : questChildEntitys) { + if (Objects.isNull(marketNames)) { + marketNames = new ArrayList<>(); + } + marketNames.add(childEntity.getRefName()); } - marketNames.add(childEntity.getRefName()); + taskSearchDTO.setMarketNames(marketNames); } - taskSearchDTO.setMarketNames(marketNames); +// for (TaskQuestChildEntity childEntity : questChildEntitys) { +// if (Objects.isNull(marketNames)) { +// marketNames = new ArrayList<>(); +// } +// marketNames.add(childEntity.getRefName()); +// } +// taskSearchDTO.setMarketNames(marketNames); //判断是否有明细数据存入 // QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); @@ -1256,13 +1269,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questChildEntitys = taskQuestChildService.list(queryWrapper); List marketNames = null; - for (TaskQuestChildEntity childEntity : questChildEntitys) { - if (Objects.isNull(marketNames)) { - marketNames = new ArrayList<>(); + if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){ + for (TaskQuestChildEntity childEntity : questChildEntitys) { + if (Objects.isNull(marketNames)) { + marketNames = new ArrayList<>(); + } + marketNames.add(childEntity.getRefName()); } - marketNames.add(childEntity.getRefName()); + taskSearchDTO.setMarketNames(marketNames); } - taskSearchDTO.setMarketNames(marketNames); + +// for (TaskQuestChildEntity childEntity : questChildEntitys) { +// if (Objects.isNull(marketNames)) { +// marketNames = new ArrayList<>(); +// } +// marketNames.add(childEntity.getRefName()); +// } +// taskSearchDTO.setMarketNames(marketNames); //判断是否有明细数据存入 // QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); From 857655d8fbbb11cf672fe3015ff768bfd30bb83f Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 10 Nov 2023 15:10:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B4=E6=89=98=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E6=89=98=E7=9B=98=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 12 ++++++------ .../service/impl/DistributionSignforServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) 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 2eff66055..98b52e272 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 @@ -644,14 +644,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2)); boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId()))); if (reservationFlag) { + try { + warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId()); + }catch (Exception e){ + log.error("#################货物下架错误：{}",distrilbutionloadingscanDTO.getBarcode()); + return Resp.scanFail("装车失败", "装车失败"); + } List reservationLoadscanEntities = new ArrayList<>(); for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { - try { - warehouseUpdownTypeClient.downTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId()); - }catch (Exception e){ - log.error("#################货物下架错误：{}",parcelListEntity.getOrderPackageCode()); - return Resp.scanFail("装车失败", "装车失败"); - } if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 90e790a10..f7f2e201b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -487,11 +487,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + if (Func.isNotEmpty(orderIds)){ List stockArticleEntities = distributionStockArticleService.listByIds(orderIds); List printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId()); distributionSignforVO.setPrintVOList(printEntities); if (Func.isNotEmpty(stockArticleEntities)) { + distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities)); } }