From 885d01eb65fe0010c6c83e7f066b73ada06538cd Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 11:46:03 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=B7=B2=E8=A3=85=E8=BD=A6=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=8F=96=E6=B6=88BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryInfoServiceImpl.java | 2 ++ .../DistributionDeliveryListServiceImpl.java | 26 +++++++++++++++---- .../impl/DistributionStockupServiceImpl.java | 5 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) 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 2a9c71024..110915a3c 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 @@ -188,6 +188,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionStockArticle); List loadList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId")) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); Map> orderLoadMap; if (!Objects.isNull(loadList)) { @@ -249,6 +250,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPageByDeliveryId(Long.parseLong(deliveryId)); List loadList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId")) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); Map> orderLoadMap; if (!Objects.isNull(loadList)) { 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 431f564ed..25980214b 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 @@ -7130,12 +7130,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId); - if (Func.isNotEmpty(loadscanEntityList)) { - log.info(method + "存在异常装车数据:{}", deliveryId); - return R.fail(reservationCodes + "存在异常装车、签收包条!!!"); + List ids = reservationEntities.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()); + + List packageList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, ids) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + List inventoryList = distributionLoadscaninvnService.list(Wrappers.query().lambda() + .eq(DistributionLoadscaninvnEntity::getReservationId, ids) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + if (!packageList.isEmpty() || !inventoryList.isEmpty()){ + log.info(method + "取消配送存在装车数据:{}", deliveryId); + return R.fail(reservationCodes + "存在装车、签收数据!!!"); } + + +// //该配送是否存在异常装车或者异常签收数据 +// List loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId); +// if (Func.isNotEmpty(loadscanEntityList)) { +// log.info(method + "存在异常装车数据:{}", deliveryId); +// return R.fail(reservationCodes + "存在异常装车、签收包条!!!"); +// } boolean flag = false; for (DistributionReservationEntity reservationEntity : reservationEntities) { DistributionReservationDTO reservationDTO = Func.copy(reservationEntity, DistributionReservationDTO.class); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 26ea1673b..3c2d19bde 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2732,8 +2732,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl trayGoodsEntities = warehouseTrayGoodsClient.findZeroByOrderCode(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId()); List> trayMapList = new ArrayList<>(); if (!trayGoodsEntities.isEmpty()) { - int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum(); - handQuantity = handQuantity - sum; +// int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum(); Iterator iterator = trayGoodsEntities.iterator(); while (iterator.hasNext()){ //查询是否进行上架 @@ -2741,6 +2740,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl map = new HashMap<>(); From 9d37b948eb9f41e89d527ac108818115ed1679c3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 11:53:01 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=AD=98=E5=9C=A8=E8=A3=85=E8=BD=A6=E6=9C=AA?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=9A=84=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 d515c36cd..15a255fb9 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 @@ -601,6 +601,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Mon, 22 Apr 2024 12:07:44 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E6=9F=A5=E8=AF=A2=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index f587d0e6f..5d2097cdf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -109,7 +109,7 @@ LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id and ldrp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id - LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 + LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 AND ldl.is_deleted = 0 LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_distrilbution_bill_package AS ldbp ON ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status != 2 From 3376bb17780ce5b9600b21e25432da3a39839982 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 12:11:09 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=BD=A6=E7=89=8C=E5=AD=97=E6=AE=B5=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 5d2097cdf..26f5ea8d9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -98,7 +98,7 @@ ldl.signing_time signingTimes, ldl.signing_user signingUser, ldl.scan_user scanUser, - ldl.vehicle_name vehicleName, + lddl.vehicle_name vehicleName, ldsa.type_service typeService, ldbl.pickup_batch pickupBatch FROM From 4bbe5884b617400c27cdcc8ff26ca959877c70dd Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 15:46:10 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 18 - .../impl/DistributionSignforServiceImpl.java | 14 +- .../impl/DistributionStockupServiceImpl.java | 692 +++++++++--------- 3 files changed, 370 insertions(+), 354 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 11971f5d7..4595e72b0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -503,24 +503,6 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "零担备货") public R zeroStockUp(@RequestBody StockupZeroDTO stockupDTO) { log.debug("=====零担备货：{}", stockupDTO); - if (ObjectUtils.isNull(stockupDTO.getStockupId())) { - return R.fail(3002, "备货id不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getStockArticleId())) { - return R.fail(3002, "订单ID不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getOrderCode())) { - return R.fail(3002, "订单自编号不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getReservationId())) { - return R.fail(3002, "预约单号不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getTypeService())) { - return R.fail(3002, "备货业务类型不能为空 !"); - } -/* if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { - return R.fail(3002, "库位信息不能为空 !"); - }*/ R b = distributionStockupService.zeroStockUp(stockupDTO); return b; } 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 15a255fb9..8b84d5e47 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 @@ -2854,14 +2854,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 1){ log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(","))); return Resp.scanFail("操作失败", "包件已出库"); } - if (loadscanEntityList.size() == 1){ - loadscanEntity = loadscanEntityList.get(0); - } + } if (Func.isNotEmpty(loadscanEntity)) { @@ -2903,6 +2908,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl selectDistributionStockupPage(IPage page, DistributionStockupVO distributionStockup) { return page.setRecords(baseMapper.selectDistributionStockupPage(page, distributionStockup)); @@ -439,8 +437,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); @@ -483,7 +481,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packagePallet, List stockListPallet) { - Set set = new HashSet<>(packagePallet); + Set set = new HashSet<>(packagePallet); for (String pallet : stockListPallet) { if (StringUtil.isBlank(pallet)) { @@ -508,7 +506,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageAllocation, List stockListAllocation) { - Set set = new HashSet<>(packageAllocation); + Set set = new HashSet<>(packageAllocation); for (String allocation : stockListAllocation) { if (StringUtil.isBlank(allocation)) { @@ -720,7 +718,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl zeroOrderList = distrilbutionBillLadingService.selectBillLadingZeroPackageList(reservationId); - if (Func.isNotEmpty(zeroOrderList)){ + if (Func.isNotEmpty(zeroOrderList)) { // List zeroTrayInfo = getZeroTrayInfo(zeroOrderList); // if (!zeroTrayInfo.isEmpty()) { // list = zeroTrayInfo; @@ -874,24 +872,24 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl selectStockupStockList(StockupDTO stockupDTO) { BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ - log.error("###########myCurrentWarehouse:{}",myCurrentWarehouse); + if (Func.isEmpty(myCurrentWarehouse)) { + log.error("###########myCurrentWarehouse:{}", myCurrentWarehouse); return null; } @@ -1174,7 +1172,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); @@ -1194,29 +1192,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionReservationService.selectStockupStockList(reservationId,myCurrentWarehouse.getId(),mallName); - for (DistributionStockupStockListVO distributionStockupStockListVO : list) { - if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) { - distributionStockupStockListVO.setCompleteStact(true); - } - if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())) { + List list = distributionReservationService.selectStockupStockList(reservationId, myCurrentWarehouse.getId(), mallName); + for (DistributionStockupStockListVO distributionStockupStockListVO : list) { + if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) { + distributionStockupStockListVO.setCompleteStact(true); + } + if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())) { - String[] ids = distributionStockupStockListVO.getAllocations().split(","); + String[] ids = distributionStockupStockListVO.getAllocations().split(","); HashSet strings = new HashSet(CollUtil.newArrayList(ids)); String res = strings.stream().map(Object::toString).collect(Collectors.joining(",")); @@ -1224,19 +1222,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(newIds); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - if (distributionStockupStockListVO.getAllocationList() == null) { - distributionStockupStockListVO.setAllocationList(new ArrayList<>()); - } - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - distributionStockupStockListVO.getAllocationList().add(map); - } - } + for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { + if (distributionStockupStockListVO.getAllocationList() == null) { + distributionStockupStockListVO.setAllocationList(new ArrayList<>()); + } + Map map = new HashMap<>(); + map.put("id", allocationInforById.getId()); + map.put("name", allocationInforById.getQrCode()); + distributionStockupStockListVO.getAllocationList().add(map); + } + } - } + } return list; } @@ -1649,7 +1647,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl { i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS, i.getStockupStatus())); - if(ObjectUtils.isNotNull(i.getStockStatus())){ - switch (i.getStockStatus()){ + if (ObjectUtils.isNotNull(i.getStockStatus())) { + switch (i.getStockStatus()) { case "10": i.setStockStatusName("待备货"); break; @@ -1709,7 +1707,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl getRoleList() { //获取当前登录用户 BladeUser user = AuthUtil.getUser(); - log.info(">>>>>>>>>>>>>>>user:{}",user); - String tenantId = user.getTenantId(); + log.info(">>>>>>>>>>>>>>>user:{}", user); + String tenantId = user.getTenantId(); // String deptId = user.getDeptId(); //查询备货岗位 List warehouseType = DictBizCache.getList("stock_personnel"); @@ -2406,13 +2404,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl> listR = userSearchClient.listByRole(roleIds); //查询角色下的所有人员数据 - log.info(">>>>>>>>>>>>>>>>>>>>>listR,:{}",listR); + log.info(">>>>>>>>>>>>>>>>>>>>>listR,:{}", listR); BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); //有没有选择仓库信息 if (ObjectUtils.isNotNull(myCurrentWarehouse)) { if (!listR.getData().isEmpty()) { List collect = listR.getData().stream().filter(i -> - ObjectUtils.isNotNull(i.getDeptId()) && i.getDeptId().contains(myCurrentWarehouse.getDepartment().toString()) + ObjectUtils.isNotNull(i.getDeptId()) && i.getDeptId().contains(myCurrentWarehouse.getDepartment().toString()) ).collect(Collectors.toList()); return collect; } else { @@ -2477,194 +2475,223 @@ public class DistributionStockupServiceImpl extends BaseServiceImplquery().lambda() - .eq(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1") - .eq(DistributionReservationZeroPackageEntity::getId, i.getId()) - ); - - - if (ObjectUtils.isNull()) { - return Resp.scanFail(i.getCategoryName() + "备货信息未找到！", i.getCategoryName() + "备货信息未找到！"); - } - if (one.getQuantity().equals(one.getRealityQuantity())) { - return Resp.scanFail(i.getCategoryName() + "备货已完成！！", i.getCategoryName() + "备货已完成！！"); - } + if (ObjectUtils.isNull(stockupDTO.getReservationId())) { + return R.fail(3002, "预约单号不能为空 !"); } - - //把数据取出来 - List zeroStockUpData; - - - if ("3".equals(stockupDTO.getTypeService())) { - //自提 - if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { - //没有货位 - //自提 - zeroStockUpData = distributionStockupService.getZeroStockUpDataMeiSelf(stockupDTO); - } else { - //有 - zeroStockUpData = distributionStockupService.getZeroStockUpDataYouSelf(stockupDTO); - } - } else { - //商 ，市 - if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { - //没有货位 - zeroStockUpData = distributionStockupService.getZeroStockUpDataMei(stockupDTO); - } else { - //有 - zeroStockUpData = distributionStockupService.getZeroStockUpDataYou(stockupDTO); - } - } - int xiugai = 0; - List collect = stockupDTO.getList().stream().filter( //可以 - a -> zeroStockUpData.stream().anyMatch(q -> q.getStockArticleId().equals(a.getStockArticleId()) && a.getQuantity() <= q.getQuantity() && a.getQuantity() > 0) - ).collect(Collectors.toList()); - //添加备货信息 - List stockEntityList = new ArrayList<>(); - List jsonObjectList = new ArrayList<>(); - for (StockupZeroVO i : collect) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("warehouseId", myCurrentWarehouse.getId()); - //查询是不是当前包件 - DistributionReservationZeroPackageEntity byId1 = reservationZeroPackageService.getById(i.getId()); - if (ObjectUtils.isNull(byId1)) { - continue; - } - DistributionStockArticleEntity stockArticle = distributionStockArticleService.getById(byId1.getStockArticleId()); - if (ObjectUtils.isNull(stockArticle)) { - throw new ServiceException("订单数据不存在！！"); - } - jsonObject.put("orderCode", stockArticle.getOrderCode()); - jsonObject.put("waybillCode", stockArticle.getWaybillNumber()); - - //查询备货信息 - QueryWrapper queryWrapper = new QueryWrapper<>(); - if ("3".equals(stockupDTO.getTypeService())) { - queryWrapper.eq("bill_lading_id", stockupDTO.getReservationId()); - } else { - queryWrapper.eq("reservation_id", stockupDTO.getReservationId()); - } - //查询有没有备货过 - queryWrapper.eq("stock_article", i.getStockArticleId()); - queryWrapper.eq("stockup_id", stockupDTO.getStockupId()); - queryWrapper.eq("parcel_list_id", byId1.getParcelListId()); - DistributionStockEntity one = distributionStockService.getOne(queryWrapper); - //查询备货数量 -// DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId()); - if (i.getQuantity() > byId1.getQuantity()) { - return Resp.scanFail(i.getCategoryName() + "备货数量大于待备货数量！", i.getCategoryName() + "备货数量大于待备货数量！"); - } - Optional first = stockupDTO.getList().stream().filter(q -> i.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= i.getQuantity() && q.getQuantity() > 0).findFirst(); - - if (ObjectUtils.isNotNull(one)) { - //修改数量 - DistributionStockEntity stockEntity = new DistributionStockEntity(); - stockEntity.setId(one.getId()); - stockEntity.setStockQuantity(first.get().getQuantity()); - int i1 = first.get().getQuantity() - first.get().getRealityQuantity(); //这次备货的数量 - jsonObject.put("enterNum", i1); - distributionStockService.updateById(stockEntity); - } else { - DistributionStockEntity stockEntity = new DistributionStockEntity(); - stockEntity.setStockArticle(i.getStockArticleId()); - stockEntity.setStockupId(stockupDTO.getStockupId()); - stockEntity.setParcelListId(byId1.getParcelListId()); - if ("3".equals(stockupDTO.getTypeService())) { - stockEntity.setBillLadingId(stockupDTO.getReservationId()); - } else { - stockEntity.setReservationId(stockupDTO.getReservationId()); - } - stockEntity.setConditions("2"); - stockEntity.setGoodsName(i.getCategoryName()); - stockEntity.setOutboundType("3"); - stockEntity.setType(3); - stockEntity.setAllocationId(stockupDTO.getAllocationId()); - //查询货位信息 - stockEntity.setAllocationTitle(getAllocationInfo(stockupDTO.getAllocationId(), stockArticle.getOrderCode(), myCurrentWarehouse.getId()).getAllocationTitle()); - DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId()); - stockEntity.setStockupArea(ObjectUtils.isNotNull(distributionStockupEntity) ? distributionStockupEntity.getStockupArea() : null); - stockEntity.setStockQuantity(first.get().getQuantity());// 备货数量 - jsonObject.put("enterNum", i.getQuantity()); - stockEntityList.add(stockEntity); - } - //修改备货数量 - DistributionReservationZeroPackageEntity reservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); - reservationZeroPackageEntity.setRealityQuantity(first.get().getQuantity()); - reservationZeroPackageEntity.setId(i.getId()); - boolean b = reservationZeroPackageService.updateById(reservationZeroPackageEntity); - if (!b) { - return Resp.scanFail("修改失败！！", "修改失败！！"); - } else { - xiugai += 1; - } - //有货位下架 - jsonObject.put("allocationId", stockupDTO.getAllocationId()); - jsonObject.put("remark","备货零担下架"); - jsonObjectList.add(jsonObject); - + if (ObjectUtils.isNull(stockupDTO.getTypeService())) { + return R.fail(3002, "备货业务类型不能为空 !"); } - if (!jsonObjectList.isEmpty()) { - if (ObjectUtils.isNotNull(stockupDTO.getAllocationId())) { - R r = warehouseUpdownTypeClient.downZeroOrder(jsonObjectList); - if (r.getCode() != 200) { - return Resp.scanFail("货架下架失败！请联系管理员！", "货架下架失败！请联系管理员！"); - } - } + if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { + return R.fail(3002, "请扫描备货库位 !"); } - if (!stockEntityList.isEmpty()) { - boolean b = distributionStockService.saveBatch(stockEntityList); - if (b) { - //修改备货状态 - distributionAsyncService.stockZero(stockupDTO); - //下架零担 - return Resp.scanSuccess("备货成功！", "备货成功！"); - } else { - // - return Resp.scanFail("修改失败！！", "修改失败！！"); - } - } else { - if (collect.size() == xiugai) { - //修改备货状态 - distributionAsyncService.stockZero(stockupDTO); - //下架零担 - return Resp.scanSuccess("备货成功！", "备货成功！"); - } - return Resp.scanFail("备货失败！", "备货失败！"); - } + return null; } + +// @Override +// @Transactional(rollbackFor = Exception.class) +// public R zeroStockUp(StockupZeroDTO stockupDTO) { +// if (stockupDTO.getList().isEmpty()) { +// return R.fail("基础数据为空"); +// } +// if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { +// return Resp.scanFail("当前货物未上架，请上架！", "当前货物未上架，请上架！"); +// } +// //有没有多个订单数据 +// if (stockupDTO.getStockArticleId().contains(",")) { +// stockupDTO.setStockArticleIdList(stockupDTO.getStockArticleId().split(",")); +// stockupDTO.setStockArticleId(null); +// } +// BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); +// if (ObjectUtils.isNull(myCurrentWarehouse)) { +// throw new ServiceException("请选择仓库！！"); +// } +// //查询货位是否有货 +// WarehouseUpdownGoodsEntity allocationInfo = getAllocationInfo(stockupDTO.getAllocationId(), null, myCurrentWarehouse.getId()); +// if (ObjectUtils.isNotNull(allocationInfo)) { +// int sum = stockupDTO.getList().stream().mapToInt(StockupZeroVO::getQuantity).sum(); +// if (allocationInfo.getNum() < sum) { +// return Resp.scanFail("备货数量大于该货架的数量！", "备货数量大于该货架的数量！"); +// } +// } else { +// return Resp.scanFail("当前货物未上架，请上架！", "当前货物未上架，请上架！"); +// } +// +// //判断是否备货完成 +// for (StockupZeroVO i : stockupDTO.getList()) { +// //查询是否备货完成 +// DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.query().lambda() +// .eq(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1") +// .eq(DistributionReservationZeroPackageEntity::getId, i.getId()) +// ); +// +// +// if (ObjectUtils.isNull()) { +// return Resp.scanFail(i.getCategoryName() + "备货信息未找到！", i.getCategoryName() + "备货信息未找到！"); +// } +// if (one.getQuantity().equals(one.getRealityQuantity())) { +// return Resp.scanFail(i.getCategoryName() + "备货已完成！！", i.getCategoryName() + "备货已完成！！"); +// } +// } +// +// //把数据取出来 +// List zeroStockUpData; +// +// +// if ("3".equals(stockupDTO.getTypeService())) { +// //自提 +// if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { +// //没有货位 +// //自提 +// zeroStockUpData = distributionStockupService.getZeroStockUpDataMeiSelf(stockupDTO); +// } else { +// //有 +// zeroStockUpData = distributionStockupService.getZeroStockUpDataYouSelf(stockupDTO); +// } +// } else { +// //商 ，市 +// if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { +// //没有货位 +// zeroStockUpData = distributionStockupService.getZeroStockUpDataMei(stockupDTO); +// } else { +// //有 +// zeroStockUpData = distributionStockupService.getZeroStockUpDataYou(stockupDTO); +// } +// } +// int xiugai = 0; +// List collect = stockupDTO.getList().stream().filter( //可以 +// a -> zeroStockUpData.stream().anyMatch(q -> q.getStockArticleId().equals(a.getStockArticleId()) && a.getQuantity() <= q.getQuantity() && a.getQuantity() > 0) +// ).collect(Collectors.toList()); +// //添加备货信息 +// List stockEntityList = new ArrayList<>(); +// List jsonObjectList = new ArrayList<>(); +// for (StockupZeroVO i : collect) { +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("warehouseId", myCurrentWarehouse.getId()); +// //查询是不是当前包件 +// DistributionReservationZeroPackageEntity byId1 = reservationZeroPackageService.getById(i.getId()); +// if (ObjectUtils.isNull(byId1)) { +// continue; +// } +// DistributionStockArticleEntity stockArticle = distributionStockArticleService.getById(byId1.getStockArticleId()); +// if (ObjectUtils.isNull(stockArticle)) { +// throw new ServiceException("订单数据不存在！！"); +// } +// jsonObject.put("orderCode", stockArticle.getOrderCode()); +// jsonObject.put("waybillCode", stockArticle.getWaybillNumber()); +// +// //查询备货信息 +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// if ("3".equals(stockupDTO.getTypeService())) { +// queryWrapper.eq("bill_lading_id", stockupDTO.getReservationId()); +// } else { +// queryWrapper.eq("reservation_id", stockupDTO.getReservationId()); +// } +// //查询有没有备货过 +// queryWrapper.eq("stock_article", i.getStockArticleId()); +// queryWrapper.eq("stockup_id", stockupDTO.getStockupId()); +// queryWrapper.eq("parcel_list_id", byId1.getParcelListId()); +// DistributionStockEntity one = distributionStockService.getOne(queryWrapper); +// //查询备货数量 +//// DistributionReservationZeroPackageEntity byId = reservationZeroPackageService.getById(i.getId()); +// if (i.getQuantity() > byId1.getQuantity()) { +// return Resp.scanFail(i.getCategoryName() + "备货数量大于待备货数量！", i.getCategoryName() + "备货数量大于待备货数量！"); +// } +// Optional first = stockupDTO.getList().stream().filter(q -> i.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= i.getQuantity() && q.getQuantity() > 0).findFirst(); +// +// if (ObjectUtils.isNotNull(one)) { +// //修改数量 +// DistributionStockEntity stockEntity = new DistributionStockEntity(); +// stockEntity.setId(one.getId()); +// stockEntity.setStockQuantity(first.get().getQuantity()); +// int i1 = first.get().getQuantity() - first.get().getRealityQuantity(); //这次备货的数量 +// jsonObject.put("enterNum", i1); +// distributionStockService.updateById(stockEntity); +// } else { +// DistributionStockEntity stockEntity = new DistributionStockEntity(); +// stockEntity.setStockArticle(i.getStockArticleId()); +// stockEntity.setStockupId(stockupDTO.getStockupId()); +// stockEntity.setParcelListId(byId1.getParcelListId()); +// if ("3".equals(stockupDTO.getTypeService())) { +// stockEntity.setBillLadingId(stockupDTO.getReservationId()); +// } else { +// stockEntity.setReservationId(stockupDTO.getReservationId()); +// } +// stockEntity.setConditions("2"); +// stockEntity.setGoodsName(i.getCategoryName()); +// stockEntity.setOutboundType("3"); +// stockEntity.setType(3); +// stockEntity.setAllocationId(stockupDTO.getAllocationId()); +// //查询货位信息 +// stockEntity.setAllocationTitle(getAllocationInfo(stockupDTO.getAllocationId(), stockArticle.getOrderCode(), myCurrentWarehouse.getId()).getAllocationTitle()); +// DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId()); +// stockEntity.setStockupArea(ObjectUtils.isNotNull(distributionStockupEntity) ? distributionStockupEntity.getStockupArea() : null); +// stockEntity.setStockQuantity(first.get().getQuantity());// 备货数量 +// jsonObject.put("enterNum", i.getQuantity()); +// stockEntityList.add(stockEntity); +// } +// //修改备货数量 +// DistributionReservationZeroPackageEntity reservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); +// reservationZeroPackageEntity.setRealityQuantity(first.get().getQuantity()); +// reservationZeroPackageEntity.setId(i.getId()); +// boolean b = reservationZeroPackageService.updateById(reservationZeroPackageEntity); +// if (!b) { +// return Resp.scanFail("修改失败！！", "修改失败！！"); +// } else { +// xiugai += 1; +// } +// //有货位下架 +// jsonObject.put("allocationId", stockupDTO.getAllocationId()); +// jsonObject.put("remark","备货零担下架"); +// jsonObjectList.add(jsonObject); +// +// } +// if (!jsonObjectList.isEmpty()) { +// if (ObjectUtils.isNotNull(stockupDTO.getAllocationId())) { +// R r = warehouseUpdownTypeClient.downZeroOrder(jsonObjectList); +// if (r.getCode() != 200) { +// return Resp.scanFail("货架下架失败！请联系管理员！", "货架下架失败！请联系管理员！"); +// } +// } +// } +// if (!stockEntityList.isEmpty()) { +// boolean b = distributionStockService.saveBatch(stockEntityList); +// if (b) { +// //修改备货状态 +// distributionAsyncService.stockZero(stockupDTO); +// //下架零担 +// +// return Resp.scanSuccess("备货成功！", "备货成功！"); +// } else { +// // +// return Resp.scanFail("修改失败！！", "修改失败！！"); +// } +// } else { +// if (collect.size() == xiugai) { +// //修改备货状态 +// distributionAsyncService.stockZero(stockupDTO); +// //下架零担 +// return Resp.scanSuccess("备货成功！", "备货成功！"); +// } +// return Resp.scanFail("备货失败！", "备货失败！"); +// } + +// return null; +// } + /** * 查询零担的数据 * @@ -2675,18 +2702,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = new ArrayList<>(); - Map zeroMap = new HashMap<>(); + Map zeroMap = new HashMap<>(); //查询计划数量 List reservationZeroPackageEntities = reservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, stockupDTO.getReservationId()) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, stockupDTO.getStockArticleId()) ); - zeroMap.put("scanNum",0); - zeroMap.put("planNum",0); - if (!reservationZeroPackageEntities.isEmpty()){ + zeroMap.put("scanNum", 0); + zeroMap.put("planNum", 0); + if (!reservationZeroPackageEntities.isEmpty()) { int sum = reservationZeroPackageEntities.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); - zeroMap.put("planNum",sum); + zeroMap.put("planNum", sum); //查询以备数量 List collect = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList()); List stockEntityList = distributionStockService.list(Wrappers.query().lambda() @@ -2694,15 +2721,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity); - List> allocationMapList = new ArrayList<>(); + List> allocationMapList = new ArrayList<>(); if (!locationStockListInformation.isEmpty()) { int sum = locationStockListInformation.stream().mapToInt(WarehouseUpdownGoodsEntity::getNum).sum(); handQuantity = handQuantity - sum; for (WarehouseUpdownGoodsEntity updownGoodsEntity : locationStockListInformation) { - Map map = new HashMap<>(); - map.put("allocationName",updownGoodsEntity.getPositionCode()); - map.put("allocationid",updownGoodsEntity.getAllocationId()); - map.put("num",updownGoodsEntity.getNum()); + Map map = new HashMap<>(); + map.put("allocationName", updownGoodsEntity.getPositionCode()); + map.put("allocationid", updownGoodsEntity.getAllocationId()); + map.put("num", updownGoodsEntity.getNum()); allocationMapList.add(map); } //存在上架数据 //整理数据 } //查询零担打托信息 - List trayGoodsEntities = warehouseTrayGoodsClient.findZeroByOrderCode(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId()); - List> trayMapList = new ArrayList<>(); + List trayGoodsEntities = warehouseTrayGoodsClient.findZeroByOrderCode(stockArticleEntity.getOrderCode(), stockArticleEntity.getWarehouseId()); + List> trayMapList = new ArrayList<>(); if (!trayGoodsEntities.isEmpty()) { // int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum(); Iterator iterator = trayGoodsEntities.iterator(); - while (iterator.hasNext()){ + while (iterator.hasNext()) { //查询是否进行上架 WarehouseTrayGoodsEntity next = iterator.next(); - if (Func.isNotEmpty(warehouseTaryAllocationClient.findAllocationByTrayId(next.getTrayId()))){ + if (Func.isNotEmpty(warehouseTaryAllocationClient.findAllocationByTrayId(next.getTrayId()))) { iterator.remove(); - }else { + } else { handQuantity = handQuantity - next.getNum(); //查询托盘名称 BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(next.getTrayCode()); - Map map = new HashMap<>(); - map.put("trayCode",next.getTrayCode()); - map.put("trayId",next.getTrayId()); - map.put("trayName",trayByTrayCode.getPalletName()); - map.put("num",next.getNum()); + Map map = new HashMap<>(); + map.put("trayCode", next.getTrayCode()); + map.put("trayId", next.getTrayId()); + map.put("trayName", trayByTrayCode.getPalletName()); + map.put("num", next.getNum()); trayMapList.add(map); } } } //整理剩下的数量信息 - Map map = new HashMap<>(); - map.put("num",handQuantity); - if (!allocationMapList.isEmpty()){ - zeroMap.put("allocationList",allocationMapList); + Map map = new HashMap<>(); + map.put("num", handQuantity); + if (!allocationMapList.isEmpty()) { + zeroMap.put("allocationList", allocationMapList); } - if (!trayMapList.isEmpty()){ - zeroMap.put("trayList",trayMapList); + if (!trayMapList.isEmpty()) { + zeroMap.put("trayList", trayMapList); } - if (!map.isEmpty()){ - zeroMap.put("other",map); + if (!map.isEmpty()) { + zeroMap.put("other", map); } return R.data(zeroMap); @@ -2906,7 +2933,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl s = new AtomicReference<>(0); //已扫数量 v.stream().forEach(i -> { DistributionParcelListEntity byId = distributionParcelListService.getById(i.getAssociationId()); - if(ObjectUtils.isNotNull(byId)){ + if (ObjectUtils.isNotNull(byId)) { if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) { f.set(false); } @@ -2941,11 +2968,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl map =distributionStockListInfoMapper.selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(warehouseUpdownGoodsEntity.getAssociationValue(),warehouseUpdownGoodsEntity.getWarehouseId(),cargoNumber); - if(ObjectUtils.isNotNull(map)){ - incomingBatches=map.get("incoming_batch").toString(); + Map map = distributionStockListInfoMapper.selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(warehouseUpdownGoodsEntity.getAssociationValue(), warehouseUpdownGoodsEntity.getWarehouseId(), cargoNumber); + if (ObjectUtils.isNotNull(map)) { + incomingBatches = map.get("incoming_batch").toString(); break; } } @@ -2973,21 +3000,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda(). eq(DistrilbutionBillStockEntity::getBillLadingId, reservationId) .apply("order_status in (1,2)") );//预约信息 - if(!list.isEmpty()){ + if (!list.isEmpty()) { DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId()); mallId = byId.getMallId(); mallName = byId.getMallName(); } - }else{ + } else { // 查询预约单上的商城 DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId); mallId = distributionReservationEntity.getMallId(); @@ -3045,13 +3072,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderCode, distributionStockListEntity.getIncomingBatch()) .eq(DistributionParcelListEntity::getWarehouseId, distributionStockListEntity.getWarehouseId()) .eq(DistributionParcelListEntity::getConditions, 2) ); - if (Func.isNotEmpty(parcelListEntities)){ + if (Func.isNotEmpty(parcelListEntities)) { for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity(); warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId()); @@ -3080,41 +3107,41 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity); - if (Func.isNotEmpty(locationStockListInformation)){ + if (Func.isNotEmpty(locationStockListInformation)) { int sum = locationStockListInformation.stream().mapToInt(WarehouseUpdownGoodsEntity::getNum).sum(); youshuju += sum; } } } - }else if ("2".equals(distributionStockListEntity.getSourceType())){ + } else if ("2".equals(distributionStockListEntity.getSourceType())) { WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity(); warehouseUpdownGoodsEntity.setAssociationValue(stockupDTO.getCargoNumber()); warehouseUpdownGoodsEntity.setAssociationType("4"); warehouseUpdownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId()); warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId()); List locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity); - if (Func.isNotEmpty(locationStockListInformation)){ + if (Func.isNotEmpty(locationStockListInformation)) { int sum = locationStockListInformation.stream().mapToInt(WarehouseUpdownGoodsEntity::getNum).sum(); wushuju += sum; } - }else { - log.info("###################库存品source_type字段缺失:{}",distributionStockListEntity.getIncomingBatch()); + } else { + log.info("###################库存品source_type字段缺失:{}", distributionStockListEntity.getIncomingBatch()); } } StockConfigInfoVO stockConfigInfoVO = new StockConfigInfoVO(); //过滤出同物料库存品的ID信息 List stockListIds = distributionStockListEntities.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList()); List ls = new ArrayList<>(); - if(typeService.equals(StockupTypeConstant.ziti.getValue())){ + if (typeService.equals(StockupTypeConstant.ziti.getValue())) { //自提 // 查询预约单的上的信息 List list = distrilbutionBillStockService.list(Wrappers.query().lambda(). eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId()) .apply("order_status in (1,2)") );//预约信息 - if(!list.isEmpty()){ + if (!list.isEmpty()) { DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId()); - if(ObjectUtils.isNotNull(byId)){ + if (ObjectUtils.isNotNull(byId)) { stockConfigInfoVO.setCustomer(byId.getCustomerName()); //客户0 stockConfigInfoVO.setAddress(byId.getCustomerAddress()); //地址 } @@ -3128,11 +3155,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoods); - if(locationStockListInformation.isEmpty() || ObjectUtils.isNull(locationStockListInformation)){ + if (locationStockListInformation.isEmpty() || ObjectUtils.isNull(locationStockListInformation)) { //不是该货位库存品包件信息； return R.fail("不是该货位库存品包件信息"); } //查询属于那个批次的库存品 DistributionParcelListEntity byId = distributionParcelListService.getById(locationStockListInformation.get(0).getAssociationId()); - if(ObjectUtils.isNull(byId)){ + if (ObjectUtils.isNull(byId)) { return R.fail("订单信息不存在！"); } DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.query().lambda() .eq(DistributionStockListEntity::getIncomingBatch, byId.getOrderCode()) - .eq(DistributionStockListEntity::getWarehouseId,myCurrentWarehouse.getId()) - .eq(DistributionStockListEntity::getCargoNumber,stockupDTO.getCargoNumber()) + .eq(DistributionStockListEntity::getWarehouseId, myCurrentWarehouse.getId()) + .eq(DistributionStockListEntity::getCargoNumber, stockupDTO.getCargoNumber()) ); - if(ObjectUtils.isNull(distributionStockListEntity)){ + if (ObjectUtils.isNull(distributionStockListEntity)) { return R.fail("该包件不是库存品！"); } //查询该预约的库存品信息 @@ -3231,31 +3259,31 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl first = list.stream().filter(i -> i.getStocklistId().equals(distributionStockListEntity.getId())).findFirst(); - if(!first.isPresent()){ + if (!first.isPresent()) { //没有一样的库存品数据 return R.fail("没有一样的库存品数据"); } //判断数量是否可以直接备货 DistributionReservationStocklistEntity reservationStocklistEntity1 = first.get(); - if(reservationStocklistEntity1.getRealityNum() < reservationStocklistEntity1.getReservationNum()){ + if (reservationStocklistEntity1.getRealityNum() < reservationStocklistEntity1.getReservationNum()) { return R.success("可以直接备货！"); } List keYi = new ArrayList<>(); //可以操作的库存品 //取出一样的库存品信息 - list.forEach( i -> { + list.forEach(i -> { DistributionStockListEntity distributionStockListEntity1 = distributionStockListMapper.selectById(i.getStocklistId()); - if(distributionStockListEntity1.getDescriptionGoods().equals(distributionStockListEntity.getDescriptionGoods()) + if (distributionStockListEntity1.getDescriptionGoods().equals(distributionStockListEntity.getDescriptionGoods()) && distributionStockListEntity1.getCargoNumber().equals(distributionStockListEntity.getCargoNumber()) - && i.getRealityNum() < i.getReservationNum() ){ + && i.getRealityNum() < i.getReservationNum()) { keYi.add(i); } }); - if(keYi.isEmpty()){ + if (keYi.isEmpty()) { return R.fail("没有可以操作的库存品数据"); } //获取数据 @@ -3267,7 +3295,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl collect2 = keYi.stream().filter(i -> i.getStocklistId().equals(distributionStockListEntities.get(0).getId())).findFirst(); - if(collect2.isPresent()){ + if (collect2.isPresent()) { DistributionReservationStocklistEntity distributionReservationStocklistEntity = collect2.get(); Integer reservationNum = distributionReservationStocklistEntity.getReservationNum() - 1; @@ -3280,7 +3308,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list1 = disStockListDetailService.list(Wrappers.query().lambda() @@ -3288,7 +3316,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl stockupPackageListDetailExcels = baseMapper.exportStockUptOrderDetail(list); - if (Func.isNotEmpty(stockupPackageListDetailExcels)){ + if (Func.isNotEmpty(stockupPackageListDetailExcels)) { for (DistributionStockupPackageListDetailExcel stockupPackageListDetailExcel : stockupPackageListDetailExcels) { - if (stockupPackageListDetailExcel.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (stockupPackageListDetailExcel.getIsZero().equals(IsOrNoConstant.no.getValue())) { //订制品订单 查询托盘和库位 - String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(),3); - if (Func.isNotBlank(trayName)){ + String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(), 3); + if (Func.isNotBlank(trayName)) { stockupPackageListDetailExcel.setTrayNames(trayName); } - String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(),3); - if (Func.isNotBlank(allocationName)){ + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderPackageCode(), 3); + if (Func.isNotBlank(allocationName)) { stockupPackageListDetailExcel.setAllocationNames(allocationName); } - }else { + } else { //零担 - String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(),1); - if (Func.isNotBlank(trayName)){ + String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(), 1); + if (Func.isNotBlank(trayName)) { stockupPackageListDetailExcel.setTrayNames(trayName); } - String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(),1); - if (Func.isNotBlank(allocationName)){ + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(stockupPackageListDetailExcel.getOrderCode(), 1); + if (Func.isNotBlank(allocationName)) { stockupPackageListDetailExcel.setAllocationNames(allocationName); } } @@ -3360,38 +3388,38 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl stockupInventoryListDetailExcels = baseMapper.exportStockUptInventoryDetail(list); boolean flag = stockupInventoryListDetailExcels.stream().allMatch(r -> Func.isNotEmpty(r.getId())); - if (flag){ - if (Func.isNotEmpty(stockupInventoryListDetailExcels)){ + if (flag) { + if (Func.isNotEmpty(stockupInventoryListDetailExcels)) { for (DistributionStockupPackageListDetailExcel stockupInventoryListDetailExcel : stockupInventoryListDetailExcels) { //查询库存品托盘信息 DistributionStockListEntity distributionStockLisEntity = distributionStockListMapper.selectById(stockupInventoryListDetailExcel.getId()); - if ("1".equals(distributionStockLisEntity.getSourceType())){ + if ("1".equals(distributionStockLisEntity.getSourceType())) { //转 List parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderCode, distributionStockLisEntity.getIncomingBatch()) .eq(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue()) .eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue()) ); - if (Func.isNotEmpty(parcelListEntities)){ + if (Func.isNotEmpty(parcelListEntities)) { String orderpackageCode = parcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); //订制品订单 查询托盘和库位 - String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(orderpackageCode,3); - if (Func.isNotBlank(trayName)){ + String trayName = warehouseTrayGoodsClient.getTrayNameByOrderPackageCode(orderpackageCode, 3); + if (Func.isNotBlank(trayName)) { stockupInventoryListDetailExcel.setTrayNames(trayName); } - String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(orderpackageCode,3); - if (Func.isNotBlank(allocationName)){ + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByOrderPackageCode(orderpackageCode, 3); + if (Func.isNotBlank(allocationName)) { stockupInventoryListDetailExcel.setAllocationNames(allocationName); } } - }else { + } else { //导 - String trayName = warehouseTrayGoodsClient.getTrayInfoByInventory(distributionStockLisEntity.getMarketId(),distributionStockLisEntity.getCargoNumber()); - if (Func.isNotBlank(trayName)){ + String trayName = warehouseTrayGoodsClient.getTrayInfoByInventory(distributionStockLisEntity.getMarketId(), distributionStockLisEntity.getCargoNumber()); + if (Func.isNotBlank(trayName)) { stockupInventoryListDetailExcel.setTrayNames(trayName); } - String allocationName = warehouseUpdownGoodsClient.getAllocationNameByInventory(distributionStockLisEntity.getMarketId(),distributionStockLisEntity.getCargoNumber()); - if (Func.isNotBlank(allocationName)){ + String allocationName = warehouseUpdownGoodsClient.getAllocationNameByInventory(distributionStockLisEntity.getMarketId(), distributionStockLisEntity.getCargoNumber()); + if (Func.isNotBlank(allocationName)) { stockupInventoryListDetailExcel.setAllocationNames(allocationName); } @@ -3413,11 +3441,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl detailVOS = baseMapper.selectInventoryDetailByBillLadingIdAndStockListId(billLadingId,stockListId); + List detailVOS = baseMapper.selectInventoryDetailByBillLadingIdAndStockListId(billLadingId, stockListId); return R.data(detailVOS); } From 6aa6f31faa55a113361f2372284eed2ae1cc3e94 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 15:57:00 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +- .../service/impl/DistributionSignforServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 7e7d54eb4..33141b860 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1038,7 +1038,7 @@ LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id WHERE - ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1 + ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0 select GROUP_CONCAT(DISTINCT brand) brand, GROUP_CONCAT(DISTINCT train_number) trainNumber, - GROUP_CONCAT(DISTINCT order_code) orderCode + GROUP_CONCAT(DISTINCT order_code) orderCode, + GROUP_CONCAT(DISTINCT dealer_code) dealerCode, + GROUP_CONCAT(DISTINCT dealer_name) dealerName from logpm_trunkline_advance where is_deleted = 0 and id in @@ -138,19 +140,22 @@ - select lww.waybill_no waybillNo, + select lww.id waybillId, + lww.waybill_no waybillNo, lww.create_time createTime, lww.goods_name goodsName, lww.destination destination, 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 0441a8ee0..4086707db 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 @@ -48,6 +48,7 @@ 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 diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 548e321e6..340b96c30 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -17,6 +17,11 @@ import java.util.List; @Mapper public interface TrunklineCarsLoadMapper extends BaseMapper { + /** + * @param page + * @param loadCarsDTO + * @return + */ IPage loadCarsPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); IPage arriveCarsPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 1a5bc1364..7efe9e771 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -41,6 +41,7 @@ left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcl.id where ltcl.is_deleted = 0 and ltcl.load_type != '4' + and ltcl.load_status != '100' and ltcl.start_warehouse_id = #{param.warehouseId} @@ -375,6 +376,7 @@ and ltcl.load_status = '0' + and ltcl.load_status != '100' and ltcl.load_status != '0' diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index 0c37661b2..d532bbce3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -126,4 +126,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findWaybillCarsLoadInfo(@Param("waybillId") Long waybillId); List findWaybillTransferInfo(@Param("waybillId") Long waybillId); + + List loadingDetailExport(@Param("param") LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 06a1d48d1..a7f98ac9f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -583,10 +583,42 @@ ltcl.remark remark from logpm_trunkline_cars_load_scan ltcls left join logpm_trunkline_cars_load ltcl on ltcl.id = ltcls.load_id - where ltcls.waybill_no = #{waybillNo} + where ltcls.waybill_id = #{waybillId} and ltcl.load_type = 4 group by ltcl.cars_no order By ltcl.start_time asc + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index 51bd8eabe..65870624b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -122,4 +122,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService findWaybillTransferInfo(Long waybillId); + List loadingDetailExport(LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 342f8c137..5cad80db2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -5,6 +5,7 @@ import com.logpm.trunkline.dto.BatchUnloadDTO; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TripartiteTransferVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; import org.springblade.core.mp.base.BaseService; @@ -205,4 +206,5 @@ public interface ITrunklineCarsLoadService extends BaseService loadingDetailExport(LoadCarsDTO loadCarsDTO); } 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 3c3f7cd2a..df09c01c1 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 @@ -146,15 +146,15 @@ public class InComingServiceImpl implements IInComingService { } List ls = advanceService.findIncomingOrderList(inComingDTO); - for (TrunklineAdvanceVO advanceVO : ls) { - Long advanceId = advanceVO.getId(); - Integer num = advanceDetailService.findListByAdvanceIdAndPackageStatus(advanceId,"0"); - if(num > 0){ - advanceVO.setIsIncoming(1); - }else{ - advanceVO.setIsIncoming(0); - } - } +// for (TrunklineAdvanceVO advanceVO : ls) { +// Long advanceId = advanceVO.getId(); +// Integer num = advanceDetailService.findListByAdvanceIdAndPackageStatus(advanceId,"0"); +// if(num > 0){ +// advanceVO.setIsIncoming(1); +// }else{ +// advanceVO.setIsIncoming(0); +// } +// } return R.data(ls); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index ed8542c61..93378b671 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -94,9 +94,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { page.setCurrent(advanceDTO.getPageNum()); page.setSize(advanceDTO.getPageSize()); - IPage pageList = advanceService.advancePageList(page, advanceDTO); - - return pageList; + return advanceService.advancePageList(page, advanceDTO); } @Override @@ -139,6 +137,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds); BeanUtil.copy(infoByIds, openOrderVO); openOrderVO.setAdvanceIds(advanceIds); + BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + if(!Objects.isNull(basicdataBrandEntity)){ + openOrderVO.setBrandId(basicdataBrandEntity.getId()); + } //发站仓-----目前登录人的仓库 openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName()); openOrderVO.setDepartureWarehouseId(warehouseId); @@ -303,13 +305,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String brand = openOrderDTO.getBrand(); - BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + Long brandId = openOrderDTO.getBrandId(); +// BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); waybillEntity.setWaybillNo(waybillNo); - if (!Objects.isNull(basicdataBrandEntity)) { - waybillEntity.setBrandId(basicdataBrandEntity.getId()); - } +// if (!Objects.isNull(basicdataBrandEntity)) { +// waybillEntity.setBrandId(basicdataBrandEntity.getId()); +// } + + waybillEntity.setBrandId(brandId); waybillEntity.setBrand(brand); waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); waybillEntity.setDepartureWarehouseId(departureWarehouseId); @@ -526,7 +531,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } //判断是否是开单及入库的配置 - Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, basicdataBrandEntity.getId()); + Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId); if (aBoolean) { openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode()); } @@ -2823,7 +2828,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { entity.setOrderPackageStockupStatus("10"); entity.setOrderPackageReservationStatus("10"); entity.setOrderPackageLoadingStatus("10"); - entity.setWaybillId(warehouseWaybill.getId() + ""); + entity.setWaybillId(warehouseWaybill.getId()); entity.setWaybillNumber(warehouseWaybill.getWaybillNo()); entity.setIsZero("1"); entity.setWarehouseEntryTimeEnd(date); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 250e10208..ec09b09a2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -227,7 +227,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl pageList = baseMapper.pageList(page,billladingDTO); - - return pageList; + return baseMapper.pageList(page,billladingDTO); } @Override @@ -124,7 +123,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl pageList = baseMapper.pageInfoList(page,billladingDTO); - - return pageList; + return baseMapper.pageInfoList(page,billladingDTO); } @Override @@ -168,7 +165,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl findAdvanceDetailList(BillladingDTO billladingDTO) { -// Integer pageNum = billladingDTO.getPageNum(); -// Integer pageSize = billladingDTO.getPageSize(); - String orderCode = billladingDTO.getOrderCode(); -// IPage page = new Page<>(); -// page.setCurrent(pageNum); -// page.setSize(pageSize); - List ls = baseMapper.findAdvanceDetailList(orderCode); + String orderCode = billladingDTO.getOrderCode(); - return ls; + return baseMapper.findAdvanceDetailList(orderCode); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java index ab574ef14..2242d5bfe 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java @@ -31,7 +31,8 @@ public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("load_id",loadId) - .eq("node_id",nodeId); + .eq("node_id",nodeId) + .eq("is_deleted",0); return baseMapper.selectOne(queryWrapper); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 3ad55de2b..058bc0b9a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -298,4 +298,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl loadingDetailExport(LoadCarsDTO loadCarsDTO) { + return baseMapper.loadingDetailExport(loadCarsDTO); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 0d7dd469c..0657da398 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -29,73 +29,11 @@ import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.trunkline.bean.Resp; -import com.logpm.trunkline.dto.BatchUnloadDTO; -import com.logpm.trunkline.dto.InComingDTO; -import com.logpm.trunkline.dto.LoadCarsDTO; -import com.logpm.trunkline.dto.LoadScanBrandDTO; -import com.logpm.trunkline.dto.LoadingPackageDTO; -import com.logpm.trunkline.dto.LoadingZeroDTO; -import com.logpm.trunkline.dto.ProductInfoDTO; -import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; -import com.logpm.trunkline.dto.TrunklineCarsLoadLineDTO; -import com.logpm.trunkline.dto.TrunklineCarsOrderDTO; -import com.logpm.trunkline.dto.UnloadPackageDTO; -import com.logpm.trunkline.dto.UnloadZeroDTO; -import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadContractEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadFinanceEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; -import com.logpm.trunkline.entity.TrunklineCarsOrderEntity; -import com.logpm.trunkline.entity.TrunklineCostShareRecordEntity; -import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; -import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; +import com.logpm.trunkline.dto.*; +import com.logpm.trunkline.entity.*; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; -import com.logpm.trunkline.service.ICarsLoadAsyncService; -import com.logpm.trunkline.service.IInComingService; -import com.logpm.trunkline.service.IOpenOrderAsyncService; -import com.logpm.trunkline.service.IPackageTrackLogAsyncService; -import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; -import com.logpm.trunkline.service.ITrunklineCarsLoadContractService; -import com.logpm.trunkline.service.ITrunklineCarsLoadFinanceService; -import com.logpm.trunkline.service.ITrunklineCarsLoadLineService; -import com.logpm.trunkline.service.ITrunklineCarsLoadLogService; -import com.logpm.trunkline.service.ITrunklineCarsLoadScanService; -import com.logpm.trunkline.service.ITrunklineCarsLoadService; -import com.logpm.trunkline.service.ITrunklineCarsLoadingLogService; -import com.logpm.trunkline.service.ITrunklineCarsOrderService; -import com.logpm.trunkline.service.ITrunklineCarsSignLogService; -import com.logpm.trunkline.service.ITrunklineCarsUnloadLogService; -import com.logpm.trunkline.service.ITrunklineCostShareRecordService; -import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; -import com.logpm.trunkline.service.ITrunklineLoadSignPhotoService; -import com.logpm.trunkline.service.ITrunklineWaybillOrderService; -import com.logpm.trunkline.vo.CarsLoadAllOrderVO; -import com.logpm.trunkline.vo.CarsLoadOrderInfoVO; -import com.logpm.trunkline.vo.CarsLoadWaybillInfoVO; -import com.logpm.trunkline.vo.HasNotFinalNodeIdDataVO; -import com.logpm.trunkline.vo.LoadScanFinalNodeIdVO; -import com.logpm.trunkline.vo.LoadScanOrderVO; -import com.logpm.trunkline.vo.LoadZeroListVO; -import com.logpm.trunkline.vo.LoadingListGoodsVO; -import com.logpm.trunkline.vo.LoadingListMainVO; -import com.logpm.trunkline.vo.NodeNumDataVO; -import com.logpm.trunkline.vo.OrderScanDetailVO; -import com.logpm.trunkline.vo.SignOrderDetailVO; -import com.logpm.trunkline.vo.SignPackageVO; -import com.logpm.trunkline.vo.SignScanOrderVO; -import com.logpm.trunkline.vo.TripartiteTransferVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadLoadingListVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadScanVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadVO; -import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; -import com.logpm.trunkline.vo.UnloadPackageVO; -import com.logpm.trunkline.vo.UnloadScanOrderVO; -import com.logpm.trunkline.vo.UnloadZeroVO; -import com.logpm.trunkline.vo.WaybillCarsLoadVO; -import com.logpm.trunkline.vo.ZeroSuppleVO; +import com.logpm.trunkline.service.*; +import com.logpm.trunkline.vo.*; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; @@ -105,11 +43,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringEscapeUtils; -import org.springblade.common.constant.CodeNumConstant; -import org.springblade.common.constant.DictBizConstant; -import org.springblade.common.constant.IncomingTypeEnum; -import org.springblade.common.constant.RabbitConstant; -import org.springblade.common.constant.WorkNodeEnums; +import org.springblade.common.constant.*; import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -128,14 +62,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -186,15 +114,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.loadCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { + //把records中的id封装成一个set + Set idsSet = records.stream() + .map(TrunklineCarsLoadVO::getId) // Assuming getId() method returns the id as an Integer + .collect(Collectors.toSet()); + //判空idsSet + if (idsSet.isEmpty()) { + return pageList; + } + //使用trunklineCarsLoadLineService通过idsSet关联loadId批量查询TrunklineCarsLoadLineEntity集合 + List loadLineList = trunklineCarsLoadLineService.list(new QueryWrapper().in("load_id", idsSet)); + //把loadLineList中对象通过loadId分组 + Map> loadLineMap = loadLineList.stream() + .collect(Collectors.groupingBy(TrunklineCarsLoadLineEntity::getLoadId)); + records.forEach(trunklineCarsLoadVO -> { Long loadId = trunklineCarsLoadVO.getId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted", 0) - .eq("load_id", loadId) - .orderByAsc("sort"); - List list = trunklineCarsLoadLineService.list(queryWrapper); + List list = loadLineMap.get(loadId); trunklineCarsLoadVO.setCarsLoadLineList(list); - } + }); pageList.setRecords(records); return pageList; } @@ -207,15 +144,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { + //把records中的id封装成一个set + Set idsSet = records.stream() + .map(TrunklineCarsLoadVO::getId) // Assuming getId() method returns the id as an Integer + .collect(Collectors.toSet()); + //判空idsSet + if (idsSet.isEmpty()) { + return pageList; + } + //使用trunklineCarsLoadLineService通过idsSet关联loadId批量查询TrunklineCarsLoadLineEntity集合 + List loadLineList = trunklineCarsLoadLineService.list(new QueryWrapper().in("load_id", idsSet)); + //把loadLineList中对象通过loadId分组 + Map> loadLineMap = loadLineList.stream() + .collect(Collectors.groupingBy(TrunklineCarsLoadLineEntity::getLoadId)); + records.forEach(trunklineCarsLoadVO -> { Long loadId = trunklineCarsLoadVO.getId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted", 0) - .eq("load_id", loadId) - .orderByAsc("sort"); - List list = trunklineCarsLoadLineService.list(queryWrapper); + List list = loadLineMap.get(loadId); trunklineCarsLoadVO.setCarsLoadLineList(list); - } + }); pageList.setRecords(records); return pageList; } @@ -786,7 +732,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadScanIdList = trunklineCarsLoadScanService.findAllIdListByLoadId(loadId); - removeCarsLoadScan(StringUtil.join(carsLoadScanIdList, ","), warehouseId); + //通过loadId更新carsOrder关联表中的所有订单startNum为0 + trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId); + + if(CollUtil.isNotEmpty(carsLoadScanIdList)){ + removeCarsLoadScan(StringUtil.join(carsLoadScanIdList, ","), warehouseId); + } try { trunklineCarsLoadLogService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_CARS_LOAD.getValue()); @@ -2057,6 +2008,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO); + trunklineCarsLoadScanService. + return R.data(pageList); } @@ -2154,6 +2107,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.carsLoadPageList(page, loadCarsDTO); List records = pageList.getRecords(); + //循环records，获取字典值 for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { String loadStatus = trunklineCarsLoadVO.getLoadStatus(); String value = DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus); @@ -4478,6 +4433,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingDetailExport(LoadCarsDTO loadCarsDTO) { + return trunklineCarsLoadScanService.loadingDetailExport(loadCarsDTO); + } + @Override public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) { log.info("##############loadingTrayInfo: 查询托盘的货物信息"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index c44067c05..139197ba8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -99,7 +99,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -146,11 +146,11 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单编号不能为空 orderCode={}",orderCode); return R.fail(403,"订单编号不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"订单编号不能为空 trayCode={}",trayCode); return R.fail(403,"订单编号不能为空"); } @@ -181,15 +181,15 @@ public class WarehouseTrayTypeApiController { String trayCode = trayTypeDTO.getTrayCode(); String orderPackageCode = trayTypeDTO.getOrderPackageCode();//包条码 - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(orderPackageCode)){ + if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包条码不能为空 orderPackageCode={}",orderPackageCode); return R.fail(403,"包条码不能为空"); } @@ -223,11 +223,11 @@ public class WarehouseTrayTypeApiController { List orderPackageCodes = trayTypeDTO.getOrderPackageCodes(); String trayCode = trayTypeDTO.getTrayCode();//托盘码 - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(Objects.isNull(orderPackageCodes)||orderPackageCodes.size() == 0){ + if(Objects.isNull(orderPackageCodes)||orderPackageCodes.isEmpty()){ log.warn(method+"包条码不能为空 orderPackageCodes={}",orderPackageCodes); return R.fail(403,"包条码不能为空"); } @@ -262,11 +262,11 @@ public class WarehouseTrayTypeApiController { String orderCode = trayTypeDTO.getOrderCode(); String trayCode = trayTypeDTO.getTrayCode();//托盘码 - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单号不能为空 orderCode={}",orderCode); return R.fail(403,"订单号不能为空"); } @@ -345,7 +345,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -388,7 +388,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息不能为空"); return R.fail(403,"仓库信息不能为空"); } - if(!StringUtil.hasLength(waybillCode)){ + if(StringUtil.isBlank(waybillCode)){ log.warn(method+"运单号不能为空 waybillCode={}",waybillCode); return R.fail(403,"运单号不能为空"); } @@ -420,11 +420,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayCode={}",trayCode); return R.fail(403,"打托方式不能为空"); } @@ -455,11 +455,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单不能为空 trayCode={}",trayCode); return R.fail(403,"打托方式不能为空"); } @@ -480,9 +480,12 @@ public class WarehouseTrayTypeApiController { public R updateZeroOrderNumByTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########updateZeroOrderNumByTrayCode: "; log.info(method + "更新零担订单数量 trayTypeDTO={}", trayTypeDTO); - String orderCode = trayTypeDTO.getOrderCode();//订单自编码 - String trayCode = trayTypeDTO.getTrayCode();//托盘码 - Integer num = trayTypeDTO.getNum();//数量 + //订单自编码 + String orderCode = trayTypeDTO.getOrderCode(); + //托盘码 + String trayCode = trayTypeDTO.getTrayCode(); + //数量 + Integer num = trayTypeDTO.getNum(); try{ BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -490,11 +493,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单不能为空 orderCode={}",orderCode); return R.fail(403,"订单不能为空"); } @@ -524,10 +527,11 @@ public class WarehouseTrayTypeApiController { public R zeroOrderUpdateRemark(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########updateZeroOrderNumByTrayCode: "; log.info(method + "更新零担订单数量 trayTypeDTO={}", trayTypeDTO); - String trayCode = trayTypeDTO.getTrayCode();//托盘码 + //托盘码 + String trayCode = trayTypeDTO.getTrayCode(); String remark = trayTypeDTO.getRemark(); try{ - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } @@ -597,7 +601,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -644,15 +648,15 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(orderPackageCode)){ + if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包条码不能为空 orderPackageCode={}",orderPackageCode); return R.fail(403,"包条码不能为空"); } @@ -777,7 +781,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -827,7 +831,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空"); } - if(!StringUtil.hasLength(materialCode)){ + if(StringUtil.isBlank(materialCode)){ log.warn(method+"物料编码不能为空 materialCode={}",materialCode); return R.fail(403,"物料编码不能为空"); } @@ -863,7 +867,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空"); } - if(!StringUtil.hasLength(materialName)){ + if(StringUtil.isBlank(materialName)){ log.warn(method+"物料名称不能为空 materialCode={}",materialName); return R.fail(403,"物料名称不能为空"); } @@ -898,19 +902,19 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(materialCode)){ + if(StringUtil.isBlank(materialCode)){ log.warn(method+"物料编码不能为空 materialCode={}",materialCode); return R.fail(403,"物料编码不能为空"); } - if(!StringUtil.hasLength(incomingBatch)){ + if(StringUtil.isBlank(incomingBatch)){ log.warn(method+"批次号不能为空 incomingBatch={}",incomingBatch); return R.fail(403,"批次号不能为空"); } From 3a34582b050fffbec67a6c1a763478da3051bf05 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 22 Apr 2024 19:14:25 +0800 Subject: [PATCH 08/16] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 0657da398..b99432b5f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -2008,8 +2008,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO); - trunklineCarsLoadScanService. - return R.data(pageList); } From d3e7d2cf3255f2c1be23fce7ae286fba85b6439f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 19:27:09 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=A4=9A=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 25980214b..245f40352 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 @@ -2805,7 +2805,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Mon, 22 Apr 2024 19:29:53 +0800 Subject: [PATCH 10/16] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 93378b671..12a2e919e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -306,15 +306,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String brand = openOrderDTO.getBrand(); Long brandId = openOrderDTO.getBrandId(); -// BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); waybillEntity.setWaybillNo(waybillNo); -// if (!Objects.isNull(basicdataBrandEntity)) { -// waybillEntity.setBrandId(basicdataBrandEntity.getId()); -// } + if(Objects.isNull(brandId)){ + BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + if (!Objects.isNull(basicdataBrandEntity)) { + waybillEntity.setBrandId(basicdataBrandEntity.getId()); + } + }else{ + waybillEntity.setBrandId(brandId); + } - waybillEntity.setBrandId(brandId); waybillEntity.setBrand(brand); waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); waybillEntity.setDepartureWarehouseId(departureWarehouseId); From f038479e5dfbbad04af608a8f090a96f81b8b066 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 22 Apr 2024 19:30:51 +0800 Subject: [PATCH 11/16] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E6=89=93?= =?UTF-8?q?=E6=89=98=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java | 3 +++ .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 3 ++- .../service/impl/DistributionStockupServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java index b19577a77..b9f3e2261 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java @@ -49,4 +49,7 @@ public class BasicdataTrayVO extends BasicdataTrayEntity { @ApiModelProperty(value = "打托方式显示") private String trayTypeString; + @ApiModelProperty(value = "串货条件") + private String filterValue; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 8c43cef07..a1eedfaeb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -61,7 +61,8 @@ tray.tray_status, warehouse.name AS warehouseName, tray.`type`, - lwtt.tray_type + lwtt.tray_type, + lwtt.filter_value FROM logpm_warehouse_tray AS tray left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 3bf4d031c..121b2b3a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2931,7 +2931,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl { // List di = new ArrayList<>(); // AtomicReference s = new AtomicReference<>(0); //已扫数量 - v.stream().forEach(i -> { + v.forEach(i -> { DistributionParcelListEntity byId = distributionParcelListService.getById(i.getAssociationId()); if (ObjectUtils.isNotNull(byId)) { if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) { From 08ded7c61e99ca8fc666694f79aaf98997d29250 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 22 Apr 2024 19:31:16 +0800 Subject: [PATCH 12/16] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 12a2e919e..f923ca288 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -313,12 +313,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { if(Objects.isNull(brandId)){ BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); if (!Objects.isNull(basicdataBrandEntity)) { - waybillEntity.setBrandId(basicdataBrandEntity.getId()); + brandId = basicdataBrandEntity.getId(); } - }else{ - waybillEntity.setBrandId(brandId); } + waybillEntity.setBrandId(brandId); waybillEntity.setBrand(brand); waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); waybillEntity.setDepartureWarehouseId(departureWarehouseId); From 1b0facbcbdc5ebd4ae9bd0ec24feb24d15c9d444 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 22 Apr 2024 19:38:37 +0800 Subject: [PATCH 13/16] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index f923ca288..01efcd775 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -535,7 +535,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //判断是否是开单及入库的配置 Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId); - if (aBoolean) { + if (Boolean.TRUE.equals(aBoolean)) { openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode()); } From 941e810fcc0ac4cf6cfaf81cb8c261ccef58c1bc Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Mon, 22 Apr 2024 19:47:09 +0800 Subject: [PATCH 14/16] =?UTF-8?q?feat(all):=20=E6=B7=BB=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E5=AF=BC=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/vo/BasicdatPriceApiVO.java | 35 ++++---- .../controller/BasicdataPriceController.java | 21 +++-- .../BasicdataPriceCategoryBasicExcel.java | 62 +++++++++++++ .../BasicdataPriceCategoryDispatchExcel.java | 66 ++++++++++++++ .../BasicdataPriceCategoryWarehouseExcel.java | 67 +++++++++++++++ .../excel/price/BasicdataPriceExcel.java | 86 +++++++++++++++++++ .../price/BasicdataPriceFullVehicleExcel.java | 60 +++++++++++++ .../price/BasicdataPriceGeneralExcel.java | 84 ++++++++++++++++++ .../service/IBasicdataPriceService.java | 11 +-- .../impl/BasicdataPriceServiceImpl.java | 47 +++++----- .../src/main/resources/application.yml | 2 +- 11 files changed, 483 insertions(+), 58 deletions(-) create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java index d77bc9443..f59fbd0ac 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java @@ -16,11 +16,10 @@ */ package com.logpm.basicdata.vo; -import com.logpm.basicdata.enums.PriceBizTypeApiEnums; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,27 +32,25 @@ import java.io.Serializable; public class BasicdatPriceApiVO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ @NotEmpty(message = "客户id不能为空") + @ApiModelProperty(value = "客户id") private String clientId; - /** - * 品牌id - */ @NotEmpty(message = "品牌id不能为空") + @ApiModelProperty(value = "品牌id") private String brandId; - /** - * 发货单位id - */ + @ApiModelProperty(value = "发货单位id") private String sendOrgId; - /** - * 始发地 - */ - private String startAreaId; - /** - * 目的地 - */ - private String endAreaId; + @ApiModelProperty(value = "始发地省份id") + private Long startProvinceId; + @ApiModelProperty(value = "始发地城市id") + private Long startCityId; + @ApiModelProperty(value = "始发地区县id") + private Long startCountyId; + @ApiModelProperty(value = "目的地省份id") + private Long endProvinceId; + @ApiModelProperty(value = "目的地城市id") + private Long endCityId; + @ApiModelProperty(value = "目的地区县id") + private Long endCountyId; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java index 2a7fc4efb..b6e9ac560 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java @@ -19,8 +19,10 @@ package com.logpm.basicdata.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.service.IBasicdataPriceService; +import com.logpm.basicdata.vo.BasicdatPriceApiVO; import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO; import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.PriceClientVO; import com.logpm.basicdata.vo.PriceVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -113,13 +115,18 @@ public class BasicdataPriceController extends BladeController { @ApiImplicitParam(name = "file", value = "文件", dataType = "MultipartFile") }) public R upload(@RequestPart("file") MultipartFile file) { - try (InputStream inputStream = file.getInputStream()) { - String res = basicdataPriceService.upload(inputStream); - return R.data(res); - } catch (Exception e) { - e.printStackTrace(); - } - return R.data("上传失败"); + return R.data(basicdataPriceService.upload(file)); + } + + /** + * 基础价格表 指定查询 + */ + @GetMapping("/custom") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "指定条件查询", notes = "传入basicdataPrice") + public R custom(BasicdatPriceApiVO param) { + PriceClientVO detail = basicdataPriceService.price(param); + return R.data(detail); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java new file mode 100644 index 000000000..7001e55de --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryBasicExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "发站", index = 2) + private String startName; + @ExcelProperty(value = "到站", index = 3) + private String endName; + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + @ExcelProperty(value = "服务类型", index = 5) + private String type; + @ExcelProperty(value = "计费类型", index = 6) + private String costType; + @ExcelProperty(value = "品类", index = 7) + private String category; + @ExcelProperty(value = "单价", index = 8) + private String price; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java new file mode 100644 index 000000000..9c8a6c51b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryDispatchExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "费用类型", index = 2) + private String type; + @ExcelProperty(value = "计价方式", index = 3) + private String costType; + @ExcelProperty(value = "品类", index = 4) + private String category; + @ExcelProperty(value = "单价", index = 5) + private Double price; + @ExcelProperty(value = "遗留单价", index = 6) + private Double leaveBehindPrice; + @ExcelProperty(value = "分货费", index = 7) + private Double sortPrice; + @ExcelProperty(value = "操作/装卸费", index = 8) + private Double handlingPrice; + @ExcelProperty(value = "平移费", index = 9) + private Double relocationPrice; + @ExcelProperty(value = "上楼费", index = 10) + private Double upstairsDeliveryPrice; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java new file mode 100644 index 000000000..310c986d8 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryWarehouseExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "计价方式", index = 2) + private String costType; + @ExcelProperty(value = "品类", index = 3) + private String category; + @ExcelProperty(value = "30天内", index = 4) + private String withinThirtyPrice; + @ExcelProperty(value = "30-60天", index = 5) + private String betweenThirtySixtyPrice; + @ExcelProperty(value = "60天外", index = 6) + private String beyondSixtyPrice; + @ExcelProperty(value = "上限价格", index = 7) + private String maximumPrice; + @ExcelProperty(value = "操作/装卸费", index = 8) + private String operatePrice; + @ExcelProperty(value = "仓储管理费", index = 9) + private String warehouseManagementPrice; + @ExcelProperty(value = "仓储分货费", index = 10) + private String warehouseSortPrice; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java new file mode 100644 index 000000000..a7eb045e4 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称", index = 0) + private String client; + /** + * 品牌 + */ + @ExcelProperty(value = "品牌", index = 1) + private String brand; + /** + * 生效时间 + */ + @ExcelProperty(value = "生效时间", index = 2) + private String effectiveTime; + /** + * 到期时间 + */ + @ExcelProperty(value = "到期时间", index = 3) + private String expiryTime; + /** + * 模版名称 + */ + @ExcelProperty(value = "模版名称", index = 4) + private String templateName; + /** + * 向上判断件数 + */ + @ExcelProperty(value = "向上判断件数", index = 5) + private String dispatchUpwardJudgment; + + /** + * 向上判断件数 + */ + @ExcelProperty(value = "向上判断件数", index = 6) + private String dispatchUpwardJudgmentCost; + + /** + * 上楼费免费楼层 + */ + @ExcelProperty(value = "上楼费免费楼层", index = 7) + private String dispatchStairsCarryingCharge; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java new file mode 100644 index 000000000..262959caf --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceFullVehicleExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "发站", index = 2) + private String startName; + @ExcelProperty(value = "到站", index = 3) + private String endName; + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + @ExcelProperty(value = "类型", index = 5) + private String type; + @ExcelProperty(value = "车型", index = 6) + private String vehicleType; + @ExcelProperty(value = "整车计费（元/车）", index = 7) + private String price; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java new file mode 100644 index 000000000..1cb171c38 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceGeneralExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称", index = 0) + private String client; + /** + * 品牌 + */ + @ExcelProperty(value = "品牌", index = 1) + private String brand; + /** + * 发站 + */ + @ExcelProperty(value = "发站", index = 2) + private String startName; + /** + * 到站 + */ + @ExcelProperty(value = "到站", index = 3) + private String endName; + /** + * 发货单位 + */ + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + /** + * 类型 + */ + @ExcelProperty(value = "类型", index = 5) + private String type; + /** + * 最低计费值 + */ + @ExcelProperty(value = "最低计费值", index = 6) + private String minCost; + /** + * 加算价格 + */ + @ExcelProperty(value = "加算价格", index = 7) + private String addCost; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java index b1d37d20e..3826bbbb7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java @@ -47,15 +47,6 @@ public interface IBasicdataPriceService extends BaseService selectBasicdataPricePage(IPage page, BasicdataPricePageVO basicdataPrice); - - /** - * 导出数据 - * - * @param queryWrapper - * @return - */ - List exportBasicdataPrice(Wrapper queryWrapper); - Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo); Boolean updatePrice(PriceVO vo); @@ -77,5 +68,5 @@ public interface IBasicdataPriceService extends BaseService exportBasicdataPrice(Wrapper queryWrapper) { - List basicdataPriceList = baseMapper.exportBasicdataPrice(queryWrapper); - return basicdataPriceList; - } - @Override public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) { if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) { @@ -318,8 +314,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl routeEntities = basicdataPriceRouteService.list(Wrappers.lambdaQuery() .eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId()) .eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId()) - .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId()) - .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId()) + .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId()) + .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId()) .eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.PICK_UP.getCode()) ); if (CollUtil.isNotEmpty(routeEntities)) { @@ -347,8 +343,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl routeEntities = basicdataPriceRouteService.list(Wrappers.lambdaQuery() .eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId()) .eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId()) - .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId()) - .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId()) + .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId()) + .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId()) .eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.TRUNK_LINE.getCode()) ); if (CollUtil.isNotEmpty(routeEntities)) { @@ -378,14 +374,23 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl priceExcels = ExcelUtil.read(file, 0, BasicdataPriceExcel.class); + List basicExcels = ExcelUtil.read(file, 1, BasicdataPriceCategoryBasicExcel.class); + List dispatchExcels = ExcelUtil.read(file, 2, BasicdataPriceCategoryDispatchExcel.class); + List warehouseExcels = ExcelUtil.read(file, 3, BasicdataPriceCategoryWarehouseExcel.class); + List generalExcels = ExcelUtil.read(file, 4, BasicdataPriceGeneralExcel.class); + List fullVehicleExcels = ExcelUtil.read(file, 5, BasicdataPriceFullVehicleExcel.class); + // 校验数据 + if (CollUtil.isNotEmpty(priceExcels)) { - }catch (Exception e){ + } + // 保存数据 + + } catch (Exception e) { } return null; @@ -479,7 +484,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl { - Integer type = item.getServiceType(); + Integer type = item.getType(); List collect = categoryBasicMap.get(type); if (ObjectUtil.isEmpty(collect)) { collect = new ArrayList<>(); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml index 77f3f06b4..9d3376900 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml +++ b/blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml @@ -39,4 +39,4 @@ xxl: ip: 127.0.0.1 logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler logretentiondays: -1 - port: 17019 + port: 17018 From 3fc04cb02c7c6c35aa4835517fa2c4677ee53aeb Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 22 Apr 2024 20:00:58 +0800 Subject: [PATCH 15/16] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E8=80=81?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=93=E5=BA=93=20=20=E6=94=80=E6=9E=9D?= =?UTF-8?q?=E8=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/constant/OldSystemDataPushConfig.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index e360f01b5..99ef1cb4e 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -76,6 +76,9 @@ public class OldSystemDataPushConfig { // 宜宾仓 warehourseIds.add("146"); + // 攀枝花 + warehourseIds.add("32"); + } From 89f0d25286d24ac4f25026c4097595a345a35550 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 22 Apr 2024 20:11:50 +0800 Subject: [PATCH 16/16] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E8=80=81?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=93=E5=BA=93=20=20=E6=94=80=E6=9E=9D?= =?UTF-8?q?=E8=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/OldSystemDataPushConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 99ef1cb4e..f9780a1df 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -82,6 +82,7 @@ public class OldSystemDataPushConfig { } + public static List getWarehourseIdList(){ return warehourseIds;