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-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/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 9a6a70a5b..315d9391a 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 map = new HashMap<>(); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = null; if (distributionDeliveryListEntity.getKind().equals("1")) { //自主 @@ -3139,11 +3141,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 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("订单号不存在");