From fefbf8f934f021fa7132e319dcdf9d14da93928f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 6 Aug 2024 16:48:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E8=BD=AC=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionParcelListServiceImpl.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 3dff9c00c..1aafa7acc 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
@@ -557,7 +557,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) {
 						throw new ServiceException("订单的客户数据异常，无法转换！！");
 					}
-					addStockList(distributionStockArticleEntity, parcelListEntity, 1);
+//					addStockList(distributionStockArticleEntity, parcelListEntity, 1);
 //					//修改状态
 					DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
 					parcelList.setId(i.getId());
@@ -985,6 +985,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListInfo.setWarehouseId(distributionStockListEntity.getWarehouseId()); //仓库ID
 			distributionStockListInfo.setMarketId(distributionStockListEntity.getMarketId()); //商场
 			distributionStockListInfo.setCargoUnit(distributionStockListEntity.getCargoUnit()); //货物单位
+			distributionStockListInfo.setStorageLocation(distributionParcelListEntity.getPallet()); //货物单位
 
 			distributionStockListInfo.setMallName(distributionStockListEntity.getMallName()); //商场名称
 			distributionStockListInfo.setQuantityStock(distributionParcelListEntity.getQuantity()); //库存数量(包件数量)
@@ -1002,6 +1003,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 //		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
 			// 品牌
 			distributionStockListInfo.setBrandId(distributionStockListEntity.getBrandId());
+			distributionStockListInfo.setBrandName(distributionStockListEntity.getBrandName());
 			distributionStockListInfo.setUnpackingQuantity(0);
 			distributionStockListInfo.setSourceType("1"); //类型
 
@@ -1027,6 +1029,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListInfo.setOrderCode(distributionStockArticleEntity.getOrderCode());
 			distributionStockListInfo.setParcelListId(distributionParcelListEntity.getId());
 			distributionStockListInfo.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
+			distributionStockListInfo.setDespatch(distributionParcelListEntity.getWaybillNumber());
 			infoEntities.add(distributionStockListInfo);
 		}
 		distributionStockListInfoService.saveBatch(infoEntities);

From 95c663adefa6427e32c11070238a46f8f3bc1782 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 6 Aug 2024 16:49:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E7=9A=84=E6=A8=A1=E7=B3=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionStockListMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 02127e1f1..5a63c32cb 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -147,10 +147,10 @@
                 #{param.despatch},'%')
             </if>
             <if test=" param.incomingBatch != null and param.incomingBatch != ''">and ldsi.incoming_batch like
-                concat('%', #{param.incomingBatch},'%')
+                concat(#{param.incomingBatch},'%')
             </if>
             <if test=" param.brandName != null and param.brandName != ''">and ldsi.brand_name like
-                concat('%',#{param.brandName},'%')
+                concat(#{param.brandName},'%')
             </if>
             <if test=" param.marketName != null and param.marketName != ''">and ldsi.market_name like
                 concat('%',#{param.marketName},'%')