Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java

@@ -363,6 +363,19 @@ public class QualityDeliverAddListener implements ReportService {
 			qualityDeliverEntity.setStoreName(stockArticleEntity.getStoreName());
 			// 品牌
 			qualityDeliverEntity.setBrandName(stockArticleEntity.getBrand());
+			// 服务类型
+			String typeService = stockArticleEntity.getTypeService();
+			if(StrUtil.isNotEmpty(typeService)){
+				if("1".equals(typeService)){
+					qualityDeliverEntity.setCustomType("商配");
+				}else if("2".equals(typeService)){
+					qualityDeliverEntity.setCustomType("市配");
+				}else if("3".equals(typeService)){
+					qualityDeliverEntity.setCustomType("自提");
+				}else if("4".equals(typeService)){
+					qualityDeliverEntity.setCustomType("三方中转");
+				}
+			}
 		}
 	}
 

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

@@ -13383,7 +13383,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					}
 				}
 			});
-
+			distributionParcelListClient.updateList(updateParceList);
 
 
 
@@ -13406,7 +13406,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //				}
 //
 //			});
-//			distributionParcelListClient.updateList(updateParceList);
+
 
 
 			List<TrunklineAdvanceDetailEntity> updateNowWarehouseList = new ArrayList<>();