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-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index eb21e6291..66d6c3ca1 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -44,6 +44,7 @@ public enum WorkNodeEnums implements Serializable { PLAN_BILLOFLADING(263, "计划自提"), CANCEL_BILLOFLADING(264, "取消自提"), PLAN_DISTRIBUTION(265, "计划配车"), + CANCEL_DISTRIBUTION(266, "取消配车"), DISTRIBUTION_LOADING(270, "配送装车"), DISTRIBUTION_ABNORMAL_LOADING(271, "异常装车"), DISTRIBUTION_CANCEL_LOADING(272, "取消装车"), diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java index cc5a3e2ad..f9adbe245 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java @@ -32,4 +32,6 @@ public class InComingDTO implements Serializable { private String tenantId; private String nickName; + private String customerTrain; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java index c1630a421..0ab12852b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java @@ -141,6 +141,7 @@ public class DistributionBillLadingAppController extends BladeController { if("2".equals(type)){ BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); String coding = distrilbutionBillLading.get("coding").toString(); + warehouseUpdownTypeClient.downPackageOrDelTray(coding, myCurrentWarehouse.getId(),"签收下架解托"); }else if("1".equals(type)){ //todo 这里需要增加对备货库存品的下架逻辑 但是备货是会进行下架的 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index ca6f1e088..7a7713732 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -75,7 +75,7 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 5) @ApiOperation(value = "列表", notes = "DistributionAppDeliveryListDTO") public R> custom(DistributionAppDeliveryListDTO distributionDeliveryList) { - List pages = distributionSignforService.getAppDeliveryreservationListPage( distributionDeliveryList); + List pages = distributionSignforService.getAppDeliveryreservationListPage(distributionDeliveryList); return R.data(pages); } @@ -87,7 +87,7 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 5) @ApiOperation(value = "列表", notes = "DistributionAppDeliveryListDTO") public R> order(DistributionAppDeliveryListDTO distributionDeliveryList) { - List pages = distributionSignforService.getAppDeliveryorderListPage( distributionDeliveryList); + List pages = distributionSignforService.getAppDeliveryorderListPage(distributionDeliveryList); return R.data(pages); } @@ -141,30 +141,30 @@ public class DistributionSignforAppController { @PostMapping("/signfor") @ApiOperationSupport(order = 2) public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - R r = distributionSignforService.signfor(distrilbutionloadingscanDTO); + R r = distributionSignforService.signfor(distrilbutionloadingscanDTO); long time = new Date().getTime(); - try{ + try { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(Objects.isNull(myCurrentWarehouse)){ - log.warn("#############signfor:"+time+" 下架仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + if (Objects.isNull(myCurrentWarehouse)) { + log.warn("#############signfor:" + time + " 下架仓库信息为空 myCurrentWarehouse={}", myCurrentWarehouse); throw new CustomerException("下架仓库信息为空"); } List packageCodes = (List) r.getData(); - log.info("#############signfor:"+time+" 处理下架的包件 packageCodes={}",packageCodes); + log.info("#############signfor:" + time + " 处理下架的包件 packageCodes={}", packageCodes); String orderPackageCodes = null; - if(packageCodes!=null){ + if (packageCodes != null) { for (String packageCode : packageCodes) { - if(StringUtils.isBlank(orderPackageCodes)){ + if (StringUtils.isBlank(orderPackageCodes)) { orderPackageCodes = packageCode; - }else{ + } else { orderPackageCodes = orderPackageCodes + "," + packageCode; } } - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"签收下架解托"); + updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "签收下架解托"); } - }catch (Exception e){ - log.error("#############signfor:"+time+" 下架失败",e); + } catch (Exception e) { + log.error("#############signfor:" + time + " 下架失败", e); } return r; } @@ -175,7 +175,7 @@ public class DistributionSignforAppController { @PostMapping("/zeroSignfor") @ApiOperationSupport(order = 2) public R zeroSignfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - R msg = distributionSignforService.zeroSignfor(distrilbutionloadingscanDTO); + R msg = distributionSignforService.zeroSignfor(distrilbutionloadingscanDTO); return msg; } @@ -185,7 +185,7 @@ public class DistributionSignforAppController { @PostMapping("/signforIn") @ApiOperationSupport(order = 2) public R signforIn(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - R msg = distributionSignforService.signforIn(distrilbutionloadingscanDTO); + R msg = distributionSignforService.signforIn(distrilbutionloadingscanDTO); return msg; } @@ -211,23 +211,23 @@ public class DistributionSignforAppController { } - /** * 司机扫描签收管理 不在配送单签收 */ @PostMapping("/signforcontinue") @ApiOperationSupport(order = 2) public R signforcontinue(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - R msg = distributionSignforService.signforcontinue(distrilbutionloadingscanDTO); + R msg = distributionSignforService.signforcontinue(distrilbutionloadingscanDTO); return msg; } + /** * 司机签收管理 确认签收 */ @PostMapping("/signforack") @ApiOperationSupport(order = 2) public R signforack(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { - R msg = distributionSignforService.signforack(distributionSignfor); + R msg = distributionSignforService.signforack(distributionSignfor); return msg; } @@ -239,21 +239,23 @@ public class DistributionSignforAppController { @ApiOperation(value = "司机一键签收", notes = "传入distributionSignfor") public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(false); - R r = distributionSignforService.oneclickPDA(distributionSignfor); - List packageCodes = (List)r.getData(); - try{ + R r = distributionSignforService.oneclickPDA(distributionSignfor); + List packageCodes = (List) r.getData(); + try { String orderPackageCodes = null; for (String packageCode : packageCodes) { - if(StringUtils.isBlank(orderPackageCodes)){ - orderPackageCodes = packageCode+""; - }else{ + if (StringUtils.isBlank(orderPackageCodes)) { + orderPackageCodes = packageCode + ""; + } else { orderPackageCodes = orderPackageCodes + "," + packageCode; } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"司机一键签收下架解托"); - }catch (Exception e){ - log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); + if(orderPackageCodes!=null){ + updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托"); + } + } catch (Exception e) { + log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes); } return r; } @@ -265,9 +267,10 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 4) @ApiOperation(value = "离线签收", notes = "传入Json串") public R offline(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { - R msg = distributionSignforService.offline(distributionSignfor.getOfflineJson()); + R msg = distributionSignforService.offline(distributionSignfor.getOfflineJson()); return msg; } + /** * 签收管理 回显照片信息 */ @@ -275,19 +278,19 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 4) @ApiOperation(value = "回显照片", notes = "回显照片") public R prices(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { - if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ + if (ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())) { Map> one = distributionSignforService.prices(distributionSignfor); DistributionSignforEntity one1 = distributionSignforService.getOne(Wrappers.query().lambda() .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) ); - Map map = new HashMap<>(); - map.put("deliverySignPictures",one); //司机签收图片 - map.put("driverRemarks",one1.getDriverRemarks()); //driverRemarks + Map map = new HashMap<>(); + map.put("deliverySignPictures", one); //司机签收图片 + map.put("driverRemarks", one1.getDriverRemarks()); //driverRemarks return R.data(map); - }else { - return R.fail(3002,"参数不能为空不对！！"); + } else { + return R.fail(3002, "参数不能为空不对！！"); } } @@ -298,23 +301,24 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 4) @ApiOperation(value = "修改签收照片信息", notes = "修改签收照片信息") public R updatePicture(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { - if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ + if (ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())) { return R.data(distributionSignforService.updatePicture(distributionSignfor)); - }else { - return R.fail(3002,"参数不能为空不对！！"); + } else { + return R.fail(3002, "参数不能为空不对！！"); } } /** * 查询签收包件列表 + * * @param reservationId * @return */ @GetMapping("/signingPackageDetail") @ApiOperationSupport(order = 4) - @ApiOperation(value = "查询签收包件列表" ) + @ApiOperation(value = "查询签收包件列表") public R signingPackageDetail(@RequestParam Long reservationId) { - return distributionSignforService.signingPackageDetail(reservationId); + return distributionSignforService.signingPackageDetail(reservationId); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index dee2731af..8b848b7f0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -164,7 +164,6 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList") public R> packdetail(@RequestParam Map distributionDeliveryInfoDTO, Query query) throws ParseException { IPage parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO); -// IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryInfopackdetail(Condition.getPage(query), distributionDeliveryInfoDTO); return R.data(parcelListEntityList); } @@ -234,17 +233,6 @@ public class DistributionDeliveryListController extends BladeController { } -// /** -// * 配送管理 装车扫描(单件装车) -// */ -// @GetMapping("/singleloading") -// @ApiOperationSupport(order = 2) -// public R singleloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { -// R msg = distributionDeliveryListService.singleloading(distrilbutionloadingscanDTO); -// return msg; -// } - - /** * 配送管理 点击发车 */ 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..64923580d 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,9 +95,8 @@ 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.bill_lading_id = lddd.bill_lading_id AND ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and ldbls.scan_type=1 ) AS pickUpQuantity, 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 '待提货' WHEN lddd.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 ) > 0 THEN 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 0473c48bd..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 @@ -121,6 +121,8 @@ FROM logpm_distribution_stockup_info AS ldsi LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id + WHERE + ldsi.stock_status != 4 ) AS t ON t.reservation_id = lds.reservation_id lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 @@ -796,7 +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.reservation_id = lds.reservation_id and + 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/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index cfb56e86f..e240d4576 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -365,7 +365,7 @@ ldsa.total_number totalNum, count(ldpl.id) num FROM logpm_distribution_stock_article ldsa - left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code + left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3 left join logpm_warehouse_updown_goods lwug @@ -388,7 +388,7 @@ ldsa.total_number totalNum, count(ldpl.id) num FROM logpm_distribution_stock_article ldsa - left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code + left join logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldsa.id left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3 left join logpm_warehouse_updown_goods lwug diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 1b3292b62..760172b2a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -156,7 +156,6 @@ logpm_distrilbution_bill_lading AS ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbs.bill_lading_id = ldbl.id LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id - LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{param.billLadingId} and ldbs.order_status in (1,3) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 110915a3c..7a799b6e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -554,7 +554,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl selectDistributionAppDeliveryInventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { List inventoryList = distributionReservationMapper.selectInventoryListByReservation(Long.parseLong(distributionAppDeliveryListDTO.getReservationId())); if (Func.isEmpty(inventoryList)) { - log.error("##########查询该客户库存品信息为null"); + log.warn("##########查询该客户库存品信息为null"); return null; } List stockListIds = inventoryList.stream().map(DisStockListDetailEntity::getStockListId).distinct().collect(Collectors.toList()); 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 57af1bf4e..467239e47 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 @@ -322,13 +322,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId()); - //distributionDeliveryListVO.setPackadeList(stripList); - //装车件数 - //Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId()); - // distributionDeliveryListVO.setLoadNub(sum); - // if (detail.getSource() == 1) { //查询客户信息 List customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId()); if (!customList.isEmpty()) { @@ -2815,16 +2808,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl logs = new ArrayList<>(); //查询出原来配送信息的备货任务 DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId()); //这里查询出该备货任务的执行情况，如果该任务处于已完成的状态需要创建新的备货任务，其他的备货状态则是进行备货任务的修改 @@ -2862,13 +2847,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { orderPackageNum.getAndAdd(p.getQuantity()); @@ -3069,7 +3041,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionSignforEntity::getReservationId, reservationEntity.getId()) @@ -3217,9 +3188,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper().lambda() -// .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()) -// .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()) -// ); if (Func.isEmpty(list)) { log.error("###########################预约包件查询错误:{}", list); log.error("###########################查询错误预约Id:{}", reservationEntity.getId()); @@ -3513,13 +3477,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl oldPackageList = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), reservationStockarticleEntities.get(0).getStockArticleId()); //进行预约订单中间信息的修改 reservationStockarticleEntity.setReservationNum(packageNum.get()); distributionReservationStockarticleService.updateById(reservationStockarticleEntity); -// oldOrder.remove(s.getId()); //预约订单上的包件数量维护 packageTotal.getAndAdd(reservationStockarticleEntity.getReservationNum()); } @@ -3622,8 +3583,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl newIds = new ArrayList<>(); + List oldIds = new ArrayList<>(); newReservation.forEach((k, v) -> { clientTotal.getAndIncrement(); //统计配送包件总数量 @@ -4051,6 +4011,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { @@ -4068,7 +4031,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>Warehouse:{},ScanUser:{},TrainNumber:{},ReservationCode:{}",myCurrentWarehouse.getName(),distributionLoadscanEntity.getSigningUser(),deliveryListEntity.getTrainNumber(),distributionReservationEntity.getReservationCode()); String content = "包件在"+myCurrentWarehouse.getName()+"由"+distributionLoadscanEntity.getSigningUser()+"扫描签收,装车方式:补录装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode(); JSONObject trunklinePackageTrackLog= handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),parcelListEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode()); aaa.add(trunklinePackageTrackLog); @@ -2784,20 +2783,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLockIds = new ArrayList<>(); - List orderPackageCodes = new ArrayList<>(); List aaa = new ArrayList<>(); if (Func.isNotEmpty(parcelListEntityList) && parcelListEntityList.size() == 1) { DistributionParcelListEntity parcelListEntity = parcelListEntityList.get(0); @@ -3109,8 +3081,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() -// .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) -// .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) .eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); @@ -3221,7 +3191,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda() .eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId) + .ne(DistrilbutionBillStockEntity::getOrderStatus, "2") ); if (list.isEmpty()) { return Resp.scanFail("当前提货任务，订单不存在！", "当前提货任务，订单不存在！"); @@ -3130,11 +3131,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl - List distributionStockArticleEntityList = distributionStockArticleService.list(Wrappers.query().lambda() - .in(DistributionStockArticleEntity::getId, ls)); + List distributionStockArticleEntityList = distributionStockArticleService.list(Wrappers.query().lambda() + .in(DistributionStockArticleEntity::getId, ls) + .ne(DistributionStockArticleEntity::getIsZero, "1") + ); List list1 = distributionParcelListService.list(Wrappers.query().lambda() .in(DistributionParcelListEntity::getStockArticleId, ls) + .eq(DistributionParcelListEntity::getConditions, 1) ); @@ -3150,8 +3154,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl>>> {}", parcelListEntity); + log.debug("getScan so >>>> {}", so); + log.debug("getScan coding >>>> {}", coding); if (parcelListEntity.getStockArticleId().equals(so.getStockArticleId()) && parcelListEntity.getOrderPackageCode().equals(coding)) { distributionParcelListEntity = parcelListEntity; + break; } } @@ -3194,7 +3202,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl > 签收成功!!"); return Resp.scanSuccess("签收成功", "签收成功"); } @@ -3298,81 +3304,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))); - 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); @@ -3457,7 +3472,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl scanEntityList = new ArrayList<>(); AtomicReference num = new AtomicReference<>(0); if (ObjectUtils.isNotNull(list) && !list.isEmpty()) { //签收记录 @@ -3513,41 +3527,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(); } 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..64bbae5be 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("trayTypeId") 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..305e7657e 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 total_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-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml index 77d991a27..e10f63437 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml @@ -158,7 +158,7 @@ and ltad.incoming_time <= #{endByDateStr} and ltad.incoming_warehouse_id = #{warehouseId} - and ltad.customer_train = #{customerTrain} + and ltad.train_number = #{customerTrain} group by ltad.advance_id) t left join logpm_trunkline_advance lta on lta.id = t.advanceId @@ -183,7 +183,7 @@ and ltad.incoming_time <= #{endByDateStr} and ltad.incoming_warehouse_id = #{warehouseId} - and ltad.customer_train = #{customerTrain} + and ltad.train_number = #{customerTrain} group by ltad.advance_id) t left join logpm_trunkline_advance lta on lta.id = t.advanceId diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml index 4086707db..d8c80620d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml @@ -41,14 +41,17 @@ lww.consignee_address consigneeAddress, lww.remark remark, lww.total_count totalCount, - lww.stock_count stockCount, + sum(ltbw2.real_num) stockCount, ltbw.billlading_fee billladingFee, lww.collect_pay collectPay from logpm_trunkline_billlading_waybill ltbw + left join logpm_trunkline_billlading_waybill ltbw2 on ltbw2.waybill_id = ltbw.waybill_id left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no where ltbw.billlading_id = #{billladingId} and ltbw.is_deleted = 0 + group by ltb.billlading_code, + ltbw.waybill_id diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index ab5efec8d..4ada06c46 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -197,6 +197,7 @@ public class InComingServiceImpl implements IInComingService { Integer incomingType = inComingDTO.getIncomingType();//入库类型 1码板打托 2扫码入库 3直接入库 4 按车次号入库 5按订单入库 6扫描入库 7 批量卸车入库 8卸车托盘 9卸分一体 10补录数据入库 String trayCode = inComingDTO.getTrayCode();//托盘码 String trayType = inComingDTO.getTrayType();//打托方式 + String customerTrain = inComingDTO.getCustomerTrain();//车次号 List packageCodes = Arrays.asList(orderPackageCode.split(",")); log.info("############incomingPackage: 包件入库开始 packageCodes={} billladingId={} warehouseId={}", packageCodes, billladingId, warehouseId); @@ -209,6 +210,15 @@ public class InComingServiceImpl implements IInComingService { log.warn("############incomingPackage: 包件不存在 packageCodes={} warehouseId={}", packageCodes, warehouseId); return Resp.scanFail(405, "包件无数据", "包件无数据"); } + if(StringUtil.isNotBlank(customerTrain)){ + for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) { + String trainNumber = advanceDetailEntity.getTrainNumber(); + if(!trainNumber.equals(customerTrain)){ + log.warn("############incomingPackage: 包件车次号不一致 packageCodes={} trainNumber={} trainNumber={}", packageCodes, trainNumber, customerTrain); + return Resp.scanFail(405, "包件车次号不一致", "包件车次号不一致"); + } + } + } //把advanceDetailEntityList通过packageStatus分组 Map> advanceDetailEntityMap = advanceDetailEntityList.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getPackageStatus)); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java index 1f1edac4a..1a2900a1a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingPackageServiceImpl.java @@ -281,60 +281,60 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl billladingWaybillEntityQueryWrapper = new QueryWrapper<>(); - billladingWaybillEntityQueryWrapper.in("waybill_no",waybillNoSet) - .eq("billlading_id",billladingId) - .eq("is_deleted",0); - - List billladingWaybillEntityList = trunklineBillladingWaybillService.list(billladingWaybillEntityQueryWrapper); - - //把billladingWaybillEntityList转化成waybillNo为key的Map - Map billladingWaybillEntityMap = billladingWaybillEntityList.stream().collect(Collectors.toMap(TrunklineBillladingWaybillEntity::getWaybillNo, Function.identity())); - - List addList = new ArrayList<>(); - List updateList = new ArrayList<>(); - - final TrunklineBillladingWaybillEntity[] noWaybillData = {trunklineBillladingWaybillService.findNoWaybillNoData(billladingId)}; - - - waybillNoSet.forEach(waybillNo -> { - Integer integer = waybillNoMNumMap.get(waybillNo); - TrunklineBillladingWaybillEntity billladingWaybillEntity = billladingWaybillEntityMap.get(waybillNo); - if(Objects.isNull(billladingWaybillEntity)){ - //查询是否有一条无运单的数据 - if(Objects.isNull(noWaybillData[0])){ - noWaybillData[0] = new TrunklineBillladingWaybillEntity(); - noWaybillData[0].setWarehouseId(warehouseId); - noWaybillData[0].setWarehouseName(warehouseEntity.getName()); - noWaybillData[0].setBillladingId(billladingId); - noWaybillData[0].setBilladingCode(trunklineBillladingEntity.getBillladingCode()); - noWaybillData[0].setWaybillNo("————"); - noWaybillData[0].setRealNum(integer); - noWaybillData[0].setRealWeight(BigDecimal.ZERO); - noWaybillData[0].setRealVolume(BigDecimal.ZERO); - }else{ - Integer realNum = noWaybillData[0].getRealNum(); - noWaybillData[0].setRealNum(realNum+integer); - } - }else{ - Integer realNum = billladingWaybillEntity.getRealNum(); - billladingWaybillEntity.setRealNum(realNum + integer); - updateList.add(billladingWaybillEntity); - } - }); - - addList.add(noWaybillData[0]); - - trunklineBillladingWaybillService.saveBatch(addList); - trunklineBillladingWaybillService.updateBatchById(updateList); - - TrunklineBillladingEntity billladingEntity = trunklineBillladingService.getById(billladingId); - if(!Objects.isNull(billladingEntity)){ - int realNum = billladingEntity.getRealNum(); - Integer all = waybillNoMNumMap.values().stream().reduce(Integer::sum).get(); - billladingEntity.setRealNum(realNum+all); - trunklineBillladingService.updateById(billladingEntity); - } +// QueryWrapper billladingWaybillEntityQueryWrapper = new QueryWrapper<>(); +// billladingWaybillEntityQueryWrapper.in("waybill_no",waybillNoSet) +// .eq("billlading_id",billladingId) +// .eq("is_deleted",0); +// +// List billladingWaybillEntityList = trunklineBillladingWaybillService.list(billladingWaybillEntityQueryWrapper); +// +// //把billladingWaybillEntityList转化成waybillNo为key的Map +// Map billladingWaybillEntityMap = billladingWaybillEntityList.stream().collect(Collectors.toMap(TrunklineBillladingWaybillEntity::getWaybillNo, Function.identity())); +// +// List addList = new ArrayList<>(); +// List updateList = new ArrayList<>(); +// +// final TrunklineBillladingWaybillEntity[] noWaybillData = {trunklineBillladingWaybillService.findNoWaybillNoData(billladingId)}; +// +// +// waybillNoSet.forEach(waybillNo -> { +// Integer integer = waybillNoMNumMap.get(waybillNo); +// TrunklineBillladingWaybillEntity billladingWaybillEntity = billladingWaybillEntityMap.get(waybillNo); +// if(Objects.isNull(billladingWaybillEntity)){ +// //查询是否有一条无运单的数据 +// if(Objects.isNull(noWaybillData[0])){ +// noWaybillData[0] = new TrunklineBillladingWaybillEntity(); +// noWaybillData[0].setWarehouseId(warehouseId); +// noWaybillData[0].setWarehouseName(warehouseEntity.getName()); +// noWaybillData[0].setBillladingId(billladingId); +// noWaybillData[0].setBilladingCode(trunklineBillladingEntity.getBillladingCode()); +// noWaybillData[0].setWaybillNo("————"); +// noWaybillData[0].setRealNum(integer); +// noWaybillData[0].setRealWeight(BigDecimal.ZERO); +// noWaybillData[0].setRealVolume(BigDecimal.ZERO); +// }else{ +// Integer realNum = noWaybillData[0].getRealNum(); +// noWaybillData[0].setRealNum(realNum+integer); +// } +// }else{ +// Integer realNum = billladingWaybillEntity.getRealNum(); +// billladingWaybillEntity.setRealNum(realNum + integer); +// updateList.add(billladingWaybillEntity); +// } +// }); +// +// addList.add(noWaybillData[0]); +// +// trunklineBillladingWaybillService.saveBatch(addList); +// trunklineBillladingWaybillService.updateBatchById(updateList); +// +// TrunklineBillladingEntity billladingEntity = trunklineBillladingService.getById(billladingId); +// if(!Objects.isNull(billladingEntity)){ +// int realNum = billladingEntity.getRealNum(); +// Integer all = waybillNoMNumMap.values().stream().reduce(Integer::sum).get(); +// billladingEntity.setRealNum(realNum+all); +// trunklineBillladingService.updateById(billladingEntity); +// } waybillEntityMap.keySet().forEach(waybillNo -> { @@ -367,8 +367,10 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("order_package_code",orderPackageCode); 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..0e4c891d5 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java @@ -0,0 +1,82 @@ +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.entity.SyncOldTrayTypeLogEntity; +import com.logpm.warehouse.service.ISyncOldTrayTypeLogService; +import com.logpm.warehouse.service.IWarehouseUpdownTypeService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.constant.TenantNum; +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.Date; +import java.util.Objects; + +@Slf4j +@Component +@AllArgsConstructor +public class OldTrayTypeListener { + + private final IWarehouseUpdownTypeService warehouseUpdownTypeService; + private final ISyncOldTrayTypeLogService syncOldTrayTypeLogService; + + @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); + }else{ + SyncOldTrayTypeLogEntity syncOldTrayTypeLogEntity = new SyncOldTrayTypeLogEntity(); + syncOldTrayTypeLogEntity.setCreateUser(1714696768639311873L); + syncOldTrayTypeLogEntity.setUpdateUser(1714696768639311873L); + syncOldTrayTypeLogEntity.setCreateDept(1649331096241836033L); + syncOldTrayTypeLogEntity.setTenantId(TenantNum.HUITONGCODE); + syncOldTrayTypeLogEntity.setCreateTime(new Date()); + syncOldTrayTypeLogEntity.setUpdateTime(new Date()); + syncOldTrayTypeLogEntity.setArgs(com.alibaba.fastjson.JSONObject.toJSONString(trayInfoDTO)); + syncOldTrayTypeLogEntity.setSyncStatus(0); + syncOldTrayTypeLogEntity.setSyncNum(0); + syncOldTrayTypeLogService.save(syncOldTrayTypeLogEntity); + } + } + + + } + + +} 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 { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 2a7ad99ea..5b2f42674 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -312,6 +312,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCodeList(findParamterDTO); - if(parcelListList.isEmpty()){ + if (parcelListList.isEmpty()) { log.warn("############upShelfOrder: 没有可上架的包件"); - return R.fail(405,"没有可上架的包件"); + return R.fail(405, "没有可上架的包件"); } List upShelfPackageList = new ArrayList<>(); @@ -974,10 +984,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl trayGoodsQueryWrapper = new QueryWrapper<>(); trayGoodsQueryWrapper.in("association_value", orderPackageCodeList); List trayGoodsEntityList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper); - if(!trayGoodsEntityList.isEmpty()){ + if (!trayGoodsEntityList.isEmpty()) { //把trayGoodsEntityList中的association_value提取出来存入一个List List orderPackageCodes = trayGoodsEntityList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); - warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes,"同步处理:包件解托",warehouseId); + warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes, "同步处理:包件解托", warehouseId); } FindParamterDTO findParamterDTO = new FindParamterDTO(); @@ -1474,7 +1484,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl updownGoodsEntities1 = map.get(allocationId); List orderPackageCodes = updownGoodsEntities1.stream().map(WarehouseUpdownGoodsEntity::getAssociationValue).collect(Collectors.toList()); - if(!Objects.isNull(taryAllocationEntity)){ + if (!Objects.isNull(taryAllocationEntity)) { warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes, remark, warehouseId); } WarehouseUpdownTypeEntity updownTypeEntity = updownTypeMap.get(allocationId); @@ -1494,14 +1504,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl parcelListEntities = new ArrayList<>(); orderPackageCodes.forEach(orderPackageCode -> { DistributionParcelListEntity parcelListEntity = parcelListEntityMap.get(orderPackageCode); - if(!Objects.isNull(parcelListEntity)){ + if (!Objects.isNull(parcelListEntity)) { parcelListEntities.add(parcelListEntity); } }); @@ -1540,8 +1550,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl t.getOrderPackageCode().equals(orderPackageCode)) .findFirst() .orElse(null); - if(parcelListEntity==null){ - log.info(">>>>>>>>>>>>>> 包条找不到 {} ",orderPackageCode); + if (parcelListEntity == null) { + log.info(">>>>>>>>>>>>>> 包条找不到 {} ", orderPackageCode); continue; } @@ -1780,7 +1794,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl orders = new ArrayList<>(orderSet); - if(orders.isEmpty()){ + if (orders.isEmpty()) { return Resp.scanSuccess("下架成功", "成功下架" + num + "件"); } @@ -1794,7 +1808,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl upShelfPackageList, Long warehouseId, String remark) { StringBuffer stringBuffer = new StringBuffer("下架零担订单成功"); @@ -3092,7 +3105,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl