Merge branch 'dev' into pre-production

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.save(distributionStockListEntity);
-			distributionStockListService.getBaseMapper().insert(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
 //		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息

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"]
+