From 2067311a293aa70f3131c98cd964ee0f0cad8942 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 4 Jun 2024 09:12:59 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1.=E4=B8=8A=E6=9E=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 22f596e547153474e91f03b3cfd991c10809ca62) --- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 5 ++++- 1 file changed, 4 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 908314712..e19676aa6 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 @@ -2412,7 +2412,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { From 0a3e2cd7ca07cd64148d2c5d7fca64f5737a5778 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 09:25:12 +0800 Subject: [PATCH 02/11] =?UTF-8?q?1.=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 060a827606a88e6fa26e001316ce8aa9e234d124) --- .../DistrilbutionBillLadingServiceImpl.java | 148 +++++++++--------- 1 file changed, 77 insertions(+), 71 deletions(-) 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 d98790833..34c888edd 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 @@ -3305,84 +3305,90 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl parcelListIds = new HashSet<>(); - for (int i = 0; i < split.length; i++) { - String s = split[i]; - //查询是不是上传图片 - List list1 = distributionPrintService.list(Wrappers.query().lambda() - .eq(DistributionPrintEntity::getBillLadingId, s) - ); - if (list1.isEmpty()) { - throw new ServiceException("请上传签收图片！！"); - } - int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); - int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); - int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); - if (count1 < 1 || count < 1 || count2 < 1) { - throw new ServiceException("请上传完整签收图片！！"); - } - //修改提货状态 - DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); - billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); - billLadingEntity.setId(Long.parseLong(s)); - this.updateById(billLadingEntity); - //完成备货状态 - distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); - //查询自提单是否完成扫描 - Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); - List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .eq(DistributionBillLadingScanEntity::getMaterialType, "2") - ); - if (Func.isNotEmpty(ladingScanEntities)) { - int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); - if (integer != sum) { - //存在资源释放操作 - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + try{ + for (int i = 0; i < split.length; i++) { + String s = split[i]; + //查询是不是上传图片 + List list1 = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, s) + ); + if (list1.isEmpty()) { + throw new ServiceException("请上传签收图片！！"); } - parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); - for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { - // 签收发送消息到工厂 - pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); + int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); + int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); + if (count1 < 1 || count < 1 || count2 < 1) { + throw new ServiceException("请上传完整签收图片！！"); + } + //修改提货状态 + DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); + billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); + billLadingEntity.setId(Long.parseLong(s)); + this.updateById(billLadingEntity); + //完成备货状态 + distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); + //查询自提单是否完成扫描 + Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); + List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() + .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) + .eq(DistributionBillLadingScanEntity::getMaterialType, "2") + ); + if (Func.isNotEmpty(ladingScanEntities)) { + int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); + if (integer != sum) { + //存在资源释放操作 + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + } + parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); + for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { + // 签收发送消息到工厂 + pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + } + } else { + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); } - } else { - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); - } - //修改订单状态 - List list = distrilbutionBillStockService.list(Wrappers.query().lambda() - .eq(DistrilbutionBillStockEntity::getBillLadingId, s) - .apply("order_status in ( '1' , '3')") + //修改订单状态 + List list = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, s) + .apply("order_status in ( '1' , '3')") // .or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).apply(DistrilbutionBillStockEntity::getOrderStatus, "2")) - ); - if (!list.isEmpty()) { - list.forEach(li -> { - DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); - stockArticleEntity.setId(li.getStockArticleId()); + ); + if (!list.isEmpty()) { + list.forEach(li -> { + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setId(li.getStockArticleId()); - List list2 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) - .apply("order_package_status != 70 ") - ); - if (list2.isEmpty()) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); - } else { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - //回退包件数据 - Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); - if (i1 > 0) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - distributionStockArticleService.updateById(stockArticleEntity); - }); - } - //处理库存品签收数据 - updateStock(s); + List list2 = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) + .apply("order_package_status != 70 ") + ); + if (list2.isEmpty()) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); + } else { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + //回退包件数据 + Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); + if (i1 > 0) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + distributionStockArticleService.updateById(stockArticleEntity); + }); + } + //处理库存品签收数据 + updateStock(s); - // 回传老系统自提数据 - sendOldSystem(Long.parseLong(s)); + // 回传老系统自提数据 + sendOldSystem(Long.parseLong(s)); + } + }catch (Exception e){ + log.error(">>>>>",e); + return false; } + // 回传工厂数据 sendFactory(myCurrentWarehouse, parcelListIds); @@ -3467,7 +3473,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Tue, 4 Jun 2024 09:12:59 +0800 Subject: [PATCH 03/11] =?UTF-8?q?1.=E4=B8=8A=E6=9E=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 22f596e547153474e91f03b3cfd991c10809ca62) --- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 5 ++++- 1 file changed, 4 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 908314712..e19676aa6 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 @@ -2412,7 +2412,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { From 744bef8fc658a221f1cf16d24a665ec731f51535 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 09:25:12 +0800 Subject: [PATCH 04/11] =?UTF-8?q?1.=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 060a827606a88e6fa26e001316ce8aa9e234d124) --- .../DistrilbutionBillLadingServiceImpl.java | 148 +++++++++--------- 1 file changed, 77 insertions(+), 71 deletions(-) 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 d98790833..34c888edd 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 @@ -3305,84 +3305,90 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl parcelListIds = new HashSet<>(); - for (int i = 0; i < split.length; i++) { - String s = split[i]; - //查询是不是上传图片 - List list1 = distributionPrintService.list(Wrappers.query().lambda() - .eq(DistributionPrintEntity::getBillLadingId, s) - ); - if (list1.isEmpty()) { - throw new ServiceException("请上传签收图片！！"); - } - int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); - int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); - int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); - if (count1 < 1 || count < 1 || count2 < 1) { - throw new ServiceException("请上传完整签收图片！！"); - } - //修改提货状态 - DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); - billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); - billLadingEntity.setId(Long.parseLong(s)); - this.updateById(billLadingEntity); - //完成备货状态 - distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); - //查询自提单是否完成扫描 - Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); - List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .eq(DistributionBillLadingScanEntity::getMaterialType, "2") - ); - if (Func.isNotEmpty(ladingScanEntities)) { - int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); - if (integer != sum) { - //存在资源释放操作 - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + try{ + for (int i = 0; i < split.length; i++) { + String s = split[i]; + //查询是不是上传图片 + List list1 = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, s) + ); + if (list1.isEmpty()) { + throw new ServiceException("请上传签收图片！！"); } - parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); - for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { - // 签收发送消息到工厂 - pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); + int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); + int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); + if (count1 < 1 || count < 1 || count2 < 1) { + throw new ServiceException("请上传完整签收图片！！"); + } + //修改提货状态 + DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); + billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); + billLadingEntity.setId(Long.parseLong(s)); + this.updateById(billLadingEntity); + //完成备货状态 + distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2); + //查询自提单是否完成扫描 + Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s)); + List ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() + .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) + .eq(DistributionBillLadingScanEntity::getMaterialType, "2") + ); + if (Func.isNotEmpty(ladingScanEntities)) { + int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); + if (integer != sum) { + //存在资源释放操作 + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); + } + parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); + for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { + // 签收发送消息到工厂 + pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering()); + } + } else { + distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); } - } else { - distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId()); - } - //修改订单状态 - List list = distrilbutionBillStockService.list(Wrappers.query().lambda() - .eq(DistrilbutionBillStockEntity::getBillLadingId, s) - .apply("order_status in ( '1' , '3')") + //修改订单状态 + List list = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, s) + .apply("order_status in ( '1' , '3')") // .or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).apply(DistrilbutionBillStockEntity::getOrderStatus, "2")) - ); - if (!list.isEmpty()) { - list.forEach(li -> { - DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); - stockArticleEntity.setId(li.getStockArticleId()); + ); + if (!list.isEmpty()) { + list.forEach(li -> { + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setId(li.getStockArticleId()); - List list2 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) - .apply("order_package_status != 70 ") - ); - if (list2.isEmpty()) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); - } else { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - //回退包件数据 - Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); - if (i1 > 0) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); - } - distributionStockArticleService.updateById(stockArticleEntity); - }); - } - //处理库存品签收数据 - updateStock(s); + List list2 = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId()) + .apply("order_package_status != 70 ") + ); + if (list2.isEmpty()) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); + } else { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + //回退包件数据 + Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s)); + if (i1 > 0) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } + distributionStockArticleService.updateById(stockArticleEntity); + }); + } + //处理库存品签收数据 + updateStock(s); - // 回传老系统自提数据 - sendOldSystem(Long.parseLong(s)); + // 回传老系统自提数据 + sendOldSystem(Long.parseLong(s)); + } + }catch (Exception e){ + log.error(">>>>>",e); + return false; } + // 回传工厂数据 sendFactory(myCurrentWarehouse, parcelListIds); @@ -3467,7 +3473,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Tue, 4 Jun 2024 09:53:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistrilbutionBillLadingServiceImpl.java | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) 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 d98790833..a78348955 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 @@ -3512,7 +3512,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl scanEntityList = new ArrayList<>(); AtomicReference num = new AtomicReference<>(0); if (ObjectUtils.isNotNull(list) && !list.isEmpty()) { //签收记录 @@ -3523,41 +3522,29 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl iterator = list.iterator(); while (iterator.hasNext()) { DistrilbutionBillPackageEntity next = iterator.next(); - boolean b = list1.stream().anyMatch(q -> q.getParcelListId().equals(next.getParceListId())); - if (b) { - //删除包件 - iterator.remove(); + if(ObjectUtils.isNotNull(next.getParceListId())){ + boolean b = list1.stream().anyMatch(q -> { + + if(ObjectUtils.isNotNull(q.getParcelListId())){ + return q.getParcelListId().equals(next.getParceListId()); + } + return false; + }); + if (b) { + //删除包件 + iterator.remove(); + } } - } - //添加包件签收记录 -// list.stream().forEach(i ->{ -// distributionParcelListService.lambdaUpdate() -// .set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue()) -// .eq(DistributionParcelListEntity::getId, i); -// DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity(); -// billLadingScan.setMaterialType("2"); -// billLadingScan.setScanType(2); -// billLadingScan.setParcelListId(i.getParceListId()); -// billLadingScan.setStockArticleId(i.getStockArticleId()); -// billLadingScan.setBillLadingId(billId); -// billLadingScan.setPacketBarCode( i.getPacketBarCode()); -// billLadingScan.setQuantity(i.getPacketNumber()); -// scanEntityList.add(billLadingScan); -// }); + } //回退包件信息 - list.stream().forEach(i -> { + list.forEach(i -> { DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); parcelListEntity.setId(i.getParceListId()); parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); distributionParcelListService.updateById(parcelListEntity); num.getAndSet(num.get() + 1); }); - - -// if(!scanEntityList.isEmpty()){ -// distributionBillLadingScanService.saveBatch(scanEntityList); -// } } return num.get(); } From 1f93551c24790ce987fa124e70a0d4ce6da50c27 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 10:35:59 +0800 Subject: [PATCH 06/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryDetailsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml index 45267788b..9f901ca9f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml @@ -95,7 +95,7 @@ ldsl.tray_name trayName, lds.allocation_title allocation, lddd.reality_quantity preparedQuantity, lddd.stock_status, - (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1) AS pick_up_quantity, + (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and ldbls.scan_type=2) AS pick_up_quantity, CASE WHEN ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id AND ldbls.material_type = 1 ) = 0 THEN From 00cbd21778a4dc6dc9da877a56ef9a6f3bffc24e Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 10:49:45 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 510977e92..467001036 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -798,8 +798,8 @@ FROM logpm_distribution_stockup_info AS ldsi LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id WHERE - ldsi.reservation_id = lds.reservation_id - ldsi.stock_status != 4 + ldsi.reservation_id = lds.reservation_id and + ldsi.stock_status != '4' ) AS forkliftName, CASE WHEN ldr.stockup_status ='10' THEN '待指派' From a6df1ff044d7e7bf5fc1b647892b9d7810d8aa32 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 4 Jun 2024 11:09:58 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=87=AA=E6=8F=90BUG=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=81=E9=85=8D=E9=80=81=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryInfoMapper.xml | 2 +- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 467001036..6f3ad4603 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -799,7 +799,7 @@ FROM LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id WHERE ldsi.reservation_id = lds.reservation_id and - ldsi.stock_status != '4' + AND ldsi.stock_status != '4' ) AS forkliftName, CASE WHEN ldr.stockup_status ='10' THEN '待指派' 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 2a0ae886a..5dec38340 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 @@ -3138,6 +3138,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list1 = distributionParcelListService.list(Wrappers.query().lambda() .in(DistributionParcelListEntity::getStockArticleId, ls) + .eq(DistributionParcelListEntity::getConditions, 1) ); From d7b75bc8a6a389d5d47ca1fa7edbb36b71160b55 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 4 Jun 2024 11:45:40 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=89=93=E6=89=98=E9=80=BB=E8=BE=91=E8=B5=B0=E9=98=9F?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../common/constant/RabbitConstant.java | 10 ++ .../patch/config/CustomMessageConverter.java | 155 ++++++++++++++++++ .../patch/config/RabbitMqConfiguration.java | 1 + .../patch/jobhandle/SyncOldTrayTypeData.java | 23 ++- .../jobhandle/SyncOrderInfoToPlatform.java | 38 +++++ .../mapper/WarehouseMappingDataMapper.java | 12 ++ .../mapper/WarehouseMappingDataMapper.xml | 43 +++++ .../service/IWarehouseMappingDataService.java | 13 ++ .../impl/WarehouseMappingDataServiceImpl.java | 30 ++++ .../controller/OldSystemPushController.java | 3 +- .../mapper/WarehouseUpdownTypeMapper.java | 4 + .../mapper/WarehouseUpdownTypeMapper.xml | 12 ++ .../receiver/OldTrayTypeListener.java | 65 ++++++++ .../service/IWarehouseUpdownTypeService.java | 4 + .../impl/WarehouseTrayTypeServiceImpl.java | 5 + .../impl/WarehouseUpdownTypeServiceImpl.java | 10 ++ 17 files changed, 419 insertions(+), 11 deletions(-) create mode 100644 blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index d54a35e6d..6b1921dd9 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-zhy"; /** * 工厂对接服务名称 diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 42e3c081e..1e2fea1f9 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -216,4 +216,14 @@ public interface RabbitConstant { /****************商家入库完结 end *************************/ + + /****************老系统推送打托数据 start *************************/ + + String OLD_TRAY_TYPE_QUEUE = "old_tray_type_queue" + ModuleNameConstant.DEVAUTH; + String OLD_TRAY_TYPE_EXCHANGE = "old_tray_type_exchange" + ModuleNameConstant.DEVAUTH; + String OLD_TRAY_TYPE_ROUTING = "old_tray_type_routing" + ModuleNameConstant.DEVAUTH; + + /****************老系统推送打托数据 start *************************/ + + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java new file mode 100644 index 000000000..ede01714d --- /dev/null +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java @@ -0,0 +1,155 @@ +package com.logpm.patch.config; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.ThreadLocalUtil; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.core.MessageProperties; +import org.springframework.amqp.support.converter.AllowedListDeserializingMessageConverter; +import org.springframework.amqp.support.converter.MessageConversionException; +import org.springframework.amqp.utils.SerializationUtils; +import org.springframework.beans.factory.BeanClassLoaderAware; +import org.springframework.http.HttpHeaders; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.remoting.rmi.CodebaseAwareObjectInputStream; +import org.springframework.stereotype.Component; +import org.springframework.util.ClassUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.io.*; +import java.util.List; +import java.util.Map; + +/** + * @author zhaoqiaobo + * @create 2024-05-08 + */ +@Component +public class CustomMessageConverter extends AllowedListDeserializingMessageConverter implements BeanClassLoaderAware { + + private volatile String defaultCharset = "UTF-8"; + private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); + private String codebaseUrl; + + @Deprecated + public void setCodebaseUrl(String codebaseUrl) { + this.codebaseUrl = codebaseUrl; + } + + @Override + public Object fromMessage(Message message) throws MessageConversionException { + Object content = null; + MessageProperties properties = message.getMessageProperties(); + if (properties != null) { + String contentType = properties.getContentType(); + if (contentType != null && contentType.startsWith("text")) { + String encoding = properties.getContentEncoding(); + if (encoding == null) { + encoding = "UTF-8"; + } + + try { + content = new String(message.getBody(), encoding); + } catch (UnsupportedEncodingException var8) { + throw new MessageConversionException("failed to convert text-based Message content", var8); + } + } else if (contentType != null && contentType.equals("application/x-java-serialized-object")) { + try { + content = SerializationUtils.deserialize(this.createObjectInputStream(new ByteArrayInputStream(message.getBody()), this.codebaseUrl)); + } catch (IllegalArgumentException | IllegalStateException | IOException var7) { + throw new MessageConversionException("failed to convert serialized Message content", var7); + } + } + } + Map headers = properties.getHeaders(); + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry entry : headers.entrySet()) { + if (StrUtil.equals("Blade-Auth", entry.getKey()) + || StrUtil.equals("Authorization", entry.getKey()) + || StrUtil.equals("blade-auth", entry.getKey()) + || StrUtil.equals("authorization", entry.getKey())) { + List value = (List) entry.getValue(); + for (Object o : value) { + httpHeaders.add(entry.getKey(), String.valueOf(o)); + } + } + } + ThreadLocalUtil.put("bladeContext", httpHeaders); + Object bladeUser = headers.get("bladeUser"); + MockHttpServletRequest request = new MockHttpServletRequest(); + BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class); + request.setAttribute("_BLADE_USER_REQUEST_ATTR_", bladeUser1); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); + if (content == null) { + content = message.getBody(); + } + return content; + } + + @Override + protected Message createMessage(Object object, MessageProperties messageProperties) throws MessageConversionException { + byte[] bytes = null; + if (object instanceof byte[]) { + bytes = (byte[]) object; + messageProperties.setContentType("application/octet-stream"); + } else if (object instanceof String) { + try { + bytes = ((String) object).getBytes(this.defaultCharset); + } catch (UnsupportedEncodingException var6) { + throw new MessageConversionException("failed to convert to Message content", var6); + } + + messageProperties.setContentType("text/plain"); + messageProperties.setContentEncoding(this.defaultCharset); + } else if (object instanceof Serializable) { + try { + bytes = SerializationUtils.serialize(object); + } catch (IllegalArgumentException var5) { + throw new MessageConversionException("failed to convert to serialized Message content", var5); + } + + messageProperties.setContentType("application/x-java-serialized-object"); + } + HttpHeaders headers = (HttpHeaders) ThreadLocalUtil.get("bladeContext"); + if (headers != null && !headers.isEmpty()) { + headers.forEach((key, values) -> { + values.forEach((value) -> { + messageProperties.setHeader(key, new String[]{value}); + }); + }); + } + BladeUser user = AuthUtil.getUser(); + BladeUser bladeUser = new BladeUser(); + bladeUser.setTenantId(user.getTenantId()); + bladeUser.setUserId(user.getUserId()); + bladeUser.setAccount(user.getAccount()); + bladeUser.setRoleId(user.getRoleId()); + messageProperties.setHeader("bladeUser", JSONUtil.toJsonStr(bladeUser)); + + if (bytes != null) { + messageProperties.setContentLength((long) bytes.length); + return new Message(bytes, messageProperties); + } else { + throw new IllegalArgumentException(this.getClass().getSimpleName() + " only supports String, byte[] and Serializable payloads, received: " + object.getClass().getName()); + } + } + + @Override + public void setBeanClassLoader(ClassLoader classLoader) { + this.beanClassLoader = beanClassLoader; + } + + protected ObjectInputStream createObjectInputStream(InputStream is, String codebaseUrl) throws IOException { + return new CodebaseAwareObjectInputStream(is, this.beanClassLoader, codebaseUrl) { + @Override + protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { + Class clazz = super.resolveClass(classDesc); + CustomMessageConverter.this.checkAllowedList(clazz); + return clazz; + } + }; + } +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java index 6cba8bca7..98cde1539 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java @@ -26,6 +26,7 @@ public class RabbitMqConfiguration { RabbitTemplate template = new RabbitTemplate(); template.setConnectionFactory(connectionFactory); template.setMandatory(true); + template.setMessageConverter(new CustomMessageConverter()); template.setConfirmCallback(new RabbitTemplate.ConfirmCallback() { @Override public void confirm(CorrelationData correlationData, boolean b, String s) { diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java index 67077eee9..61a52d835 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java @@ -8,7 +8,8 @@ import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.api.R; +import org.springblade.common.constant.RabbitConstant; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Component; import java.util.List; @@ -21,7 +22,7 @@ public class SyncOldTrayTypeData { private final IOldTrayTypeService oldTrayTypeService; private final ISyncOldTrayTypeClient syncOldTrayTypeClient; - + private final RabbitTemplate rabbitTemplate; @XxlJob("syncOldTrayTypeInfo") public ReturnT syncOldTrayTypeInfo(String param) { @@ -43,13 +44,17 @@ public class SyncOldTrayTypeData { Integer trayId = jsonObject.getInteger("trayId"); Integer oldWarehouseId = jsonObject.getInteger("warehouseId"); - R r = syncOldTrayTypeClient.budaOldTrayTypeData(orderPackageCode, trayId, type, oldWarehouseId); - int code = r.getCode(); - if(200 == code){ - oldTrayTypeService.updateSyncStatus(id,1); - }else{ - oldTrayTypeService.updateSyncNum(id,syncNum+1); - } + jsonObject.put("oldTrayTypeId",id); + + rabbitTemplate.convertAndSend(RabbitConstant.OLD_TRAY_TYPE_EXCHANGE,RabbitConstant.OLD_TRAY_TYPE_ROUTING, jsonObject.toJSONString()); + +// R r = syncOldTrayTypeClient.budaOldTrayTypeData(orderPackageCode, trayId, type, oldWarehouseId); +// int code = r.getCode(); +// if(200 == code){ +// oldTrayTypeService.updateSyncStatus(id,1); +// }else{ +// oldTrayTypeService.updateSyncNum(id,syncNum+1); +// } } return ReturnT.SUCCESS; diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index 43df6e19e..113479683 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -795,4 +795,42 @@ public class SyncOrderInfoToPlatform { } + @XxlJob("clearTrayTypeInfo") + public ReturnT clearTrayTypeInfo(String param) { + log.info("############clearTrayTypeInfo: 处理托盘重复数据 开始"); + List trayCodes = new ArrayList<>(); + if(StringUtil.isBlank(param)){ + trayCodes = warehouseMappingDataService.findExceptionTrayType(); + }else{ + if(param.contains(",")){ + String[] split = param.split(","); + trayCodes.addAll(Arrays.asList(split)); + }else{ + trayCodes.add(param); + } + } + + trayCodes.forEach(trayCode -> { + + List trayTypeIds = warehouseMappingDataService.findMoreTrayTypeIds(trayCode); + Long aLong = trayTypeIds.get(0); + trayTypeIds.remove(aLong); + + warehouseMappingDataService.updateTrayTypeId(aLong,trayCode); + + warehouseMappingDataService.updateTrayTypeDeleted(trayTypeIds); + + Integer num = warehouseMappingDataService.findTrayTypeNum(trayCode); + + warehouseMappingDataService.updateTrayTypeNum(num,aLong); + + }); + + log.info("############clearTrayTypeInfo: 处理托盘重复数据 完成"); + + return ReturnT.SUCCESS; + } + + + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index 39f8bb8d3..720c24e34 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -97,5 +97,17 @@ public interface WarehouseMappingDataMapper { void updateClearBillSignforStatus(@Param("singnforId") Long singnforId, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus); List findAllBillSign(@Param("id") Integer id); + + List findExceptionTrayType(); + + List findMoreTrayTypeIds(@Param("trayCode") String trayCode); + + void updateTrayTypeId(@Param("aLong") Long aLong, @Param("trayCode") String trayCode); + + void updateTrayTypeDeleted(@Param("trayTypeIds") List trayTypeIds); + + Integer findTrayTypeNum(@Param("trayCode") String trayCode); + + void updateTrayTypeNum(@Param("num") Integer num, @Param("aLong") Long aLong); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index 093f36b29..13be83268 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -306,4 +306,47 @@ and warehouse_id = #{warehouseId} + + + + + + update logpm_warehouse_tray_goods + set tray_type_id = #{trayTypeId} + where tray_code = #{trayCode} + and is_deleted = 0 + + + + update logpm_warehouse_tray_type + set is_deleted = 1 + where id in + + #{item} + + + + + + + update logpm_warehouse_tray_type + set num = #{num} + where id = #{aLong} + + diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java index cb0e28ea1..73c0d9fbe 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java @@ -87,4 +87,17 @@ public interface IWarehouseMappingDataService { List findPackageUpdownData(); void updatePackageUpdownStatus(Integer id, Integer syncStatus); + + List findExceptionTrayType(); + + List findMoreTrayTypeIds(String trayCode); + + void updateTrayTypeId(Long aLong,String trayCode); + + void updateTrayTypeDeleted(List trayTypeIds); + + Integer findTrayTypeNum(String trayCode); + + void updateTrayTypeNum(Integer num, Long aLong); + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java index cf23814c8..ed1b2b224 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java @@ -205,4 +205,34 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer public void updatePackageUpdownStatus(Integer id, Integer syncStatus) { warehouseMappingDataMapper.updatePackageUpdownStatus(id,syncStatus); } + + @Override + public List findExceptionTrayType() { + return warehouseMappingDataMapper.findExceptionTrayType(); + } + + @Override + public List findMoreTrayTypeIds(String trayCode) { + return warehouseMappingDataMapper.findMoreTrayTypeIds(trayCode); + } + + @Override + public void updateTrayTypeId(Long aLong,String trayCode) { + warehouseMappingDataMapper.updateTrayTypeId(aLong,trayCode); + } + + @Override + public void updateTrayTypeDeleted(List trayTypeIds) { + warehouseMappingDataMapper.updateTrayTypeDeleted(trayTypeIds); + } + + @Override + public Integer findTrayTypeNum(String trayCode) { + return warehouseMappingDataMapper.findTrayTypeNum(trayCode); + } + + @Override + public void updateTrayTypeNum(Integer num, Long aLong) { + warehouseMappingDataMapper.updateTrayTypeNum(num,aLong); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java index 6d91a6b7a..512e1ad1b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java @@ -185,7 +185,8 @@ public class OldSystemPushController { warehouseLog.setType(3); warehouseLogService.save(warehouseLog); - asyncDataService.sendTrayInfoByOrderPackageCode(trayInfoDTO); + rabbitTemplate.convertAndSend(RabbitConstant.OLD_TRAY_TYPE_EXCHANGE,RabbitConstant.OLD_TRAY_TYPE_ROUTING, JSONObject.toJSONString(trayInfoDTO)); +// asyncDataService.sendTrayInfoByOrderPackageCode(trayInfoDTO); warehouseLog.setStatus(1); warehouseLogService.updateById(warehouseLog); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java index 3365ca292..a10ea7ef7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java @@ -25,4 +25,8 @@ public interface WarehouseUpdownTypeMapper extends BaseMapper selectStockListByUpdownTypeId(@Param("updownTypeId") Long updownTypeId); + + void updateOldTrayTypeInfo(@Param("oldTrayTypeId") Long oldTrayTypeId, @Param("status") int status); + + void updateOldTrayTypeInfoNum(@Param("oldTrayTypeId") Long oldTrayTypeId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml index c522099d4..c7c88ec91 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml @@ -78,4 +78,16 @@ + + update sync_old_tray_type_log + set sync_status = #{status} + where id = #{oldTrayTypeId} + + + + update sync_old_tray_type_log + set sync_num = sync_num + 1 + where id = #{oldTrayTypeId} + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java new file mode 100644 index 000000000..455f8cf4c --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java @@ -0,0 +1,65 @@ +package com.logpm.warehouse.receiver; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.logpm.warehouse.dto.TrayInfoDTO; +import com.logpm.warehouse.service.IWarehouseUpdownTypeService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.RabbitConstant; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Objects; + +@Slf4j +@Component +@AllArgsConstructor +public class OldTrayTypeListener { + + private final IWarehouseUpdownTypeService warehouseUpdownTypeService; + + @RabbitListener(bindings = @QueueBinding( + value = @Queue(name = RabbitConstant.OLD_TRAY_TYPE_QUEUE), + exchange = @Exchange(name = RabbitConstant.OLD_TRAY_TYPE_EXCHANGE, type = ExchangeTypes.DIRECT), + key = RabbitConstant.OLD_TRAY_TYPE_ROUTING + )) + @Transactional(rollbackFor = Exception.class) + public void oldTrayTypeInfo(String msg) { + + JSONObject jsonObject = JSONUtil.parseObj(msg); + String orderPackageCode = jsonObject.getStr("orderPackageCode"); + Integer type = jsonObject.getInt("type"); + Integer trayId = jsonObject.getInt("trayId"); + Integer oldWarehouseId = jsonObject.getInt("warehouseId"); + Long oldTrayTypeId = jsonObject.getLong("oldTrayTypeId"); + + TrayInfoDTO trayInfoDTO = new TrayInfoDTO(); + trayInfoDTO.setTrayId(trayId); + trayInfoDTO.setType(type); + trayInfoDTO.setWarehouseId(oldWarehouseId); + trayInfoDTO.setOrderPackageCode(orderPackageCode); + + try{ + warehouseUpdownTypeService.sendTrayInfoByOrderPackageCode(trayInfoDTO); + + if(!Objects.isNull(oldTrayTypeId)){ + warehouseUpdownTypeService.updateOldTrayTypeInfo(oldTrayTypeId,1); + } + + }catch (Exception e){ + if(!Objects.isNull(oldTrayTypeId)){ + warehouseUpdownTypeService.updateOldTrayTypeInfoNum(oldTrayTypeId); + } + } + + + } + + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java index ab8bb945f..09efe254e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java @@ -91,4 +91,8 @@ public interface IWarehouseUpdownTypeService extends BaseService Date: Tue, 4 Jun 2024 11:46:44 +0800 Subject: [PATCH 10/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionDeliveryDetailsMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml index 9f901ca9f..a833a6be3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml @@ -95,7 +95,9 @@ ldsl.tray_name trayName, lds.allocation_title allocation, lddd.reality_quantity preparedQuantity, lddd.stock_status, - (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and ldbls.scan_type=2) AS pick_up_quantity, + (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and + ldbls.bill_lading_id=#{param.billLadingId} + ) AS pick_up_quantity, CASE WHEN ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id AND ldbls.material_type = 1 ) = 0 THEN From 762039946c6299a9cf9a88e4474fa55325bd723b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 4 Jun 2024 11:51:38 +0800 Subject: [PATCH 11/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 6b1921dd9..d54a35e6d 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-zhy"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称