From 571d5b02dfd976493138fb54409cd5309d4a690f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 20:20:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=A3=85=E8=BD=A6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 ddcc77a78..40495df6a 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 @@ -5084,7 +5084,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl goodsLsit = trayTypeDataVO.getGoodsLsit(); if (Func.isNotEmpty(goodsLsit)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index ce6263211..e6c011e6f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2893,7 +2893,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 20:44:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WarehouseTrayTypeServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index e6c011e6f..a738cef38 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2893,7 +2893,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 20:51:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index a738cef38..585e01b91 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2897,7 +2897,6 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 22:34:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/thread/JobRegistryMonitorHelper.java | 4 +- .../admin/core/thread/JobScheduleHelper.java | 2 +- .../impl/BasicdataGoodsShelfServiceImpl.java | 3 +- .../impl/BasicdataVehicleServiceImpl.java | 2 +- .../impl/DistributionAsyncServiceImpl.java | 14 +- .../DistributionDeliveryListServiceImpl.java | 7 +- .../impl/DistributionSignforServiceImpl.java | 416 +++++++++--------- .../DistributionStockArticleServiceImpl.java | 8 +- .../impl/DistributionStockupServiceImpl.java | 6 +- .../ZbFactoryAccountsInterceptor.java | 2 +- .../service/impl/OuPaiFactoryServiceImpl.java | 2 +- .../service/impl/TaskQuestServiceImpl.java | 6 +- 12 files changed, 225 insertions(+), 247 deletions(-) diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index 1e91014f7..ea6001eeb 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -78,14 +78,14 @@ public class JobRegistryMonitorHelper { } } catch (Exception e) { if (!toStop) { - logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e); } } try { TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); } catch (InterruptedException e) { if (!toStop) { - logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e); } } } diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 765161a94..d2a3163de 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -143,7 +143,7 @@ public class JobScheduleHelper { } catch (Exception e) { if (!scheduleThreadToStop) { - logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:", e); } } finally { diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index 3a7eac048..b6965786a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -121,8 +121,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); - return basicdataGoodsShelfVOIPage; + return basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index 1cccc09f3..7ce8876f4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java @@ -165,7 +165,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl data) { String method = "#############BasicdataVehicleServiceImpl.importDriverArtery"; - log.info("车辆模板导入信息>>>>",data); + log.info("车辆模板导入信息>>>>{}",data); try { ListdrivermiddleEntities = new ArrayList<>(); //对导入数据进行处理 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 6161b3d81..879382d5c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1439,13 +1439,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { break; case "欧派": //推送到欧派 - try { - // ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*// - // log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName ); - } catch (Exception e) { - throw new RuntimeException(e); - } +// try { +// // ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*// +// // log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName ); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } break; + default: + log.info("开单其它品牌stockArticleEntity.getBrand() ={}",stockArticleEntity.getBrand()); //其他..... } } 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 40495df6a..3d340533b 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 @@ -4587,8 +4587,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = list.stream().filter(l -> !l.getScanStatus().equals(LoadingStatusConstant.quxiao.getValue())).map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); int loadingNum = list.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum(); rs.setLoadedinNumber(loadingNum); - HashSet strings = new HashSet<>(); - strings.addAll(collect); + HashSet strings = new HashSet<>(collect); rs.setScanUser(String.join(",", strings)); if (loadingNum > 0 && loadingNum == rs.getReservationNum()) { @@ -5653,12 +5652,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); if (Func.isEmpty(reservationStockarticleEntityList)) { - log.error("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId()); + log.info("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId()); return null; } List orderIds = reservationStockarticleEntityList.stream().filter(rs -> Func.isNotEmpty(rs.getIsZero()) && rs.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); if (Func.isEmpty(orderIds)) { - log.error("####################配送任务下无零担信息:{}"); + log.info("####################配送任务下无零担信息:{}",orderIds); return Resp.scanFail("查询错误", "该任务无零担订单"); } List parcelNumberVOS = new ArrayList<>(); 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 013f12daa..a41811904 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 @@ -47,7 +47,6 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.jetbrains.annotations.NotNull; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; @@ -209,7 +208,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { @@ -241,7 +239,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl0){ + if (Func.isNotEmpty(list) && list.size() > 0) { zhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); // weizhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); qianshoujianshu += list.stream().filter(f -> f.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); @@ -538,8 +536,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignPrintList = new ArrayList<>(); distributionSignfor.getMap().forEach((k, v) -> { - v.stream().forEach(i -> { + v.forEach(i -> { DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); BeanUtils.copyProperties(i, distributionSignPrint); distributionSignPrint.setId(null); @@ -821,16 +819,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = Func.toLongList(zeroPackageIds); @@ -884,13 +885,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionLoadscanEntity::getReservationId, reservationId) .in(DistributionLoadscanEntity::getPackageId, list) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); - if (Func.isEmpty(loadscanEntity)){ - if ("1".equals(deliveryListEntity.getKind())){ + if (Func.isEmpty(loadscanEntity)) { + if ("1".equals(deliveryListEntity.getKind())) { //自主配送 driverPhone = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverPhone).collect(Collectors.joining(",")); driverName = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverName).collect(Collectors.joining(",")); vehicleNub = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getVehicleNub).collect(Collectors.joining(",")); List collect = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getId).collect(Collectors.toList()); loadingId = collect.get(0); - }else if ("2".equals(deliveryListEntity.getKind())){ + } else if ("2".equals(deliveryListEntity.getKind())) { //外协 - }else { - log.error(method+"配送司机异常:{}",distrilbutionloadingscanDTO.getDeliveryId()); + } else { + log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } a = distributionParcelNumberEntity.getHandQuantity() - reservationZeroPackageEntity.getQuantity(); @@ -986,7 +987,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListDTOS = distrilbutionloadingscanDTO.getParcelListDTOS(); - if (parcelListDTOS.size()>1 || parcelListDTOS.size() == 0){ - log.error(method+"提交零担订单错误:{}",distrilbutionloadingscanDTO.getDeliveryId()); + if (parcelListDTOS.size() > 1 || parcelListDTOS.size() == 0) { + log.error(method + "提交零担订单错误:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } DistributionParcelNumberDTO distributionParcelNumberDTO = parcelListDTOS.get(0); - if (distributionParcelNumberDTO.getNumber() > reservationZeroPackageEntities.getQuantity()){ + if (distributionParcelNumberDTO.getNumber() > reservationZeroPackageEntities.getQuantity()) { //超过计划数 - log.error(method+"签收零担订单数量超过计划数错误:{}",distributionParcelNumberDTO.getParcelListId()); - return R.fail("请联系管理员"); + log.error(method + "签收零担订单数量超过计划数错误:{}", distributionParcelNumberDTO.getParcelListId()); + return R.fail("请联系管理员"); } //查询零担包件详情 DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() @@ -1085,26 +1086,26 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); //在库数 - int a =0; + int a = 0; //签收数 - int b =0; + int b = 0; //出库数 - int c =0; + int c = 0; //冻结数 - int d =0; - if (Func.isEmpty(loadscanEntity)){ + int d = 0; + if (Func.isEmpty(loadscanEntity)) { - if ("1".equals(deliveryListEntity.getKind())){ + if ("1".equals(deliveryListEntity.getKind())) { //自主配送 driverPhone = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverPhone).collect(Collectors.joining(",")); driverName = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverName).collect(Collectors.joining(",")); vehicleNub = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getVehicleNub).collect(Collectors.joining(",")); List collect = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getId).collect(Collectors.toList()); loadingId = collect.get(0); - }else if ("2".equals(deliveryListEntity.getKind())){ + } else if ("2".equals(deliveryListEntity.getKind())) { //外协 - }else { - log.error(method+"配送司机异常:{}",distrilbutionloadingscanDTO.getDeliveryId()); + } else { + log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } a = distributionParcelNumberDTO.getHandQuantity() - reservationZeroPackageEntities.getQuantity(); @@ -1158,7 +1159,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0){ + if (stockupNum > 0) { DeliveryNodeVo middleStockUpNodeVo = new DeliveryNodeVo(); middleStockUpNodeVo.setNodeName(StockUpNode.beihuozhong.getName()); //查询备货扫描列表 @@ -1226,20 +1227,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); for (Long id : userId) { R userR = userClient.userInfoById(id); - if (Func.isNotEmpty(userR)){ + if (Func.isNotEmpty(userR)) { scanUser.add(userR.getData().getName()); } } middleStockUpNodeVo.setNodeUserName(String.join(",", scanUser)); List collect = distributionStockEntities.stream().map(DistributionStockEntity::getCreateTime).distinct().collect(Collectors.toList()); middleStockUpNodeVo.setTime(Collections.max(collect)); - if (stockupNum.equals(stockUpPlanNum)){ + if (stockupNum.equals(stockUpPlanNum)) { middleStockUpNodeVo.setNodeName(StockUpNode.yiwancheng.getName()); } - middleStockUpNodeVo.setNodeInfo("计划备货"+stockUpPlanNum+"件;"+"备货"+stockupNum+"件;"); + middleStockUpNodeVo.setNodeInfo("计划备货" + stockUpPlanNum + "件;" + "备货" + stockupNum + "件;"); nodeVos.add(middleStockUpNodeVo); } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1257,29 +1258,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl0){ + if (loadingNum > 0) { //存在装车环境,进行数量的比对 DeliveryNodeVo middleBillLadingNodeVo = new DeliveryNodeVo(); middleBillLadingNodeVo.setNodeName(BillLadingNode.qianshouzhong.getName()); - if (loadingNum.equals(billLadingNum)){ + if (loadingNum.equals(billLadingNum)) { middleBillLadingNodeVo.setNodeName(BillLadingNode.qianshouwancheng.getName()); } //自提签收的操作人 List distributionBillLadingScanEntityList = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId,distrilbutionBillLadingEntity.getId()) + .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) ); List userName = new ArrayList<>(); - if (Func.isNotEmpty(distributionBillLadingScanEntityList)){ + if (Func.isNotEmpty(distributionBillLadingScanEntityList)) { List userIds = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateUser).distinct().collect(Collectors.toList()); - if (Func.isNotEmpty(userIds)){ + if (Func.isNotEmpty(userIds)) { //查询用户 for (Long userId : userIds) { R userR = userClient.userInfoById(userId); - if (Func.isNotEmpty(userR)){ + if (Func.isNotEmpty(userR)) { userName.add(userR.getData().getName()); } } @@ -1288,22 +1289,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl collect = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateTime).distinct().collect(Collectors.toList()); Date max = Collections.max(collect); middleBillLadingNodeVo.setTime(max); - middleBillLadingNodeVo.setNodeUserName(String.join(",",userName)); - middleBillLadingNodeVo.setNodeInfo("计划自提"+billLadingNum+"件,"+"装车"+loadingNum+"件"); + middleBillLadingNodeVo.setNodeUserName(String.join(",", userName)); + middleBillLadingNodeVo.setNodeInfo("计划自提" + billLadingNum + "件," + "装车" + loadingNum + "件"); nodeVos.add(middleBillLadingNodeVo); } - if (distrilbutionBillLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())){ + if (distrilbutionBillLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())) { //文员完成确动作 DeliveryNodeVo endBillLadingNodeVo = new DeliveryNodeVo(); endBillLadingNodeVo.setNodeName(BillLadingNode.yiwancheng.getName()); endBillLadingNodeVo.setTime(distrilbutionBillLadingEntity.getUpdateTime()); String endUserName = userClient.userInfoById(distrilbutionBillLadingEntity.getUpdateUser()).getData().getName(); endBillLadingNodeVo.setNodeUserName(endUserName); - endBillLadingNodeVo.setNodeInfo("计划自提"+billLadingNum+"件,"+"签收"+loadingNum+"件"); + endBillLadingNodeVo.setNodeInfo("计划自提" + billLadingNum + "件," + "签收" + loadingNum + "件"); nodeVos.add(endBillLadingNodeVo); } } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1322,11 +1323,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0){ + if (loadingNum > 0) { DeliveryNodeVo middleReservationNodeVo = new DeliveryNodeVo(); middleReservationNodeVo.setNodeName(ReservationNode.zhuangchezhong.getName()); //查询预约装车操作人有那些 @@ -1337,7 +1338,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); List loadingTime = new ArrayList<>(); - if (Func.isNotEmpty(loadscanEntityList)){ + if (Func.isNotEmpty(loadscanEntityList)) { List packageScanUser = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(packageScanUser); List packagheLoadingTime = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanTime).collect(Collectors.toList()); @@ -1347,30 +1348,30 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl InventoryScanUser = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(InventoryScanUser); List inventoryLoadingTime = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanTime).collect(Collectors.toList()); loadingTime.addAll(inventoryLoadingTime); } - if (Func.isNotEmpty(scanUser)){ + if (Func.isNotEmpty(scanUser)) { String scanUsers = scanUser.stream().distinct().collect(Collectors.joining(",")); middleReservationNodeVo.setNodeUserName(scanUsers); } - if (Func.isNotEmpty(loadingTime)){ + if (Func.isNotEmpty(loadingTime)) { String max = Collections.max(loadingTime); middleReservationNodeVo.setTime(sdf.parse(max)); } - if (reservationEntity.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())){ + if (reservationEntity.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())) { middleReservationNodeVo.setNodeName(ReservationNode.zhuangchewancheng.getName()); } - middleReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件"+"装车"+loadingNum+"件"); + middleReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件" + "装车" + loadingNum + "件"); nodeVos.add(middleReservationNodeVo); } Integer signingNum = distributionLoadscanMapper.selectSigningNumByReservationId(reservationEntity.getId()); - if (signingNum>0){ + if (signingNum > 0) { DeliveryNodeVo endReservationNodeVo = new DeliveryNodeVo(); endReservationNodeVo.setNodeName(ReservationNode.qianshouzhong.getName()); //查询预约装车操作人有那些 @@ -1381,7 +1382,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); List signTime = new ArrayList<>(); - if (Func.isNotEmpty(loadscanEntityList)){ + if (Func.isNotEmpty(loadscanEntityList)) { List packageScanUser = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(packageScanUser); List packagheSignTimeTime = loadscanEntityList.stream().map(DistributionLoadscanEntity::getSigningTime).collect(Collectors.toList()); @@ -1393,40 +1394,40 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl inventoryScanUser = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(inventoryScanUser); List inventorySignTimeTime = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getSigningTime).collect(Collectors.toList()); signTime.addAll(inventorySignTimeTime); } - if (Func.isNotEmpty(scanUser)){ + if (Func.isNotEmpty(scanUser)) { String scanUsers = scanUser.stream().distinct().collect(Collectors.joining(",")); endReservationNodeVo.setNodeUserName(scanUsers); } - if (Func.isNotEmpty(signTime)){ + if (Func.isNotEmpty(signTime)) { String max = Collections.max(signTime); endReservationNodeVo.setTime(sdf.parse(max)); } - if (reservationEntity.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue())){ + if (reservationEntity.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue())) { endReservationNodeVo.setNodeName(ReservationNode.qianshouwancheng.getName()); } - endReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件;"+"装车"+loadingNum+"件;"+"签收"+signingNum+"件"); + endReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件;" + "装车" + loadingNum + "件;" + "签收" + signingNum + "件"); nodeVos.add(endReservationNodeVo); } //查询此预约是否完成复核 DistributionSignforEntity signforEntity = distributionSignforMapper.selectByReservationId(reservationEntity.getId()); - if (Func.isNotEmpty(signforEntity)){ - if (signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())){ + if (Func.isNotEmpty(signforEntity)) { + if (signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())) { DeliveryNodeVo signReservationNodeVo = new DeliveryNodeVo(); signReservationNodeVo.setTime(sdf.parse(signforEntity.getSigningTime())); signReservationNodeVo.setNodeUserName(signforEntity.getExamineUserName()); signReservationNodeVo.setNodeName(ReservationNode.fuhewancheng.getName()); - signReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件;"+"装车"+loadingNum+"件;"+"签收"+signingNum+"件"); + signReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件;" + "装车" + loadingNum + "件;" + "签收" + signingNum + "件"); nodeVos.add(signReservationNodeVo); } } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1436,49 +1437,49 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleDeliveryNode(DistributionDeliveryListEntity deliveryListEntity) { List nodeVos = new ArrayList<>(); try { - String deliveryStatus = deliveryListEntity.getDeliveryStatus(); - //存在该配送任务一定存在创建时间 - DeliveryNodeVo deliveryNodeVo = new DeliveryNodeVo(); - deliveryNodeVo.setTime(deliveryListEntity.getCreateTime()); - String name = userClient.userInfoById(deliveryListEntity.getCreateUser()).getData().getName(); - deliveryNodeVo.setNodeUserName(name); - deliveryNodeVo.setNodeName(DeliveryNode.chuangjianchenggong.getName()); - deliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())); - nodeVos.add(deliveryNodeVo); + String deliveryStatus = deliveryListEntity.getDeliveryStatus(); + //存在该配送任务一定存在创建时间 + DeliveryNodeVo deliveryNodeVo = new DeliveryNodeVo(); + deliveryNodeVo.setTime(deliveryListEntity.getCreateTime()); + String name = userClient.userInfoById(deliveryListEntity.getCreateUser()).getData().getName(); + deliveryNodeVo.setNodeUserName(name); + deliveryNodeVo.setNodeName(DeliveryNode.chuangjianchenggong.getName()); + deliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub())); + nodeVos.add(deliveryNodeVo); Integer loadingNum = distributionLoadscanMapper.selectLoadingNumByDeliveryId(deliveryListEntity.getId()); - if (loadingNum != 0){ - DistributionDeliverySelfEntity distributionDeliverySelfEntity= distributionDeliverySelfMapper.selectByDeliveyId(deliveryListEntity.getId()); - if (Func.isEmpty(distributionDeliverySelfEntity)){ - log.error(deliveryListEntity.getKind()+"配送任务的配送方式"); + if (loadingNum != 0) { + DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectByDeliveyId(deliveryListEntity.getId()); + if (Func.isEmpty(distributionDeliverySelfEntity)) { + log.error(deliveryListEntity.getKind() + "配送任务的配送方式"); return nodeVos; } //司机点击发车按钮 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DeliveryNodeVo middleDeliveryNodeVo = new DeliveryNodeVo(); middleDeliveryNodeVo.setNodeUserName(distributionDeliverySelfEntity.getDriverName()); - if(Func.isNotEmpty(distributionDeliverySelfEntity.getDepartureTime())){ + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDepartureTime())) { middleDeliveryNodeVo.setTime(sdf.parse(distributionDeliverySelfEntity.getDepartureTime())); } middleDeliveryNodeVo.setNodeName(DeliveryNode.peisongzhong.getName()); - middleDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())+"件"+"装车"+loadingNum+"件"); + middleDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub()) + "件" + "装车" + loadingNum + "件"); nodeVos.add(middleDeliveryNodeVo); } - Integer signingNum = distributionLoadscanMapper.selectSigningNumByDeliveryId(deliveryListEntity.getId()); - if (signingNum != 0 && deliveryStatus.equals(DeliveryStatusConstant.yiwancheng.getValue())){ - DeliveryNodeVo endDeliveryNodeVo = new DeliveryNodeVo(); - String endName = userClient.userInfoById(deliveryListEntity.getUpdateUser()).getData().getName(); - endDeliveryNodeVo.setNodeUserName(endName); - endDeliveryNodeVo.setNodeName(DeliveryNode.yiwancheng.getName()); - endDeliveryNodeVo.setTime(deliveryListEntity.getUpdateTime()); - endDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())+"件"+"签收"+signingNum+"件"); - nodeVos.add(endDeliveryNodeVo); - } - //查询是否进行发车按钮 - } catch (ParseException e) { - throw new RuntimeException(e); + Integer signingNum = distributionLoadscanMapper.selectSigningNumByDeliveryId(deliveryListEntity.getId()); + if (signingNum != 0 && deliveryStatus.equals(DeliveryStatusConstant.yiwancheng.getValue())) { + DeliveryNodeVo endDeliveryNodeVo = new DeliveryNodeVo(); + String endName = userClient.userInfoById(deliveryListEntity.getUpdateUser()).getData().getName(); + endDeliveryNodeVo.setNodeUserName(endName); + endDeliveryNodeVo.setNodeName(DeliveryNode.yiwancheng.getName()); + endDeliveryNodeVo.setTime(deliveryListEntity.getUpdateTime()); + endDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub()) + "件" + "签收" + signingNum + "件"); + nodeVos.add(endDeliveryNodeVo); } + //查询是否进行发车按钮 + } catch (ParseException e) { + throw new RuntimeException(e); + } return nodeVos; } @@ -1532,8 +1533,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(signingInventoryList); - return detailDTOS; + return handleNumberDetailInventory(signingInventoryList); } /** @@ -1547,8 +1547,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(signingPackageList); - return detailDTOS; + return handleNumberDetailPackage(signingPackageList); } /** @@ -1562,8 +1561,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(unloadingInventoryList); - return detailDTOS; + return handleNumberDetailInventory(unloadingInventoryList); } /** @@ -1577,8 +1575,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(unLoadingPackageList); - return detailDTOS; + return handleNumberDetailPackage(unLoadingPackageList); } @@ -1593,8 +1590,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(inventoryLoadingList); - return detailDTOS; + return handleNumberDetailInventory(inventoryLoadingList); } /** @@ -1608,8 +1604,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(loadingPackageList); - return detailDTOS; + return handleNumberDetailPackage(loadingPackageList); } /** @@ -1622,7 +1617,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleNumberDetailPackage(List loadingPackageList) { List detailDTOS = new ArrayList<>(); - loadingPackageList.stream().forEach(p -> { + loadingPackageList.forEach(p -> { DistributionNumberDetailDTO distributionNumberDetailDTO = new DistributionNumberDetailDTO(); distributionNumberDetailDTO.setServiceNumber(p.getServiceNumber()); distributionNumberDetailDTO.setWaybillNumber(p.getWaybillNumber()); @@ -1737,8 +1732,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = new ArrayList<>(); distributionSignforList.forEach(d -> { - DistributionSignforOwnExcel signforExcel = Func.copy(d,DistributionSignforOwnExcel.class); - signforExcel.setLoadingTime(d.getLoadingTime()); + DistributionSignforOwnExcel signforExcel = Func.copy(d, DistributionSignforOwnExcel.class); + assert signforExcel != null; + signforExcel.setLoadingTime(d.getLoadingTime()); signforExcel.setDeliveryDriverPhone(d.getDriverPhone()); signforExcel.setDeliveryDriverName(d.getDriverName()); signforExcel.setReservationNum(d.getTotalNum()); signforExcel.setLoadedNumber(d.getPackageLoadingNum() + d.getInventoryLoadingNum()); - signforExcel.setReceivedQuantity(d.getPackageSigningNum()+d.getInventorySigningNum()); + signforExcel.setReceivedQuantity(d.getPackageSigningNum() + d.getInventorySigningNum()); signforExcel.setDeliveryStatusName(d.getDeliveryStatusName()); signforExcel.setDeliveryPhone(d.getDeliveryPhone()); signforExcel.setWithoutScanning(d.getTotalNum() - (d.getPackageLoadingNum() + d.getInventoryLoadingNum())); - signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum()+d.getInventorySigningNum())); + signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum() + d.getInventorySigningNum())); signforExcel.setConsignee(d.getConsignee()); list.add(signforExcel); }); @@ -1839,7 +1835,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { - msg.append("操作成功").append(abnormalSiginNum + "件"); + msg.append("操作成功").append(abnormalSiginNum).append("件"); } else { msg.append("操作失败"); } @@ -2695,7 +2693,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(orderId, Long.parseLong(distributionDeliveryList.getReservationId())); distributionAppStockArticleVO.setSignforNub(0); - if (Func.isNotEmpty(parcelNumberVOS)){ + if (Func.isNotEmpty(parcelNumberVOS)) { parcelNumberVOS.forEach(p -> { DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, orderId).eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); p.setLoadingNum(0); @@ -3284,7 +3280,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId()); if (!deliveryIds.isEmpty()) { - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds,null); + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds, null); } else { return page.setRecords(distributionAppDeliveryListVOS); } @@ -3295,9 +3291,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl warehouseIdList = getWarehouseIdList(); - log.info(">>> 仓库ID {}",warehouseIdList); + log.info(">>> 仓库ID {}", warehouseIdList); - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList); + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null, warehouseIdList); } @@ -3434,7 +3430,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId()); - if (distributionAppDeliverySelfVOS.size() > 0) { + if (!distributionAppDeliverySelfVOS.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); distributionAppDeliverySelfVOS.forEach(e -> { if (e.getIsMaster() == 2) { @@ -3444,7 +3440,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) { warehouseIdList.add(basicdataWarehouseEntity.getId()); } - }else{ + } else { warehouseIdList.add(myCurrentWarehouse.getId()); } return warehouseIdList; @@ -3504,7 +3499,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliverySelfEntity::getIsMaster, 2) @@ -4200,7 +4197,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntities = baseMapper.getSignforPackageList(signforEntity.getReservationId()); +// List parcelListEntities = baseMapper.getSignforPackageList(signforEntity.getReservationId()); List reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()) .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); @@ -4391,10 +4389,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { - List parcelListEntityList = null; - if (Func.isNotEmpty(myCurrentWarehouse)){ - parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId()); - }else { + List parcelListEntityList; + if (Func.isNotEmpty(myCurrentWarehouse)) { + parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId()); + } else { parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), null); } List parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList); @@ -4423,6 +4421,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { + v.forEach(i -> { DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); BeanUtils.copyProperties(i, distributionSignPrint); distributionSignPrint.setReservationId(distributionSignfor.getReservationId()); @@ -5129,7 +5109,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packagePallet, List stockListPallet) { - Set set = new HashSet<>(); - set.addAll(packagePallet); + Set set = new HashSet<>(packagePallet); for (String pallet : stockListPallet) { if (StringUtil.isBlank(pallet)) { @@ -500,8 +499,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageAllocation, List stockListAllocation) { - Set set = new HashSet<>(); - set.addAll(packageAllocation); + Set set = new HashSet<>(packageAllocation); for (String allocation : stockListAllocation) { if (StringUtil.isBlank(allocation)) { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java index bb9c842ac..97181d8d0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java @@ -39,7 +39,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor { String body = myRequestWrapper.getBody(); JSONObject bodyJson = JSONObject.parseObject(body); - log.info("bodyJson {}",bodyJson,toString()); + log.info("bodyJson ={}",bodyJson.toString()); Map params = new HashMap<>(); params.put("app_key",appKey); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 99c644ac5..1bcf982eb 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -581,7 +581,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo); if (Objects.isNull(factoryOrder)) { - log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息", orderStatusDTO.getUnitNo()); + log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息 {}", orderStatusDTO.getUnitNo()); return Resp.fail(400, "未查询到该单据推送订单信息"); } // 如何判断这个包间是非干仓配的数据 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 15b27a4a6..532d18661 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 @@ -772,7 +772,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntities = new ArrayList<>(); - taskSearchDTO.getQuestDetailIds().stream().forEach(i -> { + taskSearchDTO.getQuestDetailIds().forEach(i -> { QuestDetailEntity questDetail = new QuestDetailEntity(); - questDetail.setId(Long.valueOf(i)); + questDetail.setId(i); questDetail.setQuestStatus(0); questDetailEntities.add(questDetail); baseMapper.deleteQuestChild(taskSearchDTO.getQuestNum() + "_child", i);