From 34cee9fbddacb53a249567dfaa67e2bb7887befb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Thu, 3 Aug 2023 09:03:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.java   | 2 +-
 .../distribution/mapper/DistributionStockArticleMapper.xml    | 4 ++--
 .../distribution/wrapper/DistributionParcelListWrapper.java   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
index 71d5163d5..f5aad8e2d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
@@ -58,7 +58,7 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 
     void submitHandQuantity(@Param("allNum") Integer allNum,@Param("articleId") Long articleId);
 
-	List<DistributionStockArticleEntity> likeOrderSelfNumbering(@Param("orderSelfNumbering") String orderSelfNumbering);
+	List<DistributionStockArticleEntity> likeOrderSelfNumbering(@Param("orderCode") String orderCode);
 
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index cbd11f5ce..6b1ba75ef 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -81,8 +81,8 @@
         )
         and
         ldsa.is_deleted = 0 and ldsa.type_service ='2'
-        <if test="distributionStockArticleVO.orderSelfNumbering!=null and distributionStockArticleVO.orderSelfNumbering !=''">
-           and ldsa.order_self_numbering == #{distributionStockArticleVO.orderSelfNumbering}
+        <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
+           and ldsa.order_code == #{distributionStockArticleVO.orderCode}
         </if>
         <!-- 条件没有写完 -->
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
index 777671889..916f6e2bf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
@@ -25,7 +25,6 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 	public DistributionParcelListVO entityVO(DistributionParcelListEntity entity) {
 
 		DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
-
 		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
 		parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
 		return parcelListVO;