From 2fdd870f8762adb41018ece5bd26ee6bfd39b704 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 18:47:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E8=BD=AC=E9=85=8D=E9=80=81=E8=AE=A1=E5=88=92=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionReservationServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 6f41e9920..6701cc86b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2029,8 +2029,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl Date: Mon, 15 Jan 2024 18:48:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?'%Y-%m-%d=20%H:%i'=20sql=E5=A4=AA=E9=95=BF?= =?UTF-8?q?=20=E6=95=B4=E5=BD=A2=E6=97=B6=E9=97=B4=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml | 2 +- .../main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml | 2 +- .../logpm/patch/service/impl/SyncServiceTypeServiceImpl.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 80169f3f4..6a675d779 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -291,7 +291,7 @@ lwtg.tray_code trayCode, lwug.position_code positionCode, SUM(lwug.num) num, - GROUP_CONCAT(DISTINCT lwug.create_time SEPARATOR '、') upTime, + GROUP_CONCAT( DISTINCT DATE_FORMAT( lwug.create_time, '%Y-%m-%d %H:%i' ) SEPARATOR '、' ) AS upTime, GROUP_CONCAT(DISTINCT lwug.create_user SEPARATOR '、') upUser, (SELECT GROUP_CONCAT( DISTINCT ldsli.order_code) order_code FROM logpm_distribution_stock_list_info ldsli WHERE ldsli.incoming_batch = ldsl.incoming_batch diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml index b3722ce89..bd58d55a4 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml @@ -6,7 +6,7 @@ UPDATE logpm_distribution_stock_article ldsa LEFT JOIN logpm_basicdata_client lbc ON lbc.client_name = #{mallName} AND lbc.is_deleted = 0 - LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id + LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id AND lbsb.is_deleted = 0 SET ldsa.mall_id = COALESCE(lbc.id, ldsa.mall_id), ldsa.mall_code = COALESCE(lbc.client_code, ldsa.mall_code), ldsa.mall_name = COALESCE(lbc.client_name, ldsa.mall_name), diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java index 54560a76b..8128dd033 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java @@ -26,6 +26,7 @@ public class SyncServiceTypeServiceImpl implements ISyncServiceTypeService { @Override public void syncServiceType(String id, String warehouseName, String mallName) { + //根据包件码查询出订单号 DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(id); if (distributionParcelListEntity==null){ throw new ServiceException("订单号不存在"); From 6a915da8d5ae43cf332572260e28c1cde10d009f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 19:04:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=A2=A6=E5=A4=A9=E6=8E=A8=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforController.java | 13 ++++++++++++- .../impl/DistributionSignforServiceImpl.java | 16 ++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index b3622a502..83ba58abb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -30,6 +30,7 @@ import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.excel.DistributionSignforOwnExcel; +import com.logpm.distribution.service.IDistributionAsyncService; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; @@ -82,6 +83,8 @@ public class DistributionSignforController extends BladeController { private final IBasicdataWarehouseClient warehouseClient; + private final IDistributionAsyncService distributionAsyncService; + /** * 签收管理 详情 */ @@ -268,9 +271,18 @@ public class DistributionSignforController extends BladeController { @ApiOperation(value = "新增", notes = "传入distributionSignfor") public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(true); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + R r = distributionSignforService.oneclick(distributionSignfor); List packageCodes = (List)r.getData(); try{ + Map data = (Map) r.getData(); + if (Func.isNotEmpty(data)){ + List packageIds = (List) data.get("packageIds"); + Long signId = (Long) data.get("signId"); + distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); + distributionAsyncService.sendReviewFactory(signId,myCurrentWarehouse.getName() ,myCurrentWarehouse.getId()); + } String orderPackageCodes = null; for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ @@ -279,7 +291,6 @@ public class DistributionSignforController extends BladeController { orderPackageCodes = orderPackageCodes + "," +packageCode; } } - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); 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 e535a0b4a..6fc8880f2 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 @@ -2768,6 +2768,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = null; if (distributionDeliveryListEntity.getKind().equals("1")) { //自主 @@ -3139,11 +3141,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl