From 8ae173dc6eb0f78fdcfa4a22a374809bcdecb6d8 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Wed, 27 Dec 2023 11:12:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=85=8D=E9=80=81=EF=BC=8C=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 11 ++++++++++- .../impl/DistributionStockArticleServiceImpl.java | 9 +++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index ac177a7bb..5cec0e930 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -422,7 +422,16 @@ ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name, ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status, GROUP_CONCAT( DISTINCT lwtg.tray_code ) trays, - GROUP_CONCAT( DISTINCT lwug.position_code ) allocation + GROUP_CONCAT( DISTINCT lwug.position_code ) allocation, + (select COUNT(ldp.id) + from logpm_distribution_parcel_list ldp + where ldp.stock_article_id = ldsa.id and ldp.order_package_status = 70 + ) signinQuantity, + sum(( + select COUNT(ldl.id) + from logpm_distribution_loadscan ldl + where ldl.package_id = ldpl.id and ldl.signfor_state = 1 + )) deliveryQuantity from logpm_distribution_stock_article ldsa LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id 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 604f0ed7a..658a0e802 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 @@ -50,6 +50,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.order.OrderStatusConstant; +import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -847,9 +848,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity); distributionStockArticleEntityIPage.getRecords().stream().forEach(i ->{ - DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId()); +/* DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId()); i.setDeliveryQuantity(distributionStockArticleEntity.getDeliveryQuantity()); - i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity()); + List list = distributionParcelListService.list(Wrappers.query().lambda() + .eq(DistributionParcelListEntity::getStockArticleId, i.getId()) + .eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue()) + ); + i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity() + list.size() );*/ if(i.getIsZero().equals("1")){ //查询托盘 WarehouseTrayGoodsEntity warehouseTrayGoods = new WarehouseTrayGoodsEntity(); From 5bd3be02b4d67e0115b24096560a2b84f5c64c78 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 27 Dec 2023 12:13:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=AF=B9=E5=BA=94=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PanFactoryDataServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index c468862ec..9e81470a3 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -392,15 +392,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { takeCompany = supplyData.get("takeCompany"); } - OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo); - if(Objects.isNull(orderDetailEntity)){ - logger.warn("############handleDataToPlatform: 包条信息不存在 unitNo={}",unitNo); - throw new CustomerException(405, "包条信息不存在"); - } - Integer oldId = orderDetailEntity.getNowWarehouseId(); +// OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo); +// if(Objects.isNull(orderDetailEntity)){ +// logger.warn("############handleDataToPlatform: 包条信息不存在 unitNo={}",unitNo); +// throw new CustomerException(405, "包条信息不存在"); +// } +// Integer oldId = orderDetailEntity.getNowWarehouseId(); // 查询数据对应的仓库名称 - BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(oldId); + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.findByName(destinationWarehouse); if(Objects.isNull(basicdataWarehouseEntity)){ logger.warn("############handleDataToPlatform: 仓库信息不存在 destinationWarehouse={}",destinationWarehouse); throw new CustomerException(405, "仓库信息不存在"); @@ -558,7 +558,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } //保存包件信息 - saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime,oldId); + saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime,basicdataWarehouseEntity.getOldId()); logger.info("#################handleDataToPlatform: 数据处理完成"); } else { From 392a27fe86195ff278667bbc9edabc09194a6c26 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Wed, 27 Dec 2023 13:41:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=96=B9=E6=8F=90=E4=BA=A4=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AftersalesAppealEntity.java | 5 +++ .../impl/AftersalesWorkOrderServiceImpl.java | 33 ++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java index 47a82704d..e63ee2aef 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java @@ -116,5 +116,10 @@ public class AftersalesAppealEntity extends TenantEntity { */ @ApiModelProperty(value = "处理人ID") private Long processedById; + /** + * 申述附件 + */ + @ApiModelProperty(value = "申述附件") + private String imagePath; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 1afc66d36..b38ad0003 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1303,20 +1303,35 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImplquery().lambda() + List list = aftersalesProcessorService.list(Wrappers.query().lambda() .eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId()) - .eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName()) - .eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId()) + /*.eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName()) + .eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())*/ .eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue()) + .apply("conditions in ( 1 , 2 )") ); - if(ObjectUtils.isNull(one)){ - throw new ServiceException("处理方信息不存在！！"); + if(list.isEmpty()){ +// throw new ServiceException("处理方信息不存在！！"); + log.info("异常工单处理结果》》》不是处理方提交数据"); + //查询处理方待回复的； + + + + + + }else{ + Optional first = list.stream().filter(i -> i.getBusinessId().equals(myCurrentWarehouse.getId()) && i.getBusinessName().equals(myCurrentWarehouse.getName())).findFirst(); + if(first.isPresent()){ + AftersalesProcessorEntity processor = new AftersalesProcessorEntity(); + processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.tijiaofang.getValue()); + processor.setId(first.get().getId()); + aftersalesProcessorService.updateById(processor); + } + + } - AftersalesProcessorEntity processor = new AftersalesProcessorEntity(); - processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.tijiaofang.getValue()); - processor.setId(one.getId()); - aftersalesProcessorService.updateById(processor); + //添加操作记录 // AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = new AftersaleSurveyRecordDTO();