From b2e6e2aefa99a3399bc2fcac4f2985464b85313a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 14 Mar 2024 23:19:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E5=A4=8DTJJ=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionParcelListServiceImpl.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 ece08625c..ef1cf9b91 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
@@ -855,7 +855,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId.get(0));
 		distributionStockListEntity.setSku(materialOwnId.getSku());
-//		distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
+		distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
 //		distributionStockListEntity.setParcelListId(distributionParcelListEntities.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
 		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
@@ -870,8 +870,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListService.updateById(listEntity);
 		} else {
 			log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
-//			distributionStockListService.save(distributionStockListEntity);
-			distributionStockListService.getBaseMapper().insert(distributionStockListEntity);
+			distributionStockListService.save(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
 //		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息

From 2609a93d284586bf85bc4313ff66c1e2b97efa10 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 15 Mar 2024 09:41:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-service/logpm-report/Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 blade-service/logpm-report/Dockerfile

diff --git a/blade-service/logpm-report/Dockerfile b/blade-service/logpm-report/Dockerfile
new file mode 100644
index 000000000..9abdcb752
--- /dev/null
+++ b/blade-service/logpm-report/Dockerfile
@@ -0,0 +1,15 @@
+FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+
+MAINTAINER h5u@163.com
+
+RUN mkdir -p /logpm/report
+
+WORKDIR /logpm/report
+
+EXPOSE 8900
+
+ADD ./target/logpm-report.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"]
+CMD ["--spring.profiles.active=dev"]
+