From 2288c1a8247593c6845b2787784430ba5287975e Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 12 Apr 2024 16:30:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93=E5=AD=98=E5=9C=A8=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WarehouseWarehousingEntryServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index f8cad7742..500e76cc8 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -481,11 +481,11 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				WarehouseWarehousingDetailEntity detail = new WarehouseWarehousingDetailEntity();
 				detail.setConditions("1");
 				detail.setSku(i.getSku());
-				detail.setProductCode(i.getProductCode());
-				detail.setProductName(i.getProductName());
-				detail.setProductCode(i.getProductCode());
-				detail.setProductUnit(i.getProductUnit());
-				detail.setPackagingNumber(i.getPackagingNumber());
+				detail.setProductCode(i.getProductCode().trim());
+				detail.setProductName(i.getProductName().trim());
+				detail.setProductCode(i.getProductCode().trim());
+				detail.setProductUnit(i.getProductUnit().trim());
+				detail.setPackagingNumber(i.getPackagingNumber().trim());
 				detail.setPackagingSpecifications(i.getPackagingSpecifications());
 				detail.setCreateInventory(i.getCreateInventory());
 				detail.setWarehousingEntryId(entryEntity.getId());
@@ -499,7 +499,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					throw new ServiceException(i.getProductName()+i.getProductCode()+i.getSku()+"品牌信息不存在！！请维护客户品牌数据！！！");
 				}
 
-				BasicMaterialEntity materialOwn = basicMaterialClient.getMaterialOwn(i.getProductCode(), i.getProductName(), i.getSku());
+				BasicMaterialEntity materialOwn = basicMaterialClient.getMaterialOwn(detail.getProductCode(), detail.getProductName(), detail.getSku());
 				if(Func.isNotEmpty(materialOwn)){
 					detail.setMaterialId(materialOwn.getId());//物料ID
 				}else{