diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index f5d7a9c77..5f49f1a6c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -62,7 +62,7 @@ public enum WorkNodeEnums implements Serializable { CANCEL_DELIVERY(301030, "计划取消"), PLAN_BILLOFLADING(301040, "计划自提"), CANCEL_BILLOFLADING(301050, "取消自提"), - SIGN_BILLOFLADING(301050, "自提签收"), + SIGN_BILLOFLADING(301080, "自提签收"), PLAN_DISTRIBUTION(301060, "计划配车"), CANCEL_DISTRIBUTION(301070, "取消配车"), diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 888c38026..f84dc6f4d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -519,30 +519,46 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl { //查询有没有打托数据 - //查询包件有没有物料 - List list = distributionParcelDetailsService.list(Wrappers.query().lambda() - .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) - ); - if (!list.isEmpty()) { - //有 - list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) - .forEach((kk, vv) -> { - DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); - BeanUtil.copyProperties(vv.get(0), parcelListEntity); - parcelListEntity.setQuantity(sum); - parcelListEntity.setMaterialName(vv.get(0).getName()); - parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); - parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); - // 添加库存品信息 - //查询在库订单信息 - DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId()); - if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { - throw new ServiceException("订单的客户数据异常，无法转换！！"); - } - addStockList(distributionStockArticleEntity, parcelListEntity, 1); - }); +// //查询包件有没有物料 +// List list = distributionParcelDetailsService.list(Wrappers.query().lambda() +// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) +// ); +// if (!list.isEmpty()) { +// //有 +// list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) +// .forEach((kk, vv) -> { +// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); +// BeanUtil.copyProperties(vv.get(0), parcelListEntity); +// parcelListEntity.setQuantity(sum); +// parcelListEntity.setMaterialName(vv.get(0).getName()); +// parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); +// parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); +// // 添加库存品信息 +// //查询在库订单信息 +// DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId()); +// if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { +// throw new ServiceException("订单的客户数据异常，无法转换！！"); +// } +// addStockList(distributionStockArticleEntity, parcelListEntity, 1); +// }); +// } + + + + DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); + BeanUtil.copyProperties(v, parcelListEntity); + parcelListEntity.setQuantity(sum); + parcelListEntity.setMaterialName(i.getMaterialName()); + parcelListEntity.setMaterialCode(i.getMaterialCode()); + parcelListEntity.setMaterialUnit(i.getMaterialUnit()); + // 添加库存品信息 + //查询在库订单信息 + DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId()); + if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) { + throw new ServiceException("订单的客户数据异常，无法转换！！"); } - //修改状态 + addStockList(distributionStockArticleEntity, parcelListEntity, 1); +// //修改状态 DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); parcelList.setId(i.getId()); parcelList.setConditions(2); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 7dcf5b917..721fe03ae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1136,11 +1136,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); List ladingScanEntities = new ArrayList<>(); + StringBuilder builder = new StringBuilder(); + List logList = new ArrayList<>(); if (!packageMap.isEmpty()) { ladingScanEntities = handleSignPackage(packageMap, distrilbutionBillLading.getId(), myCurrentWarehouse); if (!ladingScanEntities.isEmpty()) { +// String orderPackageCodes = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(",")); + List orderPackageCodeList = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()); + for (String orderPackageCode : orderPackageCodeList) { + builder.append(orderPackageCode).append(","); + String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,自提任务号:" + billLadingEntity.getPickupBatch() ; + JSONObject aaa = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), orderPackageCode, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode()); + logList.add(aaa); +// orderPackageCodes.add(orderPackageCode); + } // 进行签收扫描数据补录 distributionBillLadingScanService.saveBatch(ladingScanEntities); - String collect = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(",")); - warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(collect, myCurrentWarehouse.getId(), "后台PC自提签收下架", false); +// String collect = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.joining(",")); + +// 进行日志记录 + +// warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(collect, myCurrentWarehouse.getId(), "后台PC自提签收下架", false); } + if (Func.isNotEmpty(builder)){ + String string = builder.deleteCharAt(builder.length() - 1).toString(); + warehouseUpdownTypeClient.downPackageOrDelTray(string, myCurrentWarehouse.getId(), "签收下架解托"); + + } + if (!logList.isEmpty()) { + trunklinePackageTrackLogClient.addPackageTrackLog(logList); + } } + //维护自提单状态 distrilbutionBillLading.setConditions(BillLadingStatusConstant.yitihuo.getValue()); distributionBillLadingScanService.list(Wrappers.query().lambda() @@ -3389,6 +3417,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl logList = new ArrayList<>(); + JSONObject aaa = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionBillLadingScan.getPacketBarCode(), content, WorkNodeEnums.SIGN_BILLOFLADING.getCode()); + logList.add(aaa); + trunklinePackageTrackLogClient.addPackageTrackLog(logList); } else { return Resp.scanFail("当前订单，包件不存在！！", "当前订单，包件不存在！！"); }