From a228ceed10d6e3a58dc22033ab352dbd22c08ce2 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 28 Sep 2024 17:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=BA=93=E4=BB=BB=E5=8A=A1BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 1 -
 .../service/impl/DistributionParcelListServiceImpl.java         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index d4d987b56..9bb4cd052 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -1181,7 +1181,6 @@
         lddl.task_time AS taskTime,
         lddl.loading_time AS loadingTime,
         lds.signee_name AS signeeName,
-        <!--        ldr.warehouse_id AS warehouseId,-->
         ldr.consignee AS consigne,
         ldr.delivery_phone AS driverPhone,
         ldr.delivery_address AS deliveryAddress,
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 0cd3007e2..90220db99 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
@@ -1438,7 +1438,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 		boolean update = this.updateById(parcelListEntity);
 		//维护订单
-		distributionStockArticleService.maintenanceOrderMall(parcelListEntity.getStockArticleId()+"");
+		distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getStockArticleId()+"",myCurrentWarehouse.getId());
 		String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"扫描回库,回库任务号:"+taskCode;
 		//进行日志添加
 		List<JSONObject> logList = new ArrayList<>();