From 3f8c0c9bd97ba2a6a4248099eb2540c70e9544ae Mon Sep 17 00:00:00 2001 From: chenlong Date: Wed, 22 Jan 2025 10:28:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-report/pom.xml | 5 +++++ .../logpm/report/mapper/largeScreen/MapWarehouseMapper.xml | 1 + .../service/largeScreen/impl/MapWarehouseServiceImpl.java | 6 +++++- .../report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java | 2 ++ .../com/logpm/report/vo/largeScreen/MapWarehouseVO.java | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-report/pom.xml b/blade-service/logpm-report/pom.xml index ae7ed3676..8c0ceae19 100644 --- a/blade-service/logpm-report/pom.xml +++ b/blade-service/logpm-report/pom.xml @@ -43,6 +43,11 @@ blade-dict-api 3.2.0.RELEASE + + org.springblade + blade-system-api + 3.2.0.RELEASE + org.springblade logpm-factory-data-api diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml index 5c41a913f..c43782fb1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml @@ -7,6 +7,7 @@ select id as warehouseId, name as warehouseName, + province_code as provinceCode, latitude as lat, longitude as lng from logpm_platform.logpm_warehouse_warehouse diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java index c57e17a78..09c50cc1b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java @@ -9,6 +9,7 @@ import com.logpm.report.vo.largeScreen.MapWarehouse.WarehouseInfoVO; import com.logpm.report.vo.largeScreen.MapWarehouseVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.system.feign.IRegionFeign; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; public class MapWarehouseServiceImpl implements IMapWarehouseService { private final MapWarehouseMapper mapWarehouseMapper; - + private final IRegionFeign regionFeign; @Override public List list() { List warehouselist = mapWarehouseMapper.warehouselist(); @@ -45,6 +46,9 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService { mapWarehouseVO.setLng(warehouseInfoVO.getLng()); mapWarehouseVO.setWarehouseId(warehouseInfoVO.getWarehouseId()); mapWarehouseVO.setWarehouseName(warehouseInfoVO.getWarehouseName()); + if (!warehouseInfoVO.getProvinceCode().isEmpty()) { + mapWarehouseVO.setArea(regionFeign.getName(warehouseInfoVO.getProvinceCode())); + } if (null == warehouseLine.get(warehouseInfoVO.getWarehouseId())) { return mapWarehouseVO; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java index e7a82ef84..cb4ed3ec9 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java @@ -9,6 +9,8 @@ public class WarehouseInfoVO { private String warehouseName; + private String provinceCode; + private Float lat; private Float lng; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java index dff8077be..1906d4c26 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java @@ -12,6 +12,8 @@ public class MapWarehouseVO{ private String warehouseName; + private String area; + private Float lat; private Float lng; From 15910f2446243093b7b4e7e1f2954871a06511d5 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 22 Jan 2025 14:13:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=B8=8A=E7=9A=84=E5=8F=82=E6=95=B0=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IWarehouseGoodsAllocationClient.java | 4 +- .../DistributionClientMessageServiceImpl.java | 2 +- .../DistributionReservationServiceImpl.java | 19 +++-- .../DistributionStockListServiceImpl.java | 19 +++-- .../impl/DistributionStockupServiceImpl.java | 82 +++++++++++-------- 5 files changed, 72 insertions(+), 54 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseGoodsAllocationClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseGoodsAllocationClient.java index 4ff39bf5f..aa6953dcd 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseGoodsAllocationClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseGoodsAllocationClient.java @@ -52,14 +52,14 @@ public interface IWarehouseGoodsAllocationClient { * 跟新货位缓存 */ @GetMapping(TOP+ "/updateAllocationCache") - Boolean updateAllocationCache(@RequestParam("ids") String ids); + Boolean updateAllocationCache(@RequestParam String ids); /** * 查询货位信息 */ @GetMapping(TOP+ "/getAllocationInforByIds") - List getAllocationInforByIds(@RequestParam("ids") String [] ids); + List getAllocationInforByIds(@RequestParam String [] ids); @GetMapping(TOP+ "/findByAllocationQrCode") diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java index f9255258b..a79d2d724 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java @@ -93,7 +93,7 @@ public class DistributionClientMessageServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - if (distributionStockupStockListVO.getAllocationList() == null) { - distributionStockupStockListVO.setAllocationList(new ArrayList<>()); + if(!Func.isEmpty(ids)){ + List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); + 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); } - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - distributionStockupStockListVO.getAllocationList().add(map); } + } return distributionStockupStockListVO; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index e1dae9455..4c88104aa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -1115,15 +1115,18 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl collect = locationStockListInformation.stream().map(WarehouseUpdownGoodsEntity::getAllocationId).map(String::valueOf).collect(Collectors.toList()); String[] array = collect.stream().toArray(String[]::new); - List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(array); - Map collected = allocationInforByIds.stream().collect(Collectors.toMap(WarehouseGoodsAllocationEntity::getId, WarehouseGoodsAllocationEntity::getQrCode)); - for (WarehouseUpdownGoodsEntity updownGoodsEntity : locationStockListInformation) { - Map map = new HashMap<>(); - map.put("allocationId", updownGoodsEntity.getAllocationId()); - map.put("allocationName", collected.get(updownGoodsEntity.getAllocationId())); - map.put("handleQuantity", updownGoodsEntity.getNum()); - mapList.add(map); + if(!Func.isEmpty(array)){ + List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(array); + Map collected = allocationInforByIds.stream().collect(Collectors.toMap(WarehouseGoodsAllocationEntity::getId, WarehouseGoodsAllocationEntity::getQrCode)); + for (WarehouseUpdownGoodsEntity updownGoodsEntity : locationStockListInformation) { + Map map = new HashMap<>(); + map.put("allocationId", updownGoodsEntity.getAllocationId()); + map.put("allocationName", collected.get(updownGoodsEntity.getAllocationId())); + map.put("handleQuantity", updownGoodsEntity.getNum()); + mapList.add(map); + } } + } return R.data(mapList); } 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 dc0789f9b..146b4ce5c 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 @@ -1291,17 +1291,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - if (i.getAllocationList() == null) { - i.setAllocationList(new ArrayList<>()); + if(!Func.isEmpty(ids)){ + List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); + for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { + if (i.getAllocationList() == null) { + i.setAllocationList(new ArrayList<>()); + } + Map map = new HashMap<>(); + map.put("id", allocationInforById.getId()); + map.put("name", allocationInforById.getQrCode()); + i.getAllocationList().add(map); } - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - i.getAllocationList().add(map); } + } }); return list; @@ -1335,17 +1338,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl strings = new HashSet(CollUtil.newArrayList(ids)); String res = strings.stream().map(Object::toString).collect(Collectors.joining(",")); String[] newIds = res.split(","); - - List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(newIds); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - if (distributionStockupStockListVO.getAllocationList() == null) { - distributionStockupStockListVO.setAllocationList(new ArrayList<>()); + if(!Func.isEmpty(newIds)){ + List 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); } - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - distributionStockupStockListVO.getAllocationList().add(map); } + } @@ -6048,18 +6053,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(allocationIds); - if (!allocationInforByIds.isEmpty()) { - List> mapList = new ArrayList<>(); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - mapList.add(map); + if(!Func.isEmpty(allocationIds)){ + List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(allocationIds); + if (!allocationInforByIds.isEmpty()) { + List> mapList = new ArrayList<>(); + for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { + Map map = new HashMap<>(); + map.put("id", allocationInforById.getId()); + map.put("name", allocationInforById.getQrCode()); + mapList.add(map); + } + detailVO.setAllocationList(mapList); } - detailVO.setAllocationList(mapList); } + } } @@ -6079,18 +6087,22 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl strings = new HashSet(CollUtil.newArrayList(ids)); String res = strings.stream().map(Object::toString).collect(Collectors.joining(",")); String[] newIds = res.split(","); - List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(newIds); - if (!allocationInforByIds.isEmpty()) { - List> mapList = new ArrayList<>(); - for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { - Map map = new HashMap<>(); - map.put("id", allocationInforById.getId()); - map.put("name", allocationInforById.getQrCode()); - mapList.add(map); + if(!Func.isEmpty(newIds)){ + List allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(newIds); + if (!allocationInforByIds.isEmpty()) { + List> mapList = new ArrayList<>(); + for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { + Map map = new HashMap<>(); + map.put("id", allocationInforById.getId()); + map.put("name", allocationInforById.getQrCode()); + mapList.add(map); + } + inventoryDetailVO.setAllocationList(mapList); } - inventoryDetailVO.setAllocationList(mapList); } + + } } From a8887072cae20c0dc6845482464b95b6cac5c86f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 22 Jan 2025 14:28:05 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataPriceTemplateServiceImpl.java | 9 +- .../impl/BasicdataTrayServiceImpl.java | 92 +++++++++---------- .../reader/BillLoadingDetailsReader.java | 23 +++-- .../impl/ReportBillLoadingAsyncService.java | 23 +++-- 4 files changed, 78 insertions(+), 69 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java index b52380c4a..3948b8fb9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java @@ -81,11 +81,14 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl records = baseMapper.selectBasicdataPriceTemplatePage(page, basicdataPriceTemplate); if (CollUtil.isNotEmpty(records)) { List userIds = records.stream().map(BasicdataPriceTemplateVO::getCreateUser).collect(Collectors.toList()); - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), userIds.stream().map(Object::toString).collect(Collectors.joining(","))); Map names = new HashMap<>(); - if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) { - names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName)); + if(CollUtil.isNotEmpty(userIds)){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, listR.getCode())) { + names = listR.getData().stream().collect(Collectors.toMap(User::getId, User::getName)); + } } + for (BasicdataPriceTemplateVO record : records) { Long createUser = record.getCreateUser(); record.setUserName(names.get(createUser)); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index a3ffa973c..f156dfbdb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -95,12 +95,10 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl basicdataTrayEntities = new ArrayList<>(); for (Integer i = 0; i < number; i++) { basicdataTrayEntity = new BasicdataTrayEntity(); - BeanUtils.copyProperties(basicdataTrayDTO,basicdataTrayEntity); + BeanUtils.copyProperties(basicdataTrayDTO, basicdataTrayEntity); //String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6"); - String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),"465897"); + String trayInfo = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS, basicdataWarehouseEntity.getWarehouseCode(), "465897"); // basicdataTrayEntity.setTrayStatus("1"); //String uuid = "1" + Func.random(18, RandomType.INT).trim(); //long id = Long.parseLong(uuid); @@ -161,7 +159,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl selectTrayList(IPage page, Map basicdataTray) { - IPage trayList= trayMapper.selectTrayList(page,basicdataTray); + IPage trayList = trayMapper.selectTrayList(page, basicdataTray); // for (int i = 0; i < trayList.getRecords().size(); i++) { // if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){ // trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType())); @@ -172,67 +170,69 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl getpackageList(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectPackageList(page,basicdataTray); + List list = trayMapper.selectPackageList(page, basicdataTray); return page.setRecords(list); } @Override public IPage getinventoryList(IPage page, BasicdataTrayDTO basicdataTray) { - List list =trayMapper.selectInventoryList(page,basicdataTray); + List list = trayMapper.selectInventoryList(page, basicdataTray); return page.setRecords(list); } @Override public IPage getlclList(IPage page, BasicdataTrayDTO basicdataTray) { - IPage data = trayMapper.selectlclList(page,basicdataTray); + IPage data = trayMapper.selectlclList(page, basicdataTray); List records = data.getRecords(); //获取所有的操作人ID List operateUserIds = records.stream().map(BasicdataStockArticleVO::getOperateUser).collect(Collectors.toList()); - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA)); - + List listR = new ArrayList<>(); + if (CollUtil.isEmpty(operateUserIds)) { + R> temp = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA)); + if (temp.isSuccess() && temp.getData() != null) { + listR.addAll(temp.getData()); + } + } for (BasicdataStockArticleVO record : records) { - if (listR.isSuccess() && listR.getData() != null) { - for (User datum : listR.getData()) { - if(datum.getId().equals(record.getOperateUser())){ - record.setOperateUserName(datum.getRealName()); - } + for (User datum : listR) { + if (datum.getId().equals(record.getOperateUser())) { + record.setOperateUserName(datum.getRealName()); } - } - } + } return data; } @Override public IPage getpackageListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectPackageListhistory(page,basicdataTray); + List list = trayMapper.selectPackageListhistory(page, basicdataTray); return page.setRecords(list); } @Override public IPage getinventoryListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectinventoryListhistory(page,basicdataTray); + List list = trayMapper.selectinventoryListhistory(page, basicdataTray); return page.setRecords(list); } @Override public IPage getlclListhistory(IPage page, BasicdataTrayDTO basicdataTray) { - List list = trayMapper.selectlclListhistory(page,basicdataTray); + List list = trayMapper.selectlclListhistory(page, basicdataTray); return page.setRecords(list); } @Override - public Boolean vacantById(BasicdataTrayEntity basicdataTray,String remark) { + public Boolean vacantById(BasicdataTrayEntity basicdataTray, String remark) { // //删除托盘货物绑定表 // Boolean aBoolean = warehouseTrayGoodsClient.removeByMasterId(basicdataTray.getId()); // //删除托盘打托方式表 // Boolean aBoolean1 = warehouseTrayTypeClient.removeByMasterId(basicdataTray.getId()); // log.info("删除托盘货物绑定表>>>>>>>>>>>>>>>>{}",aBoolean); // log.info("删除托盘打托方式表>>>>>>>>>>>>>>>>{}",aBoolean1); - log.info("basicdataTray>>>>>>>>>>>>>>{}",basicdataTray.getPalletCode()); - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(),remark); + log.info("basicdataTray>>>>>>>>>>>>>>{}", basicdataTray.getPalletCode()); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(basicdataTray.getPalletCode(), remark); //修改托盘表状态 // boolean update = this.update(new UpdateWrapper().lambda() // .eq(BasicdataTrayEntity::getId, basicdataTray.getId()) @@ -240,6 +240,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl ids) throws Exception { WarehouseTraybarCode warehouseTraybarCode = new WarehouseTraybarCode(); @@ -251,7 +252,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl trayQRCodes = baseMapper.getTrayByIds(ids); for (WarehouseTrayQRCode trayQRCode : trayQRCodes) { // WarehouseTrayQRCode trayQRCode = baseMapper.getTray(id); - String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); + String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode()); String code = QRCodeUtil.getEmpAutograph(filename); @@ -338,7 +338,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl0){ // continue; // } - this.update(new UpdateWrapper().lambda() - .in(BasicdataTrayEntity::getId,longs) - .set(BasicdataTrayEntity::getDisableType,2) - .eq(BasicdataTrayEntity::getTrayStatus,1) - ); + this.update(new UpdateWrapper().lambda() + .in(BasicdataTrayEntity::getId, longs) + .set(BasicdataTrayEntity::getDisableType, 2) + .eq(BasicdataTrayEntity::getTrayStatus, 1) + ); //List list = this.list(new QueryWrapper().lambda().in(BasicdataTrayEntity::getId, ids)); //} return R.success("成功"); @@ -373,7 +373,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl().lambda() + this.update(new UpdateWrapper().lambda() .in(BasicdataTrayEntity::getId, Func.toLongList(ids)) .set(BasicdataTrayEntity::getDisableType, 1) ); @@ -381,9 +381,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl codes,String remark) { + public Boolean vacantBycodes(List codes, String remark) { for (String code : codes) { - Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code,remark); + Boolean aBoolean = warehouseTrayGoodsClient.delByTrayByCode(code, remark); } return true; } @@ -392,11 +392,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl exportPackage(Long id) { // List list = trayMapper.selectPackageList(page,basicdataTray) - List list = trayMapper.exportPackage(id); + List list = trayMapper.exportPackage(id); List data = new ArrayList<>(); for (WarehouseParcelListVO warehouseParcelListVO : list) { TrayPackageExcelVO trayPackageExcelVO = BeanUtil.copyProperties(warehouseParcelListVO, TrayPackageExcelVO.class); - trayPackageExcelVO.setFleeingName(0==warehouseParcelListVO.getIsFleeing()?"正常":"串货"); + trayPackageExcelVO.setFleeingName(0 == warehouseParcelListVO.getIsFleeing() ? "正常" : "串货"); data.add(trayPackageExcelVO); } @@ -408,7 +408,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl exportInventory(Long id) { // List list =trayMapper.selectInventoryList(page,basicdataTray); - List list =trayMapper.exportInventory(id); + List list = trayMapper.exportInventory(id); List data = new ArrayList<>(); for (WarehouseStockListVO warehouseStockListVO : list) { TrayInventoryExcelVO trayInventoryExcelVO = BeanUtil.copyProperties(warehouseStockListVO, TrayInventoryExcelVO.class); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java index f2af6da81..592c76320 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java @@ -56,19 +56,22 @@ public class BillLoadingDetailsReader implements ExportReader { userIds.add(detailsVO.getExamineUser()); } } - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { - List data = listR.getData(); - Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); - for (BillLoadingDetailsVO detailsVO : detailsPage) { - if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { - detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); - } - if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { - detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + if(!userIds.isEmpty()){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { + List data = listR.getData(); + Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); + for (BillLoadingDetailsVO detailsVO : detailsPage) { + if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { + detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); + } + if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { + detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + } } } } + } return detailsPage; } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java index 9651102e4..e62bcc7d7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java @@ -117,20 +117,23 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer userIds.add(detailsVO.getExamineUser()); } } - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { - List data = listR.getData(); - Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); - for (BillLoadingDetailsVO detailsVO : detailsPage) { - if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { - detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); - } - if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { - detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + if(!userIds.isEmpty()){ + R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, StrUtil.COMMA)); + if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { + List data = listR.getData(); + Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); + for (BillLoadingDetailsVO detailsVO : detailsPage) { + if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { + detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); + } + if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { + detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + } } } } + } return page.setRecords(detailsPage); } From 1fba1f809ea6a6ab9fbdabfb42dc579ff5ee8046 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 22 Jan 2025 15:28:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CarsLoadAsyncServiceImpl.java | 6 ++++-- .../config/RabbitMqConfiguration.java | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java index a23bd2875..54ecc4fef 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java @@ -34,7 +34,6 @@ import com.logpm.trunkline.vo.UnloadReportVO; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; -import com.logpm.warehouse.vo.DownPackageTrayVO; import lombok.extern.slf4j.Slf4j; import org.springblade.common.annotations.LogpmAsync; import org.springblade.common.constant.DictBizConstant; @@ -251,7 +250,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { Long finalNodeId = scanEntity.getFinalNodeId(); Long unloadNodeId = scanEntity.getUnloadNodeId(); String unloadNodeName = scanEntity.getUnloadNodeName(); - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + DistributionStockArticleEntity stockArticleEntity = null; + if(!Objects.isNull(fromWarehouseId)){ + stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + } WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); if (Objects.isNull(waybillEntity)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java index b2bb6db12..1df071d95 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RabbitMqConfiguration.java @@ -7,8 +7,6 @@ import org.springframework.amqp.core.*; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.CorrelationData; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.rabbit.retry.MessageRecoverer; -import org.springframework.amqp.rabbit.retry.RepublishMessageRecoverer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -91,15 +89,15 @@ public class RabbitMqConfiguration { return BindingBuilder.bind(errorQueue).to(errorMessageExchange).with(RabbitConstant.WAREHOUSE_ERROR_ROUTING); } - /** - * 消费失败队列 - * @param rabbitTemplate - * @return - */ - @Bean - public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){ - return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING); - } +// /** +// * 消费失败队列 +// * @param rabbitTemplate +// * @return +// */ +// @Bean +// public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){ +// return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.WAREHOUSE_ERROR_EXCHANGE, RabbitConstant.WAREHOUSE_ERROR_ROUTING); +// } From 71b69be640f84d01ef70ca01b01361560faddbd2 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 22 Jan 2025 16:29:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/ReseverationAnyTypeNumberDTO.java | 22 ++ .../vo/DistributionParcelListVO.java | 12 +- .../impl/WarehouseLeasingServiceImpl.java | 3 +- .../mapper/DistributionLoadscanMapper.java | 5 + .../mapper/DistributionLoadscanMapper.xml | 21 ++ .../mapper/DistributionReservationMapper.java | 2 + .../mapper/DistributionReservationMapper.xml | 24 +- .../impl/DistributionSignforServiceImpl.java | 237 ++++++++++-------- .../impl/MapWarehouseServiceImpl.java | 2 +- 9 files changed, 204 insertions(+), 124 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/dto/ReseverationAnyTypeNumberDTO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/dto/ReseverationAnyTypeNumberDTO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/dto/ReseverationAnyTypeNumberDTO.java new file mode 100644 index 000000000..f85b6306e --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/dto/ReseverationAnyTypeNumberDTO.java @@ -0,0 +1,22 @@ +package com.logpm.distribution.dto; + + +import lombok.Data; + +/** + * 根据预约Id查询出来的数量 + */ +@Data +public class ReseverationAnyTypeNumberDTO { + + /** + * 预约id + */ + private Long reservationId; + + /** + * 预约数量 + */ + private Integer num; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 4fc7232ff..6d1598fee 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -101,7 +101,7 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { */ private String scanStatus; /** - * 扫描方式 + * 仓库ID */ private List warehouseIdList; @@ -111,15 +111,14 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { private Long mallId; /** - * 商场id + * 预约单ID */ private Long reservationId; /** - * 商场id */ private String genre; /** - * 商场id + * 是否是零担 */ private String isZero; @@ -161,31 +160,26 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { * 预约号 */ @ApiModelProperty(value = "预约号") - @TableField(exist = false) private String reservationCode; /** * 装车时间 */ @ApiModelProperty(value = "装车时间") - @TableField(exist = false) private String scanTime; /** * 配送车次 */ @ApiModelProperty(value = "配送车次") - @TableField(exist = false) private String dvehicleName; /** *签收车次 */ @ApiModelProperty(value = "签收车次") - @TableField(exist = false) private String zvehicleName; /** *配送单号 */ @ApiModelProperty(value = "配送单号") - @TableField(exist = false) private String noteNumber; /** * 服务类型 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/WarehouseLeasingServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/WarehouseLeasingServiceImpl.java index 2be4d1f03..5af713a80 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/WarehouseLeasingServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/WarehouseLeasingServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -122,7 +123,7 @@ public class WarehouseLeasingServiceImpl extends BaseServiceImpl selectAbnormalLoadingByReservationIds(@Param("reservationIds") List reservationIds); + + List selectAbnormalSigningByReservationIds(@Param("reservationIds") List reservationIdList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml index 37df7ed41..c1162f948 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml @@ -162,4 +162,25 @@ WHERE reservation_id = #{reservationId} AND package_id = #{parcelListId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 08ec0330d..c75451d50 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -448,4 +448,6 @@ public interface DistributionReservationMapper extends BaseMapper deliveryTrayDetailList(@Param("reservationId") Long reservationId); + + List selectInventoryListByReservations(@Param("reservationIds") List shiPeireservationIdList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 37d62d633..676579c8d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1903,12 +1903,14 @@ resultType="com.logpm.distribution.vo.DistributionParcelListVO"> SELECT ldpl.*, - ldrs.reservation_id AS reservationId + ldsa.mall_id AS mallId, + ldrs.reservation_id FROM logpm_distribution_reservation_package AS ldrs - LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrs.parce_list_id = ldpl.id + INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrs.parce_list_id = ldpl.id + LEFT JOIN logpm_distribution_stock_article As ldsa ON ldpl.stock_article_id = ldsa.id - ldrs.packet_bar_status IN ('1','3') AND ldpl.conditions = 1 + ldrs.packet_bar_status IN ('1','3') AND ldpl.conditions = 1 AND ldpl.is_transfer = 0 AND ldrs.reservation_id IN #{reservationId} @@ -2068,4 +2070,20 @@ AND stock_article_id = #{orderId} AND parcel_list_id = #{packageId} + 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 e7f66529d..b09a61f85 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 @@ -37,15 +37,7 @@ import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataDriverArteryClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.bean.Resp; -import com.logpm.distribution.dto.DistributionAddvalueDTO; -import com.logpm.distribution.dto.DistributionAddvaluePackageDTO; -import com.logpm.distribution.dto.DistributionDeliverySelfDTO; -import com.logpm.distribution.dto.DistributionNumberDetailDTO; -import com.logpm.distribution.dto.DistributionParcelNumberDTO; -import com.logpm.distribution.dto.DistributionSignPrintDTO; -import com.logpm.distribution.dto.DistributionSignforDTO; -import com.logpm.distribution.dto.DistributionSignforExcelDTO; -import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; +import com.logpm.distribution.dto.*; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.DisStockListDetailEntity; import com.logpm.distribution.entity.DistributionAddvaluePackageEntity; @@ -838,7 +830,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByReCheck(deliveryListEntity,reservationEntity); + NodeFanoutMsg nodeFanoutMsg = buildNodeFanoutMsgByReCheck(deliveryListEntity, reservationEntity); distributionNodeWorkService.signForCheck(nodeFanoutMsg, AuthUtil.getUser()); // // 复核作业节点推送 @@ -864,7 +856,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByReCheck(DistributionDeliveryListEntity deliveryListEntity,DistributionReservationEntity reservationEntity) { + private NodeFanoutMsg buildNodeFanoutMsgByReCheck(DistributionDeliveryListEntity deliveryListEntity, DistributionReservationEntity reservationEntity) { // 查询当前预约单下的定制品和零担签收数据 NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); @@ -894,7 +886,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.CLERK, signforTime); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.CLERK, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -1690,7 +1681,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); + Map map = new HashMap<>(); List list = Func.toLongList(distrilbutionloadingscanDTO.getZeroPackageIds()); //查询是否进行装车或者签收 List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() - .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) + .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) // .eq(DistributionLoadscanEntity::getDriverId, distrilbutionloadingscanDTO.getDeliveryId()) - .in(DistributionLoadscanEntity::getPackageId, list) - .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + .in(DistributionLoadscanEntity::getPackageId, list) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (Func.isNotEmpty(loadscanEntityList)) { List orderIds = loadscanEntityList.stream().map(DistributionLoadscanEntity::getOrderId).distinct().collect(Collectors.toList()); @@ -1954,8 +1945,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity,map,BizOperationEnums.REMOVE); - distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser()); + NodeFanoutMsg nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.REMOVE); + distributionNodeWorkService.planReservation(nodeFanoutMsg, AuthUtil.getUser()); } else { @@ -2684,12 +2675,50 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); //取出id List collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionSignforVO.setWarehouseIdList(collect); List distributionSignforVOS = baseMapper.selectDistributionSignforPage(null, distributionSignforVO); + + + // 获取预约单ID集合 + List reservationIdList = distributionSignforVOS.stream().map(DistributionSignforVO::getReservationId).collect(Collectors.toList()); + + // 批量查询 + List distributionParcelListEntitiesAll = distributionReservationMapper.selectPackageListByReservationIds(reservationIdList); + + // 通过预约单ID进行分组 + Map> map = distributionParcelListEntitiesAll.stream().collect(Collectors.groupingBy(DistributionParcelListVO::getReservationId)); + + + List allStockList = disStockListDetailService.list(Wrappers.query().lambda() + .in(DisStockListDetailEntity::getReservationId, reservationIdList) + ); + + // 通过预约ID分组 + Map> stockMap = allStockList.stream().collect(Collectors.groupingBy(DisStockListDetailEntity::getReservationId)); + + + List abnormalLoadingList = distributionLoadscanMapper.selectAbnormalLoadingByReservationIds(reservationIdList); + // 通过预约ID分组 + Map> abnormalMap = abnormalLoadingList.stream().filter(d -> d.getReservationId()!=null).collect(Collectors.groupingBy(ReseverationAnyTypeNumberDTO::getReservationId)); + + + List abnormalSignList = distributionLoadscanMapper.selectAbnormalSigningByReservationIds(reservationIdList); + // 通过预约ID分组 + Map> abnormalSignMap = abnormalSignList.stream().filter(d-> d.getReservationId()!=null).collect(Collectors.groupingBy(ReseverationAnyTypeNumberDTO::getReservationId)); + + // 获取市配的 + List shiPeireservationIdList = distributionSignforVOS.stream().filter(d -> d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())).map(DistributionSignforVO::getReservationId).collect(Collectors.toList()); + + + List allDisStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservations(shiPeireservationIdList); + // 通过预约ID分组 + Map> shiPeiMap = allDisStockListDetailEntities.stream().filter(d-> d.getReservationId()!=null).collect(Collectors.groupingBy(DisStockListDetailEntity::getReservationId)); + + distributionSignforVOS.forEach(d -> { if (d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())) { d.setDeliveryTypeName(DistributionTypeConstant.shipie.getName()); @@ -2698,20 +2727,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(d.getReservationId()); + List distributionParcelListEntities = map.get(d.getReservationId()); //查询库存品信息 - List list = disStockListDetailService.list(Wrappers.query().lambda() - .eq(DisStockListDetailEntity::getReservationId, d.getReservationId()) - ); + List list = stockMap.get(d.getReservationId()); int weizhuangchejianshu = 0; int weiqianshoujianshu = 0; int zhuangchejianshu = 0; int qianshoujianshu = 0; - if (Func.isNotEmpty(list) && list.size() > 0) { + if (Func.isNotEmpty(list)) { zhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); -// weizhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); qianshoujianshu += list.stream().filter(f -> f.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); -// weiqianshoujianshu += list.stream().filter(f -> f.getStockSignfoStatus().equals(InventorySigningStatusConstant.weiqianshou.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); } if (Func.isNotEmpty(distributionParcelListEntities)) { weizhuangchejianshu += distributionParcelListEntities.stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); @@ -2720,12 +2745,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); } //该客户的异常装车件数 - Integer abnormalLoading = distributionLoadscanMapper.selectAbnormalLoadingByReservationId(d.getReservationId()); - //该客户的异常签收件数 - Integer abnormalSigning = distributionLoadscanMapper.selectAbnormalSigningByReservationId(d.getReservationId()); -// DistributionLoadingNumDTO reservationSigningNum = distributionReservationMapper.selectReservationSigningNum(d.getReservationId()); + Integer abnormalLoading = 0; + //该客户的异常装车件数 + Integer abnormalSigning = 0; + List reseverationAnyTypeNumberDTOS = abnormalMap.get(d.getReservationId()); + if (Func.isNotEmpty(reseverationAnyTypeNumberDTOS)) { + abnormalLoading = reseverationAnyTypeNumberDTOS.get(0).getNum(); + } + List reseverationAnyTypeNumberDTOS1 = abnormalSignMap.get(d.getReservationId()); + if (Func.isNotEmpty(reseverationAnyTypeNumberDTOS1)) { + abnormalSigning = reseverationAnyTypeNumberDTOS1.get(0).getNum(); + } if (d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())) { - List disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId()); + List disStockListDetailEntities = shiPeiMap.get(d.getReservationId()); if (Func.isNotEmpty(disStockListDetailEntities)) { //查询库存品未装车数 int inventoryuweizhuancghe = disStockListDetailEntities.stream().filter(f -> f.getStockLockingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); @@ -2750,10 +2782,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignforList = baseMapper.exportDistributionSignforOwn(distributionSignforVO); List list = new ArrayList<>(); distributionSignforVOS.forEach(d -> { -// distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType())); DistributionSignforExcel signforExcel = new DistributionSignforExcel(); BeanUtils.copyProperties(d, signforExcel); signforExcel.setOrderCode(d.getStockArticleId()); @@ -2767,19 +2797,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, - List pushList, String operatMode,Date signforTime) { + List pushList, String operatMode, Date signforTime) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -3330,7 +3347,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime); @@ -5116,7 +5133,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getReservationId, distributionSignfor.getReservationId()) @@ -5653,8 +5670,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl jsonObjects = new ArrayList<>(); + List jsonObjects = new ArrayList<>(); if (SignforStatusConstant.yiqianshou.getValue().equals(distributionSignfor.getSigningStatus())) { return Resp.scanFail("当前客户已完成复核", "当前客户已完成复核"); } @@ -5700,7 +5717,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); @@ -6151,7 +6168,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":orderPackageCode:"); if (Func.isNotEmpty(a)) { - assert a != null; - boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); + assert a != null; + boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag) { //正在操作，请稍后重试 throw new CustomerException("该包件正在被操作,请稍后再试!!!"); @@ -6173,19 +6190,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); Integer num = baseMapper.signforNum(distributionSignforEntity.getReservationId()); - return Resp.scanSuccessWithData(num + "件", num + "件",packageCodes); + return Resp.scanSuccessWithData(num + "件", num + "件", packageCodes); } @NotNull private static DistributionLoadscanEntity getDistributionLoadscanEntity(DistributionLoadscanEntity loadscanEntities) { - DistributionLoadscanEntity update = new DistributionLoadscanEntity(); + DistributionLoadscanEntity update = new DistributionLoadscanEntity(); update.setId(loadscanEntities.getId()); update.setSignforState(loadscanEntities.getSignforState()); update.setReceivedQuantity(loadscanEntities.getReceivedQuantity()); @@ -6200,10 +6217,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() - .eq(DistributionDeliverySelfEntity::getDeliveryId,distributionDeliveryListEntity.getId()) - .eq(DistributionDeliverySelfEntity::getIsMaster,2) + .eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListEntity.getId()) + .eq(DistributionDeliverySelfEntity::getIsMaster, 2) ); } - //查询当前扫描司机是否属于当前配送任务 + //查询当前扫描司机是否属于当前配送任务 } else { DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectDriverInfoByDeliveryId(distributionDeliveryListEntity.getId()); if (Func.isEmpty(distributionDeliveryTripartiteEntity)) { @@ -6227,8 +6244,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLoadingData, BladeUser user, List distributionLoadscanEntityLists, - List orderCodes,DistributionDeliveryListEntity deliveryListEntity, + List orderCodes, DistributionDeliveryListEntity deliveryListEntity, DistributionReservationEntity reservationEntity, BasicdataWarehouseEntity myCurrentWarehouse, List orderPckageCodes, - List aaa ) { + List aaa) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List updatePackageLoadingData = new ArrayList<>(); List packageIds = new ArrayList<>(); @@ -6294,7 +6311,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByOneClick(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity reservationEntity, List distributionLoadscaninvnEntityLists, List distributionLoadscanEntityLists) { @@ -6475,7 +6491,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList,String operatMode, Date signforTime) { + private NodeFanoutMsg buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList, String operatMode, Date signforTime) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -8100,7 +8116,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushList = new ArrayList<>(); List pushInventoryList = new ArrayList<>(); //配置项 - DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, user,distributionDeliveryListService.judgeIsDriver(user)); - if (Objects.isNull(distributionDeliverySelfEntity)){ + DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, user, distributionDeliveryListService.judgeIsDriver(user)); + if (Objects.isNull(distributionDeliverySelfEntity)) { return Resp.scanFail("查询司机信息错误!!!", "查询司机信息错误!!!"); } - switch (type) { + switch (type) { case 1: if (Func.isEmpty(distrilbutionloadingscanDTO.getBarcode())) { log.error(method + "Barcode参数缺失"); @@ -8232,17 +8248,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 30){ + if (between > 30) { log.error(method + "列表搜索时间范围大于三十天"); return Resp.fail("最大区间为三十天,请缩小搜索范围"); } @@ -9218,7 +9235,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>:{}", deliverySelfEntity.getDriverName()); - //针对之前该司机上传的图片进行全部删除 + //针对之前该司机上传的图片进行全部删除 //查询该司机已有的图片信息 List list = iDistributionSignPrintService.list(Wrappers.query().lambda() .eq(DistributionSignPrintEntity::getReservationId, signforEntity.getReservationId()) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java index 09c50cc1b..5c3e5f10b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java @@ -46,7 +46,7 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService { mapWarehouseVO.setLng(warehouseInfoVO.getLng()); mapWarehouseVO.setWarehouseId(warehouseInfoVO.getWarehouseId()); mapWarehouseVO.setWarehouseName(warehouseInfoVO.getWarehouseName()); - if (!warehouseInfoVO.getProvinceCode().isEmpty()) { + if (warehouseInfoVO.getProvinceCode()!=null && !warehouseInfoVO.getProvinceCode().isEmpty()) { mapWarehouseVO.setArea(regionFeign.getName(warehouseInfoVO.getProvinceCode())); } From c5a900b6606e24021907e41e26156ea07c3d8c1a Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 22 Jan 2025 16:31:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrunklineCarsLoadServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 eb1e41373..9e9e1844b 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 @@ -7767,7 +7767,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl> newParcelListEntitiesList = CollUtil.split(newParcelListEntities, 200); + newParcelListEntitiesList.forEach(p -> { + distributionParcelListClient.addBatch(p); + }); + +// distributionParcelListClient.addBatch(newParcelListEntities); if (CollUtil.isNotEmpty(newParcelListEntities)) { for (DistributionParcelListEntity entity : newParcelListEntities) { try { From 894d79dc4e5571ec5e5457d8c711eeec92b278b2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 22 Jan 2025 19:09:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index cf0c84a38..e10c7cdf7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -40,7 +41,10 @@ import com.logpm.distribution.dto.app.queryOrderDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionSignForStockArticleExcel; import com.logpm.distribution.excel.DistributionStockArticleExcel; -import com.logpm.distribution.mapper.*; +import com.logpm.distribution.mapper.DistributionParcelListMapper; +import com.logpm.distribution.mapper.DistributionParcelNumberMapper; +import com.logpm.distribution.mapper.DistributionSignforMapper; +import com.logpm.distribution.mapper.DistributionStockArticleMapper; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.queryOrderVO; @@ -51,8 +55,6 @@ import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; -import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import lombok.AllArgsConstructor; @@ -1524,6 +1526,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(queryWrapper); + + if(CollUtil.isNotEmpty(list)){ + log.info("##################updateOrderInfoByDistributionStockArticleEntity: 查询到的包件数据 {} 条",list.size()); + }else{ + log.info("##################updateOrderInfoByDistributionStockArticleEntity: 查询到的包件数据 不存在"); + } + + Integer incomingNum = 0; Integer handleNum = 0; Integer outNum = 0;