From f409ed34afc925a06a097976c711fb1b14d3e92c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 27 Mar 2024 14:39:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E3=80=81=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=87=AA?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionDeliveryListMapper.xml | 7 +- ...istributionReservationStocklistMapper.java | 9 ++ ...DistributionReservationStocklistMapper.xml | 3 + .../DistributionReservationServiceImpl.java | 123 +++++++++++------- 4 files changed, 91 insertions(+), 51 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 9bd8b0a27..f9fbb9d12 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -206,10 +206,12 @@ lddl.id = lds.delivery_id ) signingNumber, GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName, - GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName + GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName, + (SELECT group_concat( DISTINCT ldsa.order_code SEPARATOR ',' ) FROM logpm_distribution_delivery_list lddll LEFT JOIN logpm_distribution_signfor lds ON lddll.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON lds.reservation_id = ldrs.reservation_id AND ldrs.stock_article_status != 2 LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id WHERE lddll.id = lddl.id GROUP BY lddl.id ) AS orderCode FROM logpm_distribution_delivery_list lddl left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id + LEFT JOIN (SELECT lddl.id,ldsa.order_code FROM logpm_distribution_delivery_list lddl LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON lds.reservation_id = ldrs.reservation_id AND ldrs.stock_article_status != 2 LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id ) AS y ON y.id = lddl.id lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0 AND (lddl.customers_number > 0 AND ldr.reservation_num + ldr.reservation_stock_list_num) >0 @@ -239,6 +241,9 @@ and lddl.loading_team_name like concat('%',#{param.loadingTeamName},'%') + + and y.order_code like concat('%',#{param.orderCode},'%') + and lddl.kind = #{param.kind} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java index 87e7de041..2fd00333b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java @@ -81,4 +81,13 @@ public interface DistributionReservationStocklistMapper extends BaseMapper selectInventory(@Param("reservationId") Long id); + + /** + * 扣减计划库存品数量 + * @param reservationId + * @param stockListId + * @param num + * @return + */ + int deductionStockListReservationNum(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId,@Param("num") Integer num); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml index 6968fb003..c80d5e64a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml @@ -22,6 +22,9 @@ + + UPDATE logpm_distribution_reservation_stocklist SET reservation_num = (reservation_num -#{num}) WHERE reservation_id = #{reservationId} AND stocklist_id = #{stockListId} + DELETE FROM logpm_distribution_reservation_stocklist WHERE reservation_id=#{id} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index d7ef9bf96..92193c5a4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -1612,7 +1612,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageList = s.getPackageListInfo(); @@ -3140,19 +3138,19 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl list = Func.toLongList(distributionCancelReservationPackageDTO.getPackageIds()); switch (distributionCancelReservationPackageDTO.getType()){ case 1: //取消包件 - if (Func.isEmpty(distributionCancelReservationPackageDTO.getPackageIds())){ - log.error(method+"packageId参数缺失"); - return R.fail("请联系管理员...."); - } String[] split = distributionCancelReservationPackageDTO.getPackageIds().split(","); List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionCancelReservationPackageDTO.getReservationId()); String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(",")); @@ -3660,16 +3664,35 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl inventoryPackageList = disStockListDetailService.list(Wrappers.query().lambda() + .eq(DisStockListDetailEntity::getReservationId, distributionCancelReservationPackageDTO.getReservationId()) + .in(DisStockListDetailEntity::getId, list) + .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) + ); + //取消库存品包件 + for (DisStockListDetailEntity disStockListDetailEntity : inventoryPackageList) { + disStockListDetailEntity.setStockPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); + disStockListDetailService.updateById(disStockListDetailEntity); + //扣减库存品计划取消数量 + log.info("##############扣减库存品计划数量:{}",disStockListDetailEntity); + int a = distributionReservationStocklistMapper.deductionStockListReservationNum(disStockListDetailEntity.getReservationId(),disStockListDetailEntity.getStockListId(),disStockListDetailEntity.getNum()); + } + //维护对应库存品信息 + distributionReservationStocklistService.maintenanceReservationStockList(distributionCancelReservationPackageDTO.getReservationId()); + break; + } + //维护预约单状态 + this.maintenanceReservationInfo(distributionCancelReservationPackageDTO.getReservationId()); + //维护预约单数量 + this.maintenanceReservationNum(distributionCancelReservationPackageDTO.getReservationId()); + //维护配送任务状态 + distributionDeliveryListService.maintenanceDeliveryInfo(distributionCancelReservationPackageDTO.getDeliveryId()); + //维护配送任务数量 + distributionDeliveryListService.maintenanceDeliveryNum(distributionCancelReservationPackageDTO.getDeliveryId()); return R.status(true); } From 9417019a1e6dbd1bd661a86a16d7cf5b4ceb9bff Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Wed, 27 Mar 2024 16:40:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix(all):=20=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化配送明细报表查询慢的问题 --- .../report/mapper/ReportDeliverMapeer.java | 9 +++++ .../report/mapper/ReportDeliverMapper.xml | 36 ++++++++++++------- .../impl/ReportDeliverServiceImpl.java | 25 ++++++++++++- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index db23a5f52..25c228aac 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -1,6 +1,7 @@ package com.logpm.report.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.vo.ReportCustomerVO; @@ -55,4 +56,12 @@ public interface ReportDeliverMapeer extends BaseMapper { */ List getStockOrderPage(IPage page, @Param("ew") Wrapper queryWrapper); + /** + * 查询零担明细 + * @param page + * @param queryWrapper + * @return + */ + List getDetailsZeroPage(IPage page,@Param("ew") QueryWrapper queryWrapper); + Long getDetailsZeroPageCount(@Param("ew") QueryWrapper queryWrapper); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 097fbff78..54c3582ee 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -359,16 +359,17 @@ ldla.auditing_time auditing_time FROM logpm_distribution_reservation_package drp LEFT JOIN logpm_distribution_parcel_list dpl - ON dpl.order_package_code = drp.packet_bar_code AND dpl.is_deleted = 0 + ON dpl.id = drp.parce_list_id left join logpm_distribution_reservation obj on drp.reservation_id = obj.id - LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = drp.reservation_id + LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = obj.id LEFT JOIN logpm_distribution_delivery_list lddl ON lds.delivery_id = lddl.id - LEFT JOIN logpm_warehouse_waybill wi ON wi.id = obj.waybill_id + LEFT JOIN logpm_warehouse_waybill wi ON wi.id = dpl.waybill_id LEFT JOIN logpm_distribution_loadscan ldl - ON ldl.order_package_code = dpl.order_package_code + ON ldl.package_id = dpl.id AND ldl.type = 2 LEFT JOIN logpm_distribution_loadscan_abnormal ldla - ON ldla.package_code = dpl.order_package_code + ON ldla.package_id = dpl.id + where drp.packet_bar_status != 2 ) t ${ew.customSqlSegment} @@ -381,10 +382,9 @@ SELECT obj.id FROM logpm_distribution_reservation obj WHERE obj.id = t.id) - - - union all - + order by t.id desc + + select id, train_number, @@ -514,14 +514,15 @@ LEFT JOIN logpm_distribution_parcel_list dpl ON dpl.id = drp.parcel_list_id left join logpm_distribution_reservation obj on drp.reservation_id = obj.id - LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = drp.reservation_id + LEFT JOIN logpm_distribution_signfor lds ON lds.reservation_id = obj.id LEFT JOIN logpm_distribution_delivery_list lddl ON lds.delivery_id = lddl.id - LEFT JOIN logpm_warehouse_waybill wi ON wi.id = obj.waybill_id + LEFT JOIN logpm_warehouse_waybill wi ON wi.id = dpl.waybill_id LEFT JOIN logpm_distribution_loadscan ldl - ON ldl.order_package_code = dpl.order_package_code + ON ldl.package_id = dpl.id AND ldl.type = 2 LEFT JOIN logpm_distribution_loadscan_abnormal ldla - ON ldla.package_code = dpl.order_package_code + ON ldla.package_id = dpl.id + where drp.zero_package_status != 2 ) t ${ew.customSqlSegment} @@ -534,6 +535,10 @@ SELECT obj.id FROM logpm_distribution_reservation obj WHERE obj.id = t.id) + order by t.id desc + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index c37999c00..f97714c54 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.report.service.impl; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.mapper.ReportDeliverMapeer; @@ -23,6 +24,7 @@ import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * @author zhaoqiaobo @@ -109,10 +111,31 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public IPage detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) { + Integer current = query.getCurrent(); + Integer size = query.getSize(); IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); detailsCustomQuery(query, queryWrapper); - return page.setRecords(reportDeliverMapeer.getDetailsPage(page, queryWrapper)); + List detailsPage = reportDeliverMapeer.getDetailsPage(page, queryWrapper); + // 包件总数 + long total = page.getTotal(); + // 零件总数 + Long detailsZeroPageCount = reportDeliverMapeer.getDetailsZeroPageCount(queryWrapper); + long allTotal = total + detailsZeroPageCount; + // 包件没数据查零担 + if (detailsPage.size() < size) { + int zeroSize = size - detailsPage.size(); + double div = NumberUtil.div(allTotal, size.doubleValue()); + long zeroCurrent = current - (int) Math.ceil(div) + 1; + page.setCurrent(zeroCurrent); + page.setSize(zeroSize); + List zeroPage = reportDeliverMapeer.getDetailsZeroPage(page, queryWrapper); + page.setCurrent(current); + page.setSize(size); + detailsPage.addAll(zeroPage); + } + page.setTotal(allTotal); + return page.setRecords(detailsPage); } private void detailsCustomQuery(DevilerDetailsQuery query, QueryWrapper queryWrapper) { From d716f53ee99d1179547b46737ca46e01b8c15111 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 27 Mar 2024 17:20:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E9=85=8D=E9=80=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListMapper.java | 8 ++++ .../mapper/DistributionDeliveryListMapper.xml | 5 +++ .../mapper/DistributionStockupMapper.xml | 2 +- .../DistributionDeliveryListServiceImpl.java | 37 +++++++++++-------- .../DistributionReservationServiceImpl.java | 6 +++ 5 files changed, 41 insertions(+), 17 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 4dacf217c..209a3ed9b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -486,4 +486,12 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectDeliveryDriverInfo(@Param("deliveryId")Long deliveryId); Integer selectOrderNumByDeliveryId(@Param("deliveryId")Long deliveryId); + + /** + * 查询配送对应的签收信息 + * @param deliveryId + * @return + */ + List selectSignforByDeliveryId(@Param("deliveryId")Long deliveryId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index f9fbb9d12..8de57a821 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2028,5 +2028,10 @@ AND reservation_num > 0 AND stock_article_status IN ('1','3') + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index a8df6f014..7bd25f6d3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -530,7 +530,7 @@ + select ldsa.order_code orderCode, + ldsa.consignee_unit consigneeUnit, + ldsa.consignee_person consigneePerson, + ldsa.consignee_mobile consigneeMobile, + ldsa.waybill_number waybillNo, + ldsa.total_number totalNumber, + ldsa.description_goods descriptionGoods, + ldsa.customer_name customerName, + ldsa.customer_telephone customerTelephone, + ldsa.customer_address customerAddress, + IFNULL(ldsa.remark,'') remark + from logpm_distribution_stock_article ldsa + where ldsa.id = #{orderId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index cf5a5c5e9..e0e8969d3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -240,4 +240,5 @@ public interface IDistributionStockArticleService extends BaseService params) throws Exception; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 05c9670b7..a2dd65cbe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -19,7 +19,6 @@ package com.logpm.distribution.service.impl; 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; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -88,7 +87,6 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -1828,6 +1826,65 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl params) throws Exception { + OrderCodeDataVO orderCodeDataVO = new OrderCodeDataVO(); + List> data = new ArrayList<>(); + BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_14.getValue()); + if (ObjectUtil.isEmpty(template)) { + throw new ServiceException("模板内容未找到"); + } + + String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl()); + orderCodeDataVO.setTemplateHtml(html); + orderCodeDataVO.setTemplateId(template.getId()); + String ids = (String) params.get("ids"); + + String[] idArray = ids.split(","); + if (ObjectUtils.isNull(idArray)) { + throw new ServiceException("参数错误"); + + } + for (String orderId : idArray) { + JSONObject jsonObject = baseMapper.findShowOrderCodeData(Long.parseLong(orderId)); + String orderCode = jsonObject.getString("orderCode"); + String waybillNo = jsonObject.getString("waybillNo"); + String descriptionGoods = jsonObject.getString("descriptionGoods"); + Integer totalNumber = jsonObject.getInteger("totalNumber"); + + Map map = jsonObject.getInnerMap(); + map.put("id", orderId); + String filename = QRCodeUtil.createCodeToFile(orderCode); + map.put("orderCodeImage", QRCodeUtil.getEmpAutograph(filename)); + // 订单号 生成二维码 + String fileTypeName = QRCodeUtil.createCodeToFile(orderCode); + map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName)); + if(orderCode.equals(waybillNo)){ + map.put("product",descriptionGoods+"（"+totalNumber+"）"); + }else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stock_article_id",Long.parseLong(orderId)); + List list = distributionParcelListService.list(queryWrapper); + StringBuilder product = new StringBuilder(); + for (DistributionParcelListEntity parcelListEntity : list) { + String firsts = parcelListEntity.getFirsts(); + Integer quantity = parcelListEntity.getQuantity(); + if(StringUtils.isBlank(product)){ + product.append(firsts).append("（").append(quantity).append("）"); + }else{ + product.append(",").append(firsts).append("（").append(quantity).append("）"); + } + } + map.put("product",product.toString()); + } + + data.add(map); + } + orderCodeDataVO.setDataList(data); + + return orderCodeDataVO; + } + @Override public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index ecf69e780..052369ba1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -430,6 +430,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl products = splitOrderDTO.getProducts(); StringBuffer stringBuffer = new StringBuffer(); Integer allNum = 0; From 97d0903f92a2fd080e1bff7b7a93a113c1d795b9 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 27 Mar 2024 21:14:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1.=E5=BC=80=E5=90=AF=20=20=E6=B3=B8?= =?UTF-8?q?=E5=B7=9E=20=E5=8D=81=E5=A0=B0=20=E8=AE=A2=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/OldSystemDataPushConfig.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 88c503866..6e469ec6f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -34,6 +34,12 @@ public class OldSystemDataPushConfig { warehourseIds.add("123"); // 武汉 warehourseIds.add("48"); + // 泸州 + warehourseIds.add("43"); + // 十堰 + warehourseIds.add("64"); + + }