Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1017,8 +1017,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		List<String> batchPackageCodeByType = basicdataCodeClient.getBatchPackageCodeByType(warehouseCode, orderCode, totalNumber);
 		batchPackageCodeByType.forEach(item -> {
-			advanceDetailModel.setOrderPackageCode(item);
+			TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
-			detailEntities.add(advanceDetailModel);
+			BeanUtil.copy(advanceDetailModel,advanceDetailEntity);
+			advanceDetailEntity.setOrderPackageCode(item);
+			detailEntities.add(advanceDetailEntity);
 		});
 
 
@@ -1972,8 +1974,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 				List<String> orderPackageCodes = basicdataCodeClient.getBatchPackageCodeByType(warehouseCode, orderCode, totalNum);
 				orderPackageCodes.forEach(orderPackageCode -> {
-					advanceDetailModel.setOrderPackageCode(orderPackageCode);
+					TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
-					advanceDetailEntities.add(advanceDetailModel);
+					BeanUtil.copy(advanceDetailModel, advanceDetailEntity);
+					advanceDetailEntity.setOrderPackageCode(orderPackageCode);
+					advanceDetailEntities.add(advanceDetailEntity);
 				});
 			}
 		}