From 1cf7bb01ce40abdae1cda6ffa0836d2465495e45 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 26 Mar 2024 18:06:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=94=AE=E5=90=8E-=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9F=BA=E6=9C=AC=E9=80=BB=E8=BE=91=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=202.=E5=BC=80=E5=8D=95-=E5=90=8C=E6=AD=A5=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=AF=B9=E5=BA=94=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AftersalesAbnormalRecordMapper.xml | 37 +++++++++++++++++-- .../AftersalesAbnormalRecordServiceImpl.java | 1 + .../mapper/TrunklineAdvanceDetailMapper.java | 2 + .../mapper/TrunklineAdvanceDetailMapper.xml | 10 ++++- .../ITrunklineAdvanceDetailService.java | 2 + .../service/impl/InComingServiceImpl.java | 13 ++++++- .../service/impl/OpenOrderServiceImpl.java | 31 +++------------- .../TrunklineAdvanceDetailServiceImpl.java | 5 +++ 8 files changed, 69 insertions(+), 32 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml index ed86a7962..41b9c80f0 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml @@ -4,11 +4,42 @@ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 3dc8e0392..99908c77b 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -70,6 +70,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl + + update logpm_trunkline_advance_detail + set waybill_no = #{waybillNo} + where advance_id = #{advanceId} + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 4ae357c43..9fc933b02 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -49,4 +49,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService advanceDetailQueryWrapper = new QueryWrapper<>(); - advanceDetailQueryWrapper.eq("order_package_code",packageCode) - .eq("warehouse_id",warehouseId); + advanceDetailQueryWrapper.eq("order_package_code",packageCode); TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailService.getOne(advanceDetailQueryWrapper); if(Objects.isNull(advanceDetailEntity)){ log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}",packageCode,warehouseId); @@ -60,6 +62,13 @@ public class InComingServiceImpl implements IInComingService { return Resp.scanFail(405,"包件已入库","包件已入库"); } + if(StringUtil.isBlank(warehouseName)){ + BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId); + if(!Objects.isNull(warehouseEntity)){ + warehouseName = warehouseEntity.getName(); + } + } + //1.修改暂存单包件入库状态 advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName); 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 3bd092d2a..3983ebcee 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 @@ -448,41 +448,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillOrderEntity.setHandleNumber(incomingNum); waybillOrderEntities.add(waybillOrderEntity); - - List list = advanceDetailService.findList(advanceEntity.getId()); + //更新暂存单包件的运单信息 + advanceDetailService.updateWaybillNoByAdvanceId(advanceId,waybillNo,waybillId); + List list = advanceDetailService.findList(advanceId); trunklineWaybillPackageService.saveList(list,waybillEntity); distributionParcelListClient.updateEntityByOpenOrder(advanceId,waybillId); // orderCodes.add(advanceEntity.getOrderCode()); advanceEntity.setWaybillStatus("1"); - advanceEntity.setWaybillNo(waybillEntity.getWaybillNo()); + advanceEntity.setWaybillNo(waybillNo); + } trunklineWaybillOrderService.saveBatch(waybillOrderEntities); //修改暂存单的状态为已开单 advanceService.updateBatchById(advanceEntityList); -// Integer isTransfer = 1; -// if(departureWarehouseId.equals(destinationWarehouseId)){ -// isTransfer = 0; -// } - -// for (String orderCode : orderCodes) { -// List stockArticleEntities = distributionStockArticleClient.findListByOrderCode(orderCode); -// for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) { -// Long orderWarehouseId = stockArticleEntity.getWarehouseId(); -// stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee()); -// stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName()); -// stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile()); -// stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); -// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); -// if(!Objects.isNull(basicdataClientEntity)){ -// stockArticleEntity.setMallId(consigneeId); -// stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); -// stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); -// } -// } -// distributionStockArticleClient.updateByBatchId(stockArticleEntities); -// } - //计算扫码入库的包件是否需要把运单和提货单挂上 List billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds); List billladingWaybillEntities = new ArrayList<>(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 135c87411..54d39b6d0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -230,4 +230,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl