From d1f5fc4341136e043734f834f60bc0c9cffeb261 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 30 Aug 2024 12:20:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E9=85=8D=E9=80=81=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/DistributionDeliveryListExcel.java | 3 ++ .../DistributionDeliveryListServiceImpl.java | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index 03040c59b..553b0ff1a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -42,6 +42,9 @@ public class DistributionDeliveryListExcel implements Serializable { private static final long serialVersionUID = 1L; + + + private Long id; /** * 车次 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 530fe9499..f9367f528 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -307,6 +307,30 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList); + // 获取集合中 kind =2 的id集合 + List ids = distributionDeliveryListEntities.stream().filter(item -> "2".equals(item.getKind())).map(DistributionDeliveryListEntity::getId).collect(Collectors.toList()); + + if(!ids.isEmpty()){ + // 关联查询所有的三方配送信息表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DistributionDeliveryTripartiteEntity::getDeliveryId, ids); + List distributionDeliveryTripartiteEntities = distributionDeliveryTripartiteService.list(wrapper); + + for (DistributionDeliveryListEntity distributionDeliveryListEntity : distributionDeliveryListEntities) { + if(Objects.equals( "2",distributionDeliveryListEntity.getKind())){ + // 在集合 distributionDeliveryTripartiteEntities 中寻找 distributionDeliveryListEntity的ID相同的 + DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteEntities.stream().filter(item -> item.getDeliveryId().equals(distributionDeliveryListEntity.getId())).findFirst().orElse(null); + if(tripartiteEntity != null){ + // 保留2为小数 + if(tripartiteEntity.getDeliveryFee()!=null){ + distributionDeliveryListEntity.setPrice(tripartiteEntity.getDeliveryFee().setScale(2)); + } + + } + } + } + } + return page.setRecords(distributionDeliveryListEntities); } @@ -336,6 +360,34 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionDeliveryListExcels = baseMapper.exportDistributionDeliveryList(distributionDeliveryList); + + + // 获取集合中 kind =2 的id集合 + List ids = distributionDeliveryListExcels.stream().filter(item -> "三方配送".equals(item.getKind())).map(DistributionDeliveryListExcel::getId).collect(Collectors.toList()); + + if(!ids.isEmpty()){ + // 关联查询所有的三方配送信息表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DistributionDeliveryTripartiteEntity::getDeliveryId, ids); + List distributionDeliveryTripartiteEntities = distributionDeliveryTripartiteService.list(wrapper); + + for (DistributionDeliveryListExcel distributionDeliveryListEntity : distributionDeliveryListExcels) { + if(Objects.equals( "三方配送",distributionDeliveryListEntity.getKind())){ + // 在集合 distributionDeliveryTripartiteEntities 中寻找 distributionDeliveryListEntity的ID相同的 + DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteEntities.stream().filter(item -> item.getDeliveryId().equals(distributionDeliveryListEntity.getId())).findFirst().orElse(null); + if(tripartiteEntity != null){ + // 保留2为小数 + if(tripartiteEntity.getDeliveryFee()!=null){ + distributionDeliveryListEntity.setPrice(tripartiteEntity.getDeliveryFee().setScale(2)); + } + + } + } + } + } + + + return distributionDeliveryListExcels; } From c542cfa58287f5c73d0ee59cb02eb448e2b147fb Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 30 Aug 2024 15:55:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=87=AA=E6=8F=90BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index f8ea3e3c3..7e579fa62 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3752,7 +3752,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); //查询包件 List distributionParcelListEntities = distributionParcelListService.listByIds(ids); - List packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); + List packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList()); if (Func.isNotEmpty(packageIds)) { distributionParcelListService.update(new UpdateWrapper().lambda() .set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) From 0a0f106a9af478904ab60a4c40e8358749f3f2b0 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 30 Aug 2024 16:12:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8E=A8=E9=80=81=E5=8C=85=E4=BB=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E4=BF=A1=E6=81=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PanFactoryDataServiceImpl.java | 353 +++++++++--------- 1 file changed, 185 insertions(+), 168 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 66a4a45ce..a54a06d4c 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 @@ -53,6 +53,8 @@ import org.springblade.common.constant.orderpackage.*; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.redis.lock.LockType; +import org.springblade.core.redis.lock.RedisLockClient; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; @@ -62,6 +64,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.TimeUnit; @Slf4j @AllArgsConstructor @@ -110,6 +113,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private final BladeRedis redis; + private final RedisLockClient redisLockClient; private final IRegionFeign regionFeign; private final IBasicdataBrandClient basicdataBrandClient; @@ -813,7 +817,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); if(!Objects.isNull(warehouseWaybillEntity)){ entity.setWaybillId(warehouseWaybillEntity.getId()); - entity.setWaybillNumber(waybillNo); + }else{ + Long waybillId = saveWaybillEntity(waybillNo); + entity.setWaybillId(waybillId); } String brand = distributionStockArticleEntity.getBrand(); @@ -894,186 +900,197 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } } - private void saveWaybillEntity(String waybillNo) { + private Long saveWaybillEntity(String waybillNo) { log.info("#################handleDataToPlatform.saveWaybillEntity: {}", waybillNo); if (StringUtil.isBlank(waybillNo)) { - return; + return null; } - if(redis.exists("dealwithWaybillNo:"+waybillNo)){ - log.info("###########saveWaybillEntity: 已有保存数据 waybillNo={}",waybillNo); - return; - } +// if (redis.exists("dealwithWaybillNo:" + waybillNo)) { +// log.info("###########saveWaybillEntity: 已有保存数据 waybillNo={}", waybillNo); +// return waybillId; +// } - //通过运单号先去查询新系统是否存在这个运单号 - WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); - log.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill); - - if (Objects.isNull(warehouseWaybill)) { - redis.setEx("dealwithWaybillNo:"+waybillNo,waybillNo,30L); - //如果新系统中不存在这个运单，那么就去查询老系统的运单数据 - WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); - log.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity); - if (Objects.isNull(wayBillEntity)) { - log.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo); - throw new CustomerException("老系统中未找到对应运单"); - } - String startSite = wayBillEntity.getStartSite();//始发仓名称 - BasicdataWarehouseEntity starthouse = basicdataWarehouseClient.findByName(startSite); - String warehouseName = wayBillEntity.getWarehouseName();//目的仓 - BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); - Integer number = wayBillEntity.getNumber();//运单总数量 - String packname = wayBillEntity.getPackname(); - String agent = wayBillEntity.getAgent(); - - warehouseWaybill = new WarehouseWaybillEntity(); - warehouseWaybill.setTenantId(TenantNum.HUITONGCODE); - warehouseWaybill.setCreateUser(1714696768639311873L); - warehouseWaybill.setUpdateUser(1714696768639311873L); - warehouseWaybill.setCreateDept(1649331096241836033L); - warehouseWaybill.setWaybillNo(waybillNo); - warehouseWaybill.setDestinationWarehouseName(warehouseName); - warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); - warehouseWaybill.setDepartureWarehouseName(startSite); - warehouseWaybill.setDepartureWarehouseId(Objects.isNull(starthouse) ? null : starthouse.getId()); - warehouseWaybill.setCustomerTrain(wayBillEntity.getCarNo()); - warehouseWaybill.setBrand(wayBillEntity.getBrand()); - String sendCompany = wayBillEntity.getSendCompany();//发货单位 - String takeCompany = wayBillEntity.getTakeCompany();//收货单位 - BasicdataClientEntity sendClient = basicdataClientClient.findByName(sendCompany); - BasicdataClientEntity takeClient = basicdataClientClient.findByName(takeCompany); - if (!Objects.isNull(sendClient)) { - Long clientEntityId = sendClient.getId();//基础客户 - warehouseWaybill.setShipperId(clientEntityId); - } - if (!Objects.isNull(takeClient)) { - Long clientEntityId = takeClient.getId();//基础客户 - BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3); - if (!Objects.isNull(basicdataStoreBusinessEntity)) { - warehouseWaybill.setServiceType(Integer.parseInt(basicdataStoreBusinessEntity.getMold())); + String lockKey = "dealwithWaybillNo:" + waybillNo; + Long aLong = null; + boolean flag = false; + try { + flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 20000, 30000, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + if(flag){ + //通过运单号先去查询新系统是否存在这个运单号 + WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); + log.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill); + + if (Objects.isNull(warehouseWaybill)) { + redis.setEx("dealwithWaybillNo:" + waybillNo, waybillNo, 30L); + //如果新系统中不存在这个运单，那么就去查询老系统的运单数据 + WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); + log.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity); + if (Objects.isNull(wayBillEntity)) { + log.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo); + throw new CustomerException("老系统中未找到对应运单"); } - warehouseWaybill.setConsigneeId(clientEntityId); - } - warehouseWaybill.setShipper(sendCompany); - warehouseWaybill.setShipperName(wayBillEntity.getSendPerson()); - warehouseWaybill.setShipperMobile(wayBillEntity.getSendMobile()); - warehouseWaybill.setShipperAddress(wayBillEntity.getSendAddress()); - warehouseWaybill.setConsignee(takeCompany); - warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); - warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); - warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); + String startSite = wayBillEntity.getStartSite();//始发仓名称 + BasicdataWarehouseEntity starthouse = basicdataWarehouseClient.findByName(startSite); + String warehouseName = wayBillEntity.getWarehouseName();//目的仓 + BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); + Integer number = wayBillEntity.getNumber();//运单总数量 + String packname = wayBillEntity.getPackname(); + String agent = wayBillEntity.getAgent(); + + warehouseWaybill = new WarehouseWaybillEntity(); + warehouseWaybill.setTenantId(TenantNum.HUITONGCODE); + warehouseWaybill.setCreateUser(1714696768639311873L); + warehouseWaybill.setUpdateUser(1714696768639311873L); + warehouseWaybill.setCreateDept(1649331096241836033L); + warehouseWaybill.setWaybillNo(waybillNo); + warehouseWaybill.setDestinationWarehouseName(warehouseName); + warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); + warehouseWaybill.setDepartureWarehouseName(startSite); + warehouseWaybill.setDepartureWarehouseId(Objects.isNull(starthouse) ? null : starthouse.getId()); + warehouseWaybill.setCustomerTrain(wayBillEntity.getCarNo()); + warehouseWaybill.setBrand(wayBillEntity.getBrand()); + String sendCompany = wayBillEntity.getSendCompany();//发货单位 + String takeCompany = wayBillEntity.getTakeCompany();//收货单位 + BasicdataClientEntity sendClient = basicdataClientClient.findByName(sendCompany); + BasicdataClientEntity takeClient = basicdataClientClient.findByName(takeCompany); + if (!Objects.isNull(sendClient)) { + Long clientEntityId = sendClient.getId();//基础客户 + warehouseWaybill.setShipperId(clientEntityId); + } + if (!Objects.isNull(takeClient)) { + Long clientEntityId = takeClient.getId();//基础客户 + BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId, 3); + if (!Objects.isNull(basicdataStoreBusinessEntity)) { + warehouseWaybill.setServiceType(Integer.parseInt(basicdataStoreBusinessEntity.getMold())); + } + warehouseWaybill.setConsigneeId(clientEntityId); + } + warehouseWaybill.setShipper(sendCompany); + warehouseWaybill.setShipperName(wayBillEntity.getSendPerson()); + warehouseWaybill.setShipperMobile(wayBillEntity.getSendMobile()); + warehouseWaybill.setShipperAddress(wayBillEntity.getSendAddress()); + warehouseWaybill.setConsignee(takeCompany); + warehouseWaybill.setConsigneeName(wayBillEntity.getTakePerson()); + warehouseWaybill.setConsigneeMobile(wayBillEntity.getTakeMobile()); + warehouseWaybill.setConsigneeAddress(wayBillEntity.getTakeAddress()); // String arriveSite = wayBillEntity.getArriveSite(); - Integer arriveSiteId = wayBillEntity.getArriveSiteId(); - String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); + Integer arriveSiteId = wayBillEntity.getArriveSiteId(); + String code = wayBillClient.findAreaCodeByArriveSiteId(arriveSiteId); // String code = regionFeign.getCode(arriveSite); - warehouseWaybill.setDestinationCode(code); - warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); - warehouseWaybill.setGoodsName(packname); - warehouseWaybill.setTotalCount(number); - warehouseWaybill.setStockCount(1); - warehouseWaybill.setWaybillType(1); - warehouseWaybill.setTotalWeight(wayBillEntity.getWeight()); - warehouseWaybill.setTotalVolume(wayBillEntity.getVolume()); - warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType()); - warehouseWaybill.setUrgency(wayBillEntity.getUrgency()); - warehouseWaybill.setReceiptCount(wayBillEntity.getReceiptNum()); - warehouseWaybill.setReceiptRequirement(wayBillEntity.getReceiptAsk()); - //--------------2023-07-28------------- - warehouseWaybill.setCollectPay(wayBillEntity.getDPay()); - warehouseWaybill.setReceivedCollectPay(BigDecimal.ZERO); - warehouseWaybill.setReplacePrice(wayBillEntity.getReplacePrice()); - warehouseWaybill.setReceivedReplacePrice(BigDecimal.ZERO); - warehouseWaybill.setReceivedTotalPrice(BigDecimal.ZERO); - warehouseWaybill.setWaybillType(wayBillEntity.getType()); - warehouseWaybill.setReceivedStatus(0); - - warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); - warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); - warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); - warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); - warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); - warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); - warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); - warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); - warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); - warehouseWaybill.setPayType(wayBillEntity.getPayType()+""); - warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod()+""); - warehouseWaybill.setXPay(wayBillEntity.getXPay()); - warehouseWaybill.setDPay(wayBillEntity.getDPay()); - warehouseWaybill.setHPay(wayBillEntity.getHPay()); - warehouseWaybill.setYPay(wayBillEntity.getYPay()); - warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); - warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType()+""); - warehouseWaybill.setUrgency(wayBillEntity.getUrgency()+""); - warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); - warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); - warehouseWaybill.setTransportType(wayBillEntity.getShippingType()+""); - warehouseWaybill.setRebate(wayBillEntity.getRebate()); - - BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); - if (!Objects.isNull(agentClient)) { - Long clientEntityId = agentClient.getId();//基础客户 - warehouseWaybill.setAgentId(clientEntityId); - } - Date date = new Date(); - warehouseWaybill.setAgent(agent); - warehouseWaybill.setDocumentMakingTime(wayBillEntity.getPreparationTime()); - warehouseWaybill.setRemark(wayBillEntity.getMsg()); - warehouseWaybill.setBatchNo(wayBillEntity.getStartCarsNo()); - warehouseWaybill.setFreezeStatus(0); - warehouseWaybill.setStatus(0); - warehouseWaybill.setIsDeleted(0); - warehouseWaybill.setCreateTime(date); - warehouseWaybill.setUpdateTime(date); - Long aLong = warehouseWaybillClient.addEnntity(warehouseWaybill); - if(aLong != 0){ - - List desList = waybillDesClient.getDesList(waybillNo); - List warehouseWayBillDetails = new ArrayList<>(); - for (WaybillDesEntity waybillDesEntity : desList) { - WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); - warehouseWayBillDetail.setCreateUser(1714696768639311873L); - warehouseWayBillDetail.setUpdateUser(1714696768639311873L); - warehouseWayBillDetail.setCreateDept(1649331096241836033L); - warehouseWayBillDetail.setWaybillId(aLong); - warehouseWayBillDetail.setWaybillNo(waybillNo); - String goodsName = waybillDesEntity.getName(); - BasicdataCategoryEntity categoryEntity = categoryClient.findByName(goodsName); - if(Objects.isNull(categoryEntity)){ - categoryEntity = new BasicdataCategoryEntity(); - categoryEntity.setName(goodsName); - categoryEntity.setType(1); - categoryEntity.setTenantId(TenantNum.HUITONGCODE); - categoryEntity.setCreateUser(1714696768639311873L); - categoryEntity.setUpdateUser(1714696768639311873L); - categoryEntity.setCreateDept(1649331096241836033L); - Long categoryId = categoryClient.addReturnId(categoryEntity); - warehouseWayBillDetail.setProductId(categoryId); - }else{ - warehouseWayBillDetail.setProductId(categoryEntity.getId()); + warehouseWaybill.setDestinationCode(code); + warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); + warehouseWaybill.setGoodsName(packname); + warehouseWaybill.setTotalCount(number); + warehouseWaybill.setStockCount(1); + warehouseWaybill.setWaybillType(1); + warehouseWaybill.setTotalWeight(wayBillEntity.getWeight()); + warehouseWaybill.setTotalVolume(wayBillEntity.getVolume()); + warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType()); + warehouseWaybill.setUrgency(wayBillEntity.getUrgency()); + warehouseWaybill.setReceiptCount(wayBillEntity.getReceiptNum()); + warehouseWaybill.setReceiptRequirement(wayBillEntity.getReceiptAsk()); + //--------------2023-07-28------------- + warehouseWaybill.setCollectPay(wayBillEntity.getDPay()); + warehouseWaybill.setReceivedCollectPay(BigDecimal.ZERO); + warehouseWaybill.setReplacePrice(wayBillEntity.getReplacePrice()); + warehouseWaybill.setReceivedReplacePrice(BigDecimal.ZERO); + warehouseWaybill.setReceivedTotalPrice(BigDecimal.ZERO); + warehouseWaybill.setWaybillType(wayBillEntity.getType()); + warehouseWaybill.setReceivedStatus(0); + + warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); + warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); + warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); + warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); + warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); + warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); + warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); + warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); + warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); + warehouseWaybill.setPayType(wayBillEntity.getPayType() + ""); + warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod() + ""); + warehouseWaybill.setXPay(wayBillEntity.getXPay()); + warehouseWaybill.setDPay(wayBillEntity.getDPay()); + warehouseWaybill.setHPay(wayBillEntity.getHPay()); + warehouseWaybill.setYPay(wayBillEntity.getYPay()); + warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); + warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType() + ""); + warehouseWaybill.setUrgency(wayBillEntity.getUrgency() + ""); + warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); + warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); + warehouseWaybill.setTransportType(wayBillEntity.getShippingType() + ""); + warehouseWaybill.setRebate(wayBillEntity.getRebate()); + + BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); + if (!Objects.isNull(agentClient)) { + Long clientEntityId = agentClient.getId();//基础客户 + warehouseWaybill.setAgentId(clientEntityId); + } + Date date = new Date(); + warehouseWaybill.setAgent(agent); + warehouseWaybill.setDocumentMakingTime(wayBillEntity.getPreparationTime()); + warehouseWaybill.setRemark(wayBillEntity.getMsg()); + warehouseWaybill.setBatchNo(wayBillEntity.getStartCarsNo()); + warehouseWaybill.setFreezeStatus(0); + warehouseWaybill.setStatus(0); + warehouseWaybill.setIsDeleted(0); + warehouseWaybill.setCreateTime(date); + warehouseWaybill.setUpdateTime(date); + aLong = warehouseWaybillClient.addEnntity(warehouseWaybill); + if (aLong != 0) { + redis.setEx("dealwithWaybillNoId:" + waybillNo,aLong, 30L); + List desList = waybillDesClient.getDesList(waybillNo); + List warehouseWayBillDetails = new ArrayList<>(); + for (WaybillDesEntity waybillDesEntity : desList) { + WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail(); + warehouseWayBillDetail.setCreateUser(1714696768639311873L); + warehouseWayBillDetail.setUpdateUser(1714696768639311873L); + warehouseWayBillDetail.setCreateDept(1649331096241836033L); + warehouseWayBillDetail.setWaybillId(aLong); + warehouseWayBillDetail.setWaybillNo(waybillNo); + String goodsName = waybillDesEntity.getName(); + BasicdataCategoryEntity categoryEntity = categoryClient.findByName(goodsName); + if (Objects.isNull(categoryEntity)) { + categoryEntity = new BasicdataCategoryEntity(); + categoryEntity.setName(goodsName); + categoryEntity.setType(1); + categoryEntity.setTenantId(TenantNum.HUITONGCODE); + categoryEntity.setCreateUser(1714696768639311873L); + categoryEntity.setUpdateUser(1714696768639311873L); + categoryEntity.setCreateDept(1649331096241836033L); + Long categoryId = categoryClient.addReturnId(categoryEntity); + warehouseWayBillDetail.setProductId(categoryId); + } else { + warehouseWayBillDetail.setProductId(categoryEntity.getId()); + } + warehouseWayBillDetail.setProductName(goodsName); + warehouseWayBillDetail.setNum(waybillDesEntity.getNum()); + warehouseWayBillDetail.setPrice(waybillDesEntity.getPrice()); + warehouseWayBillDetail.setVolume(waybillDesEntity.getVolume()); + warehouseWayBillDetail.setWeight(waybillDesEntity.getWeight()); + warehouseWayBillDetail.setSubtotalFreight(waybillDesEntity.getTotalDesPrice()); + warehouseWayBillDetail.setChargeType(waybillDesEntity.getPic()); + warehouseWayBillDetails.add(warehouseWayBillDetail); } - warehouseWayBillDetail.setProductName(goodsName); - warehouseWayBillDetail.setNum(waybillDesEntity.getNum()); - warehouseWayBillDetail.setPrice(waybillDesEntity.getPrice()); - warehouseWayBillDetail.setVolume(waybillDesEntity.getVolume()); - warehouseWayBillDetail.setWeight(waybillDesEntity.getWeight()); - warehouseWayBillDetail.setSubtotalFreight(waybillDesEntity.getTotalDesPrice()); - warehouseWayBillDetail.setChargeType(waybillDesEntity.getPic()); - warehouseWayBillDetails.add(warehouseWayBillDetail); + warehouseWaybillDetailClient.addList(warehouseWayBillDetails); } - warehouseWaybillDetailClient.addList(warehouseWayBillDetails); - } - } else { - warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); - warehouseWaybill.setUpdateTime(new Date()); - warehouseWaybillClient.updateEntity(warehouseWaybill); + } else { + warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); + warehouseWaybill.setUpdateTime(new Date()); + warehouseWaybillClient.updateEntity(warehouseWaybill); + aLong = warehouseWaybill.getId(); + } + //暂存单与运单的关联 + saveAdvanceData(warehouseWaybill); + redisLockClient.unLock(lockKey, LockType.FAIR); } - - //暂存单与运单的关联 - saveAdvanceData(warehouseWaybill); - + return aLong; } private void saveAdvanceData(WarehouseWaybillEntity warehouseWaybill) { From 7417f8ac155c432d8295aeca850d3832114b12a2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 31 Aug 2024 16:21:53 +0800 Subject: [PATCH 4/7] =?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 --- .../feign/IDistributionParcelListClient.java | 5 + .../com/logpm/trunkline/dto/LoadCarsDTO.java | 1 + .../logpm/trunkline/dto/ZeroPackageDTO.java | 15 +++ .../entity/TrunklineScanZeroDetailEntity.java | 51 ++++++++ .../logpm/trunkline/vo/LoadZeroListVO.java | 5 + .../com/logpm/trunkline/vo/ZeroPackageVO.java | 15 +++ .../feign/DistributionParcelListClient.java | 14 ++ .../mapper/DistributionParcelListMapper.java | 3 + .../mapper/DistributionParcelListMapper.xml | 11 ++ .../IDistributionParcelListService.java | 3 + .../DistributionParcelListServiceImpl.java | 20 +-- .../trunkline/api/CarsLoadApiController.java | 6 +- .../mapper/TrunklineScanZeroDetailMapper.java | 12 ++ .../service/ITrunklineCarsLoadService.java | 3 +- .../ITrunklineScanZeroDetailService.java | 7 + .../service/impl/OpenOrderServiceImpl.java | 5 + .../impl/TrunklineCarsLoadServiceImpl.java | 120 +++++++++++++++++- .../TrunklineScanZeroDetailServiceImpl.java | 15 +++ 18 files changed, 291 insertions(+), 20 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ZeroPackageDTO.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineScanZeroDetailEntity.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroPackageVO.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineScanZeroDetailMapper.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineScanZeroDetailService.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineScanZeroDetailServiceImpl.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index b4d2e6835..5cb1f2b4d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import com.alibaba.fastjson.JSONObject; import com.logpm.distribution.dto.FindParamterDTO; import com.logpm.distribution.dto.OrderPackageDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; @@ -211,6 +212,10 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX + "/clearPallet") void clearPallet(@RequestBody List orderPackageIdList); + @GetMapping(API_PREFIX + "/findPackageGoodsListByWaybillNo") + List findPackageGoodsListByWaybillNo(@RequestParam String waybillNo); + @GetMapping(API_PREFIX + "/findListByStockArticleId") + List findListByStockArticleId(@RequestParam Long articleId); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 8409a7f32..ba1b057c7 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -61,6 +61,7 @@ public class LoadCarsDTO implements Serializable { private String orderPackageCode; private List productInfoList = new ArrayList<>(); + private List zeroPackageList = new ArrayList<>(); private String goodsName; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ZeroPackageDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ZeroPackageDTO.java new file mode 100644 index 000000000..4acac8b3e --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/ZeroPackageDTO.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ZeroPackageDTO implements Serializable { + + private Long packageId; + private Long goodsId; + private String goodsName;//品类名称 + private Integer enterNum;//装车数量 + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineScanZeroDetailEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineScanZeroDetailEntity.java new file mode 100644 index 000000000..e1b837ef8 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineScanZeroDetailEntity.java @@ -0,0 +1,51 @@ +package com.logpm.trunkline.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_trunkline_scan_zero_detail") +@ApiModel(value = "TrunklineScanZeroDetail对象", description = "装车扫描零担明细表") +@EqualsAndHashCode(callSuper = true) +public class TrunklineScanZeroDetailEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + /** scanId */ + @ApiModelProperty(name = "装车扫描id",notes = "") + private Long scanId ; + /** packageId */ + @ApiModelProperty(name = "包件id",notes = "") + private Long packageId ; + /** goodsId */ + @ApiModelProperty(name = "品类id",notes = "") + private Long goodsId ; + /** goodsName */ + @ApiModelProperty(name = "品类名称",notes = "") + private String goodsName ; + /** loadingNum */ + @ApiModelProperty(name = "装车数量",notes = "") + private Integer loadingNum ; + /** unloadNum */ + @ApiModelProperty(name = "卸车数量",notes = "") + private Integer unloadNum ; + + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java index c07d2669a..d521f7abf 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java @@ -3,6 +3,8 @@ package com.logpm.trunkline.vo; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; @Data public class LoadZeroListVO implements Serializable { @@ -12,4 +14,7 @@ public class LoadZeroListVO implements Serializable { private Integer planNum;//计划装车件数 private Integer loadingNum;//已装车件数 private Integer unloadingNum;//已卸车件数 + + private List zeroPackageList = new ArrayList<>(); + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroPackageVO.java new file mode 100644 index 000000000..51e9df223 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroPackageVO.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ZeroPackageVO implements Serializable { + + private Long packageId; + private Long goodsId; + private String goodsName;//品类名称 + private Integer stockNum;//品类在库件数 + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 816f5d8bc..abb6d2ecf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -18,6 +18,7 @@ package com.logpm.distribution.feign; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -502,4 +503,17 @@ public class DistributionParcelListClient implements IDistributionParcelListClie public void clearPallet(List orderPackageIdList) { distributionParcelListService.clearPalletByIds(orderPackageIdList); } + + @Override + public List findPackageGoodsListByWaybillNo(String waybillNo) { + return distributionParcelListService.findPackageGoodsListByWaybillNo(waybillNo); + } + + @Override + public List findListByStockArticleId(Long articleId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stock_article_id",articleId); + + return distributionParcelListService.list(queryWrapper); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index a0bff054b..98d024307 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionParcelListDTO; @@ -296,4 +297,6 @@ public interface DistributionParcelListMapper extends BaseMapper parcelListIdList, @Param("orderCode") String orderCode); void clearAllocationByIds(@Param("clearTrayList") List clearTrayList); + + List findPackageGoodsListByWaybillNo(@Param("waybillNo") String waybillNo); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 78c93bb8e..dabe84761 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1874,4 +1874,15 @@ + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index 3f363a7e2..a9d902ce7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; @@ -255,4 +256,6 @@ public interface IDistributionParcelListService extends BaseService clearTrayList); + List findPackageGoodsListByWaybillNo(String waybillNo); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index dd02ac449..a45ee4d5a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -32,23 +32,12 @@ import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; -import com.logpm.distribution.entity.DistributionParcelDetailsEntity; -import com.logpm.distribution.entity.DistributionParcelListEntity; -import com.logpm.distribution.entity.DistributionParcelNumberEntity; -import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity; -import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistributionStockListEntity; -import com.logpm.distribution.entity.DistributionStockListInfoEntity; -import com.logpm.distribution.entity.DistrilbutionBillPackageEntity; +import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.logpm.distribution.mapper.DistributionParcelListMapper; import com.logpm.distribution.mapper.DistributionStockArticleMapper; import com.logpm.distribution.service.*; -import com.logpm.distribution.vo.DistributionParcelListBaseVO; -import com.logpm.distribution.vo.DistributionParcelListNodeVO; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionParcelListZeroVO; -import com.logpm.distribution.vo.PackageStockupVO; +import com.logpm.distribution.vo.*; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; import com.logpm.warehouse.entity.WarehouseWaybillEntity; @@ -1360,6 +1349,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl findPackageGoodsListByWaybillNo(String waybillNo) { + return baseMapper.findPackageGoodsListByWaybillNo(waybillNo); + } + private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse, BladeUser user, String orderPackageCode, String content, Integer node) { JSONObject trunklinePackageTrackLog = new JSONObject(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java index 6dc0915ea..b85435e87 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java @@ -6,6 +6,7 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.LoadingPackageDTO; import com.logpm.trunkline.dto.LoadingZeroDTO; +import com.logpm.trunkline.dto.ZeroPackageDTO; import com.logpm.trunkline.service.ITrunklineCarsLoadService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -420,8 +421,7 @@ public class CarsLoadApiController { String trayCode = loadCarsDTO.getTrayCode(); Integer enterNum = loadCarsDTO.getEnterNum(); String orderCode = loadCarsDTO.getOrderCode(); - -// List productInfoList = loadCarsDTO.getProductInfoList(); + List zeroPackageList = loadCarsDTO.getZeroPackageList(); try{ //当前登录人选择的仓库 @@ -457,7 +457,7 @@ public class CarsLoadApiController { // return R.fail(405,"零担品类信息为空"); // } - return carsLoadService.loadingZero(loadId,myCurrentWarehouse.getId(),waybillNo,orderCode,trayCode,enterNum,"正常装车"); + return carsLoadService.loadingZero(loadId,myCurrentWarehouse.getId(),waybillNo,orderCode,trayCode,enterNum,"正常装车",zeroPackageList); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineScanZeroDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineScanZeroDetailMapper.java new file mode 100644 index 000000000..b9881f419 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineScanZeroDetailMapper.java @@ -0,0 +1,12 @@ +package com.logpm.trunkline.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; +import org.mapstruct.Mapper; + +@Mapper +public interface TrunklineScanZeroDetailMapper extends BaseMapper { + + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 0c29aa26a..6d5697895 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.BatchUnloadDTO; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; +import com.logpm.trunkline.dto.ZeroPackageDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TripartiteTransferVO; @@ -76,7 +77,7 @@ public interface ITrunklineCarsLoadService extends BaseService zeroPackageList); R findZeroAllocation(String orderCode, Long warehouseId); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineScanZeroDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineScanZeroDetailService.java new file mode 100644 index 000000000..320846b09 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineScanZeroDetailService.java @@ -0,0 +1,7 @@ +package com.logpm.trunkline.service; + +import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITrunklineScanZeroDetailService extends BaseService { +} 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 72a2039c5..5dd3b6cc9 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 @@ -4678,10 +4678,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List parcelNumberList = new ArrayList<>(); for (WarehouseWayBillDetail warehouseWayBillDetail : wayBillDetailList) { DistributionParcelListEntity entity = new DistributionParcelListEntity(); + entity.setBrandId(warehouseWaybill.getBrandId()); + entity.setBrandName(warehouseWaybill.getBrand()); + entity.setDealerName(warehouseWaybill.getConsignee()); entity.setFirsts(warehouseWayBillDetail.getProductName()); entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); entity.setQuantity(warehouseWayBillDetail.getNum()); + entity.setTrainNumber(warehouseWaybill.getCustomerTrain()); entity.setConditions(1); entity.setStockArticleId(orderId); entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); @@ -4694,6 +4698,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { entity.setWaybillId(warehouseWaybill.getId()); entity.setWaybillNumber(warehouseWaybill.getWaybillNo()); entity.setIsZero("1"); + entity.setAdvanceId(warehouseWayBillDetail.getId()); entity.setWarehouseEntryTimeEnd(date); entity.setSendWarehouseId(departureWarehouseId); entity.setSendWarehouseName(departureWarehouseName); 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 a33e10310..63c44abd7 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 @@ -122,6 +122,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { @@ -3015,8 +3016,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroPackageList) { TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); if (Objects.isNull(carsLoadEntity)) { @@ -3071,6 +3073,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListClient.findListByStockArticleId(articleId); + //把parcelListEntities转化为id作为key的Map + Map parcelListMapById = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity())); + + + //把parcelListEntities转化成以firsts作为key的map + Map parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getFirsts, Function.identity())); + if(CollUtil.isNotEmpty(zeroPackageList)){ + for (ZeroPackageDTO zeroPackageDTO : zeroPackageList) { + Integer en = zeroPackageDTO.getEnterNum(); + String gn = zeroPackageDTO.getGoodsName(); + DistributionParcelListEntity parcelList = parcelListMap.get(gn); + if(Objects.isNull(parcelList)){ + log.warn("##################loadingZero: 品类信息不存在 gn={}", gn); + return R.fail(405, "品类信息有误"); + } + } + + } + Long loadScanId = null; Integer isAbnormal = 0; Integer isData = 1; @@ -3152,6 +3176,51 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroDetailList = new ArrayList<>(); + List updateParceList = new ArrayList<>(); + if(CollUtil.isNotEmpty(zeroPackageList)){ + Long finalLoadScanId = loadScanId; + zeroPackageList.forEach(zeroPackageDTO -> { + TrunklineScanZeroDetailEntity scanZeroDetailEntity = new TrunklineScanZeroDetailEntity(); + scanZeroDetailEntity.setGoodsId(zeroPackageDTO.getGoodsId()); + scanZeroDetailEntity.setScanId(finalLoadScanId); + scanZeroDetailEntity.setGoodsName(zeroPackageDTO.getGoodsName()); + scanZeroDetailEntity.setPackageId(zeroPackageDTO.getPackageId()); + scanZeroDetailEntity.setLoadingNum(zeroPackageDTO.getEnterNum()); + scanZeroDetailEntity.setUnloadNum(0); + zeroDetailList.add(scanZeroDetailEntity); + DistributionParcelListEntity parcelList = parcelListMap.get(zeroPackageDTO.getGoodsName()); + Integer quantity = parcelList.getQuantity(); + DistributionParcelListEntity updateEntity = new DistributionParcelListEntity(); + updateEntity.setId(parcelList.getId()); + updateEntity.setQuantity(quantity-zeroPackageDTO.getEnterNum()); + updateParceList.add(updateEntity); + }); + }else{ + if(enterNum == handQuantity){ + Long finalLoadScanId = loadScanId; + parcelListEntities.forEach(entity -> { + Long waybillDetailId = entity.getAdvanceId(); + WarehouseWayBillDetail entityByWaybillDetailId = warehouseWaybillDetailClient.findEntityByWaybillDetailId(waybillDetailId); + TrunklineScanZeroDetailEntity scanZeroDetailEntity = new TrunklineScanZeroDetailEntity(); + scanZeroDetailEntity.setGoodsId(entityByWaybillDetailId.getProductId()); + scanZeroDetailEntity.setScanId(finalLoadScanId); + scanZeroDetailEntity.setGoodsName(entityByWaybillDetailId.getProductName()); + scanZeroDetailEntity.setPackageId(entity.getId()); + scanZeroDetailEntity.setLoadingNum(entityByWaybillDetailId.getNum()); + scanZeroDetailEntity.setUnloadNum(0); + zeroDetailList.add(scanZeroDetailEntity); + Integer quantity = entity.getQuantity(); + DistributionParcelListEntity updateEntity = new DistributionParcelListEntity(); + updateEntity.setId(entity.getId()); + updateEntity.setQuantity(quantity-entityByWaybillDetailId.getNum()); + updateParceList.add(updateEntity); + }); + } + } + scanZeroDetailService.saveBatch(zeroDetailList); + distributionParcelListClient.updateList(updateParceList); + difficult = enterNum; distributionStockArticleClient.submitHandleNumByOrderId(enterNum, articleId); } else { @@ -3178,6 +3247,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroDetailList = new ArrayList<>(); + List updateParceList = new ArrayList<>(); + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("scanId",loadScanId); + List scanZeroDetailEntities = scanZeroDetailService.list(queryWrapper1); + //把scanZeroDetailEntities中所有元素的scanId作为key转为Map + Map map = scanZeroDetailEntities.stream().collect(Collectors.toMap(TrunklineScanZeroDetailEntity::getPackageId, Function.identity())); + + for (ZeroPackageDTO zeroPackageDTO : zeroPackageList) { + Long packageId = zeroPackageDTO.getPackageId(); + Integer enterNum1 = zeroPackageDTO.getEnterNum(); + TrunklineScanZeroDetailEntity scanZeroDetailEntity = map.get(packageId); + if(Objects.isNull(scanZeroDetailEntity)){ + log.warn("##################loadingZero: 品类信息不存在 packageId={}", packageId); + return R.fail(405, "品类信息有误"); + } + DistributionParcelListEntity parcelList = parcelListMapById.get(packageId); + if(Objects.isNull(parcelList)){ + log.warn("##################loadingZero: 包件信息不存在 packageId={}", packageId); + return R.fail(405, "包件信息不存在"); + } + Integer quantity = parcelList.getQuantity(); + + Integer loadingNum = scanZeroDetailEntity.getLoadingNum(); + int i2 = enterNum1 - loadingNum; + parcelList.setQuantity(quantity-i2); + updateParceList.add(parcelList); + scanZeroDetailEntity.setLoadingNum(enterNum1); + zeroDetailList.add(scanZeroDetailEntity); + } + + distributionParcelListClient.updateList(updateParceList); + scanZeroDetailService.updateBatchById(zeroDetailList); } audio = (enterNum)+"件"; @@ -5929,7 +6033,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroList = trunklineCarsOrderService.findZeroList(loadId, warehouseId); + zeroList.forEach(loadZeroListVO -> { + String waybillNo = loadZeroListVO.getWaybillNo(); + List zeroPackageList = distributionParcelListClient.findPackageGoodsListByWaybillNo(waybillNo); + List ls = new ArrayList<>(); + zeroPackageList.forEach(jsonObject -> { + ls.add(jsonObject.toJavaObject(ZeroPackageVO.class)); + }); + loadZeroListVO.setZeroPackageList(ls); + }); + //查询异常列表 QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineScanZeroDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineScanZeroDetailServiceImpl.java new file mode 100644 index 000000000..575146d32 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineScanZeroDetailServiceImpl.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.service.impl; + +import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; +import com.logpm.trunkline.mapper.TrunklineScanZeroDetailMapper; +import com.logpm.trunkline.service.ITrunklineScanZeroDetailService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +@Slf4j +public class TrunklineScanZeroDetailServiceImpl extends BaseServiceImpl implements ITrunklineScanZeroDetailService { +} From e0ef0794c23095aae95e7cb75c347c6e6be90dc6 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 31 Aug 2024 16:52:37 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E6=89=98bug=202.=E6=96=B0=E5=A2=9E=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobhandle/SyncOrderInfoToPlatform.java | 24 +++++++++++++++++++ .../patch/service/ISyncOrderInfoService.java | 2 ++ .../impl/SyncOrderInfoServiceImpl.java | 5 ++++ .../impl/WarehouseTrayTypeServiceImpl.java | 2 +- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index 113479683..a54848427 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -408,6 +408,30 @@ public class SyncOrderInfoToPlatform { } + @XxlJob("clearOrderPackageStatusStock") + public ReturnT clearOrderPackageDownAndDelTray(String param) { + log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托 开始"); + + List ls = warehouseMappingDataService.findAllOrderPackage(); + + for (JSONObject l : ls) { + String orderPackageCode = l.getStr("orderPackageCode"); + Long warehouseId = l.getLong("warehouseId"); + + syncOrderInfoService.clearOrderPackageDownAndDelTray(orderPackageCode,warehouseId); + + warehouseMappingDataService.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,1); + } + + + + log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托 完成"); + + return ReturnT.SUCCESS; + } + + + @XxlJob("syncZeroOrderInfo") public ReturnT syncZeroOrderInfo(String param) { diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java index ecf7bfa6e..ab8fdc6b6 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java @@ -28,4 +28,6 @@ public interface ISyncOrderInfoService { void clearOrderPackageStatusOut(String orderPackageCode, Long warehouseId); void dealWithPackageUpdown(String orderPackageCode, Long allocationId,Long warehouseId); + + void clearOrderPackageDownAndDelTray(String orderPackageCode, Long warehouseId); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 2df380f45..39f291204 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -365,6 +365,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { } + @Override + public void clearOrderPackageDownAndDelTray(String orderPackageCode, Long warehouseId) { + warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId,"系统下架解托"); + } + @Transactional(rollbackFor = Exception.class) @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 62001e59d..c91d62f67 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2765,7 +2765,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayTypeIds = trayTypeIdToTrayGoodsListMap.keySet(); - if(!trayTypeIds.isEmpty()){ + if(trayTypeIds.isEmpty()){ return ; } List warehouseTrayTypeEntities = baseMapper.selectBatchIds(trayTypeIds); From b110060372ecbf714308693960656a4abe42ffc9 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 2 Sep 2024 09:25:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index a54848427..d142941a9 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -408,7 +408,7 @@ public class SyncOrderInfoToPlatform { } - @XxlJob("clearOrderPackageStatusStock") + @XxlJob("clearOrderPackageDownAndDelTray") public ReturnT clearOrderPackageDownAndDelTray(String param) { log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托 开始"); From baf741fd2dc120a4aa2ce718785d8b6e0d6252e3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 2 Sep 2024 10:11:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistrilbutionBillLadingServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 7e579fa62..f41c58335 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3353,7 +3353,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl