From 58d5c3b462259913a746d4083e783420883dbe94 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 11 May 2024 16:57:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=80=81=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.java | 2 +- .../distribution/mapper/DistributionReservationMapper.xml | 1 + .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 4 ++-- .../service/impl/DistributionReservationServiceImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index a1f3f5734..e8f25d816 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -70,7 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero); List selectStockupStockList(@Param("reservationId")Long reservationId); - List selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName); + List selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName,@Param("cargoNumber")String cargoNumber); Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId); Integer selectPlanNum(@Param("reservationId")Long reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 90c473006..3b41295ea 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1038,6 +1038,7 @@ WHERE stock_list_status IN ( '1', '3' ) AND reservation_id = #{reservationId} + AND is_deleted = 0 SELECT ldbl.id, - ldbl.warehouse_id AS warehouseId, + lww.old_id AS warehouseId, lww.name AS warehouseName, 3 AS type, 3 AS finishState, @@ -843,7 +843,7 @@ SELECT lddl.id id, - lww.name AS warehouseName, + lww.NAME AS warehouseName, lddl.train_number trainNumber, lddl.warehouse_name warehouseName, lddl.warehouse_id warehouseId, @@ -330,29 +330,33 @@ lddl.distribution_company distributionCompany, lddl.delivery_status deliveryStatus, lddl.delivery_list_loading_status deliveryListLoadingStatus, - GROUP_CONCAT(y.order_code) AS orderCode, - CASE lddl.kind - WHEN 1 THEN '自主配送' - WHEN 2 THEN '三方配送' - ELSE - '其他' + GROUP_CONCAT( y.order_code ) AS orderCode, + CASE + lddl.kind + WHEN 1 THEN + '自主配送' + WHEN 2 THEN + '三方配送' ELSE '其他' END kind, - CASE lddl.type - WHEN 1 THEN '商配' - WHEN 2 THEN '市配' + CASE + lddl.type + WHEN 1 THEN + '商配' + WHEN 2 THEN + '市配' END type, - CASE lddl.delivery_status - WHEN 1 THEN '待配送' - WHEN 2 THEN '配送中' - WHEN 3 THEN '已完成' - ELSE - '其他' + CASE + lddl.delivery_status + WHEN 1 THEN + '待配送' + WHEN 2 THEN + '配送中' + WHEN 3 THEN + '已完成' ELSE '其他' END state, ( SELECT - GROUP_CONCAT( - DISTINCT ldsu.forklift_name SEPARATOR ',' - ) + GROUP_CONCAT( DISTINCT ldsu.forklift_name SEPARATOR ',' ) FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id @@ -363,42 +367,42 @@ ) forkliftName, lddl.create_time createTime, ( - SELECT - COALESCE (COUNT(*), 0) + SELECT COALESCE + ( COUNT(*), 0 ) FROM - logpm_distribution_signfor lds INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id + logpm_distribution_signfor lds + INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id and ldr.reservation_status != '40' AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 + lds.delivery_id = lddl.id + AND ldr.reservation_status != '40' + AND ( ldr.reservation_num + ldr.reservation_stock_list_num ) > 0 ) customersNumber, lddl.price price, lddl.added_services_id addedServicesId, ( - SELECT - COALESCE (COUNT(*), 0) + SELECT COALESCE + ( COUNT(*), 0 ) FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id JOIN logpm_distribution_reservation_stockarticle ldrs ON ldrs.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id and ldrs.stock_article_status != 2 + lds.delivery_id = lddl.id + AND ldrs.stock_article_status != 2 ) orderNumber, ( - SELECT - COALESCE (sum(ldr.reservation_num), 0) + SELECT COALESCE + ( sum( ldr.reservation_num ), 0 ) FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id WHERE - lds.delivery_id = lddl.id and ldr.reservation_status != '40' + lds.delivery_id = lddl.id + AND ldr.reservation_status != '40' ) deliveryNumber, ( - SELECT - COALESCE ( - sum( - ldr.reservation_stock_list_num - ), - 0 - ) + SELECT COALESCE + ( sum( ldr.reservation_stock_list_num ), 0 ) FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id @@ -407,9 +411,7 @@ ) reservationStockListNum, ( SELECT - GROUP_CONCAT( - DISTINCT lds.loader_name SEPARATOR ',' - ) + GROUP_CONCAT( DISTINCT lds.loader_name SEPARATOR ',' ) FROM logpm_distribution_signfor ldsf JOIN logpm_distribution_reservation ldr ON ldr.id = ldsf.reservation_id @@ -420,9 +422,7 @@ ) loadingTeamName, ( SELECT - GROUP_CONCAT( - DISTINCT lds.fix_time SEPARATOR ',' - ) + GROUP_CONCAT( DISTINCT lds.fix_time SEPARATOR ',' ) FROM logpm_distribution_signfor ldsf JOIN logpm_distribution_reservation ldr ON ldr.id = ldsf.reservation_id @@ -430,8 +430,6 @@ INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id WHERE ldsf.delivery_id = lddl.id - -- ) leadTime, - -- lds.delivery_id = lddl.id ) reservationId, lddl.order_id orderId, lddl.fee fee, @@ -440,13 +438,8 @@ lddl.note_number noteNumber, lddl.source source, ( - SELECT - COALESCE ( - sum( - ldr.reservation_stock_list_num - ), - 0 - ) + SELECT COALESCE + ( sum( ldr.reservation_stock_list_num ), 0 ) FROM logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id @@ -454,29 +447,44 @@ lds.delivery_id = lddl.id ) inventoryNub, ( - SELECT - COALESCE (sum(lds.loaded_number), 0) + COALESCE (sum(lds.loadedin_number), 0) + SELECT COALESCE + ( sum( lds.loaded_number ), 0 ) + COALESCE ( sum( lds.loadedin_number ), 0 ) FROM logpm_distribution_signfor lds WHERE lddl.id = lds.delivery_id ) scannedNumber, - (SELECT - COALESCE (sum(lds.received_quantity), 0) + COALESCE (sum(lds.receivedin_quantity), 0) + ( + SELECT COALESCE + ( sum( lds.received_quantity ), 0 ) + COALESCE ( sum( lds.receivedin_quantity ), 0 ) FROM logpm_distribution_signfor lds WHERE lddl.id = lds.delivery_id ) signingNumber, - GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') consignee, - 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 + GROUP_CONCAT( DISTINCT a.consignee SEPARATOR ',' ) consignee, + GROUP_CONCAT( DISTINCT a.mallName 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 ( SELECT lddl.id, - a.consignee AS consignee, - a.mall_name AS mallName, + ldr.consignee AS consignee, + ldr.mall_name AS mallName FROM logpm_distribution_delivery_list lddl LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id @@ -487,25 +495,40 @@ 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 - AND lds.is_deleted = 0 AND lddl.is_deleted = 0 AND ldr.is_deleted = 0 + AND lds.is_deleted = 0 + AND lddl.is_deleted = 0 + AND ldr.is_deleted = 0 GROUP BY lddl.id - ) AS a On a.id = lddl.id - LEFT JOIN (SELECT lddl.id,ldsa.order_code FROM logpm_distribution_delivery_list lddl + ) AS a ON a.id = lddl.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 + 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 LEFT JOIN logpm_warehouse_warehouse AS lww ON lddl.warehouse_id = lww.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 + AND lddl.customers_number > 0 + + and lddl.id in + + #{item} + + and lddl.train_number like concat('%',#{param.trainNumber},'%') - + and lddl.warehouse_id in - + #{item} 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 3f18802ac..5203fa849 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 @@ -2456,6 +2456,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) + .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, 1) + //修改 状态 ); if (!abnormalEntities.isEmpty()) { boolean flag = abnormalEntities.stream().allMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryListId()) ); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java index b68041f29..d48ab6818 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java @@ -29,6 +29,7 @@ public class SignPushClient implements IOldSignPushClient { public Boolean pushOldSystemSignInfo(SignPushDataDTO signPushDataDTO) { //todo 这里存在调用老系统的接口 将数据会写给老系统 + int timeoutMilliseconds = 60000; Boolean result =false; log.info(">>>> pushOldSystemSignInfo 程序执行 start time: {}",System.currentTimeMillis()); @@ -39,7 +40,7 @@ public class SignPushClient implements IOldSignPushClient { String data = JSON.toJSONString(signPushDataDTO); log.info(">>>> pushOldSystemSignInfo request url:{} data:{}",url,data); - String body = HttpRequest.post(url).body(data).header("token", authCode).execute().body(); + String body = HttpRequest.post(url).body(data).header("token", authCode).setConnectionTimeout(timeoutMilliseconds).execute().body(); if (StringUtil.isNotBlank(body)) { JSONObject res = JSON.parseObject(body); if ("200".equals(res.getString("code"))) { From 5cac2f203130446ce4462280a1fde7acf10e7abe Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 12 May 2024 19:52:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistrilbutionBillLadingServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 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 a3f27f09b..08a83fefc 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 @@ -1329,15 +1329,33 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl>>>> 推送老系统签收信息报错", e); + log.error(">>>>> 推送老系统自提签收信息报错", e); return false; } } + /** + * 转换老系统的ID + * @param delivery + */ + private void modifyWarehouseId(SignPushDataDTO delivery) { + + if(!Objects.isNull(delivery.getWarehouseId())){ + // 查询老系统的ID + BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(delivery.getWarehouseId()); + if(Objects.nonNull(entityWarehouseId)){ + delivery.setWarehouseId(Long.parseLong(entityWarehouseId.getOldId()+"")); + } + } + + } + /** * 构建名称和电话号码