From fdbf606e35abe7efef6552d4b932a5233de20fd8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 13 Nov 2024 17:50:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=89=98=E7=9B=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=B2=E8=B4=A7=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WarehouseParcelListEntity.java | 30 +------------------ .../basicdata/vo/WarehouseParcelListVO.java | 7 +++++ .../basicdata/mapper/BasicdataTrayMapper.xml | 4 ++- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java index 50990de2f..5d591103f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java @@ -46,36 +46,8 @@ import java.util.Date; * @since 2023-06-13 */ @Data -@TableName("logpm_warehouse_parcel_list") -@ApiModel(value = "WarehouseParcelList对象", description = "在库订单包件清单") -@EqualsAndHashCode(callSuper = true) -public class WarehouseParcelListEntity extends TenantEntity { +public class WarehouseParcelListEntity { - /** - * 预留1 - */ - @ApiModelProperty(value = "预留1") - private String reserve1; - /** - * 预留2 - */ - @ApiModelProperty(value = "预留2") - private String reserve2; - /** - * 预留3 - */ - @ApiModelProperty(value = "预留3") - private String reserve3; - /** - * 预留4 - */ - @ApiModelProperty(value = "预留4") - private String reserve4; - /** - * 预留5 - */ - @ApiModelProperty(value = "预留5") - private String reserve5; /** * 订单自编号 */ diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java index dda7100a1..9e25450bf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java @@ -104,4 +104,11 @@ public class WarehouseParcelListVO extends WarehouseParcelListEntity { */ private String positionCode; + + /** + * 是否窜货 0否 1是 + */ + private Integer isFleeing; + + } 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 6053b60ab..dfc066552 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 @@ -116,7 +116,9 @@ lwga.column_num columnNum, lwga.layer_num layerNum, lwtg.create_time operateTime, - lwtg.create_user operateUser + lwtg.create_user operateUser, + lwtg.is_fleeing isFleeing + FROM logpm_warehouse_tray_goods lwtg JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id From 0e5c14c1396f4201db0c1ace3e68879b69a8399c Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 13 Nov 2024 18:13:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/WarehouseWaybillVO.java | 2 + .../service/impl/OpenOrderServiceImpl.java | 82 +++++++++++++------ .../impl/TrunklineCarsLoadServiceImpl.java | 18 +++- .../mapper/WarehouseWaybillMapper.xml | 6 +- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java index b3d459934..a41ab71fd 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java @@ -54,4 +54,6 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity { private BigDecimal totalFee; private String chargeTypes; + private Integer zeroEditStatus; + } 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 1d20f91d3..08111ac78 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 @@ -2628,6 +2628,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.fail(405, "运单信息不存在"); } + String waybillNo = waybillEntity.getWaybillNo(); + if (isEdit.equals(1)) { Integer abolishStatus = waybillEntity.getAbolishStatus(); if (abolishStatus.equals(1)) { @@ -2645,7 +2647,37 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map map = new HashMap<>(); + + Integer zeroEditStatus = 1; + + Integer waybillType = waybillEntity.getWaybillType(); + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + if (waybillType.equals(2)) { + //零担改单限制 + + Integer totalCount = waybillEntity.getTotalCount(); + DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); + if (Objects.isNull(endStockArticleEntity)) { + DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); + if (Objects.isNull(startStockArticleEntity)) { + zeroEditStatus = 1; + } + Integer handQuantity = startStockArticleEntity.getHandQuantity(); + if (!NumberUtil.equals(handQuantity, totalCount)) { + zeroEditStatus = 0; + } + }else{ + Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); + if(!NumberUtil.equals(incomingQuantity,totalCount)){ + zeroEditStatus = 0; + } + } + } + warehouseWaybillVO.setZeroEditStatus(zeroEditStatus); + map.put("warehouseWaybill", warehouseWaybillVO); + map.put("zeroEditStatus", zeroEditStatus); map.put("payTypeList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_TYPE)); map.put("payWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_PAY_WAY)); map.put("deliveryWayList", DictBizCache.getList(DictBizConstant.OPEN_ORDER_DELIVERY_WAY)); @@ -2687,33 +2719,35 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } Integer waybillType = waybillEntity.getWaybillType(); - if (waybillType.equals(2)) { - //零担改单限制 - Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); - Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); - Integer totalCount = waybillEntity.getTotalCount(); - DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); - if (Objects.isNull(endStockArticleEntity)) { - DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); - if (Objects.isNull(startStockArticleEntity)) { - log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId); - return R.fail(405, "订单信息不存在！"); - } - Integer handQuantity = startStockArticleEntity.getHandQuantity(); - if (!NumberUtil.equals(handQuantity, totalCount)) { - log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId); - return R.fail(405, "始发仓数据已发运"); - } - }else{ - Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); - if(!NumberUtil.equals(incomingQuantity,totalCount)){ - log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId); - return R.fail(405, "目的仓数据还未完全到达"); + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + if(warehouseId.equals(departureWarehouseId) || warehouseId.equals(destinationWarehouseId)){ + if (waybillType.equals(2)) { + //零担改单限制 + + Integer totalCount = waybillEntity.getTotalCount(); + DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId); + if (Objects.isNull(endStockArticleEntity)) { + DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId); + if (Objects.isNull(startStockArticleEntity)) { + log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId); + return R.fail(405, "订单信息不存在！"); + } + Integer handQuantity = startStockArticleEntity.getHandQuantity(); + if (!NumberUtil.equals(handQuantity, totalCount)) { + log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId); + return R.fail(405, "始发仓数据已发运"); + } + }else{ + Integer incomingQuantity = endStockArticleEntity.getIncomingNum(); + if(!NumberUtil.equals(incomingQuantity,totalCount)){ + log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId); + return R.fail(405, "目的仓数据还未完全到达"); + } } } } - // //验证运单是否有配送任务 // //查询运单下所有订单号 // List orderCodes = distributionParcelListClient.findOrderCodeByWaybillId(waybillId); @@ -2747,8 +2781,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String consigneeName = waybillEntity.getConsigneeName(); String consigneeAddress = waybillEntity.getConsigneeAddress(); String consigneeMobile = waybillEntity.getConsigneeMobile(); - Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); - Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); Integer totalCount = waybillEntity.getTotalCount(); 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 5bababb47..720defaa9 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 @@ -1668,7 +1668,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum(); - Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !Objects.isNull(scan.getUnloadNodeId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); + Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); Integer carsOrderRealSignNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("3") && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); carsOrderEntity.setRealNum(carsOrderRealLoadingNum); carsOrderEntity.setUnloadNum(carsOrderRealUnloadingNum); @@ -4933,7 +4933,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { List trunklineCarsLoadScanVOS = noWaybillNoTrunklineCarsLoadScanMapByOrderCode.get(orderCode); //把trunklineCarsLoadScanVOS中所有元素的num加起来，如果num为空则用0代替 - Integer loadingNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum); + Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum); Integer unloadNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum); Integer signNum = trunklineCarsLoadScanVOS.stream().filter(t-> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum); @@ -7542,6 +7542,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl #{item} From 19f859747388bd18cd811aeb7e647f019b73a022 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 13 Nov 2024 18:18:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=201.=E5=88=A0=E9=99=A4=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E7=9A=84=E7=8A=B6=E6=80=81=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=8E=92=E5=BA=8F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/mapper/BasicdataTrayMapper.xml | 3 ++- .../wrapper/WarehouseParcelListWrapper.java | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) 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 dfc066552..5a262afae 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 @@ -118,7 +118,6 @@ lwtg.create_time operateTime, lwtg.create_user operateUser, lwtg.is_fleeing isFleeing - FROM logpm_warehouse_tray_goods lwtg JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id @@ -171,6 +170,7 @@ and ldpl.brand_name like concat('%',#{param.brandName},'%') + order by lwtg.create_time desc + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index 3a04807ce..ce4d4c1fa 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -307,4 +307,16 @@ public interface IAftersalesWorkOrderService extends BaseService exportWorkOrder(Map aftersalesWorkOrder); + /** + * 构建导出基础字段 + * @return + */ + List> basicTitleBuild(); + + /** + * 查询导出基础数据 + * @param aftersalesWorkOrder + * @return + */ + List getBasicExportData(Map aftersalesWorkOrder); } 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 de5fe2c24..8c8d4a823 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 @@ -368,6 +368,16 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl processorVOS = new ArrayList<>(); List list = aftersalesProcessorService.list(Wrappers.query().lambda() .eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrder.getId()) + .ne(AftersalesProcessorEntity::getTypesOf, "3") .apply("conditions in (1,2)") ); //需要待回复的处理方 @@ -2642,6 +2653,113 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl> basicTitleBuild() { + List> title = new ArrayList<>(); + List head0 = new ArrayList<>(Arrays.asList("异常类型")); + title.add(0,head0); + List head1 = new ArrayList<>(Arrays.asList("发现节点")); + title.add(1,head1); + List head2 = new ArrayList<>(Arrays.asList("工单创建仓")); + title.add(2,head2); + + List head3 = new ArrayList<>(Arrays.asList("工单号")); + title.add(3,head3); + + List head4 = new ArrayList<>(Arrays.asList("运单号")); + title.add(4,head4); + + List head5 = new ArrayList<>(Arrays.asList("订单自编号")); + title.add(5,head5); + + List head6 = new ArrayList<>(Arrays.asList("包条码")); + title.add(6,head6); + + List head7 = new ArrayList<>(Arrays.asList("品牌")); + title.add(7,head7); + + List head8 = new ArrayList<>(Arrays.asList("运单商场")); + title.add(8,head8); + + List head9= new ArrayList<>(Arrays.asList("一级品类")); + title.add(9,head9); + + List head10 = new ArrayList<>(Arrays.asList("工单状态")); + title.add(10,head10); + + List head11 = new ArrayList<>(Arrays.asList("工单处理方")); + title.add(11,head11); + + List head12 = new ArrayList<>(Arrays.asList("工单创建时间")); + title.add(12,head12); + + List head13= new ArrayList<>(Arrays.asList("工单最晚处理时间")); + title.add(13,head13); + + List head14= new ArrayList<>(Arrays.asList("工单最新处理时间")); + title.add(14,head14); + + List head15= new ArrayList<>(Arrays.asList("是否超时")); + title.add(15,head15); + + List head16= new ArrayList<>(Arrays.asList("营业部处理客服")); + title.add(16,head16); + return title; + } + + @Override + public List getBasicExportData(Map aftersalesWorkOrder) { + String o = (String) aftersalesWorkOrder.get("ids"); + List ids = null; + if (!Objects.isNull(o)) { + ids = Func.toLongList((String) aftersalesWorkOrder.get("ids")); + } + //查询用户角色信息 + BladeUser user = AuthUtil.getUser(); + String roleName = user.getRoleName(); + + //查询客服岗位 + List warehouseType = DictBizCache.getList("after_sales_visits"); + if (warehouseType.isEmpty()) { + throw new ServiceException("注意，注意！售后访问字典未配置！请配置！"); + } + List roleList = Arrays.asList(user.getRoleName().split(",")); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (!roleList.isEmpty()) { + Optional matchingDictBiz = warehouseType.stream() + .filter(i -> roleList.contains(i.getDictValue())) + .findFirst(); + Object workOrderStatus = aftersalesWorkOrder.get("workOrderStatus"); + if (matchingDictBiz.isPresent()) { + String dictValue = matchingDictBiz.get().getDictKey(); + switch (dictValue) { + case "1": // 客服经理 + updateWorkOrderForManager(aftersalesWorkOrder, workOrderStatus); + break; + case "2": // 营业部客服 + if (Objects.isNull(myCurrentWarehouse)){ + //营业部客服未选择仓库进行作业 + throw new ServiceException("请选择仓库"); + } + updateWorkOrderForSales(aftersalesWorkOrder, workOrderStatus); + break; + case "3": // 职能客服 + updateWorkOrderForFunctional(aftersalesWorkOrder, workOrderStatus, user.getUserId()); + break; + } + } else { + updateWorkOrderForOthers(aftersalesWorkOrder, workOrderStatus); + } + }else { + throw new CustomerException("当前登录人无工单操作权限!!!"); + } + + + AftersalesWorkOrderDTO workOrderDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderDTO.class); + List exportData = baseMapper.getBasicExportData(workOrderDTO,ids); + return exportData; + } + /** * 判断是否是客服角色 * @param user 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 6de7f430f..cfccde55e 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 @@ -3290,6 +3290,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl ids = parcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); List abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .in(DistributionLoadscanAbnormalEntity::getPackageId, ids) + .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, "2") ); if (!abnormalEntities.isEmpty()) { //判断此包件的异常是否是当前扫描车次和客户 From 5e2357f8ae98439990608dc5601873e30789aae4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 14 Nov 2024 09:50:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E5=AF=BC=E5=85=A5=E6=A0=87=E5=93=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 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 08111ac78..f86689e9f 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 @@ -2280,19 +2280,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a)); List hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList); hasAdvanceDetailList.forEach(advanceDetailEntity -> { - Long waybillId = advanceDetailEntity.getWaybillId(); - if (Objects.isNull(waybillId)) { - ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode()); - TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity(); - updateMaterialEntity.setId(advanceDetailEntity.getId()); - updateMaterialEntity.setOrderPackageCode(advanceDetailEntity.getOrderPackageCode()); - updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode()); - updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName()); - updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName()); - updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName()); - updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName()); - updateMaterialList.add(updateMaterialEntity); - } + + ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode()); + TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity(); + updateMaterialEntity.setId(advanceDetailEntity.getId()); + updateMaterialEntity.setOrderPackageCode(advanceDetailEntity.getOrderPackageCode()); + updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode()); + updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName()); + updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName()); + updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName()); + updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName()); + updateMaterialList.add(updateMaterialEntity); + }); if (CollUtil.isNotEmpty(updateMaterialList)) {