1.增加三方商城品牌

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java

@@ -76,4 +76,9 @@ public class BasicdataTripartiteMallEntity extends TenantEntity {
 	@ApiModelProperty(value = "三方编码")
 	private String tripartiteCoding;
 
+	@ApiModelProperty(value = "品牌ID")
+	private Long brandId;
+	@ApiModelProperty(value = "品牌名称")
+	private Long brandName;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -122,6 +122,18 @@ public class DistributionStockArticleController extends BladeController {
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 配送在库商场订单 分页
+	 */
+	@GetMapping("/selectStockArticleInfoListByMail")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
+	public R<IPage<DistributionStockArticleVO>> selectStockArticleInfoListByMail(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
+		IPage<DistributionStockArticleVO> pages = distributionStockArticleService.selectAllDistributionOrder(Condition.getPage(query), distributionStockArticle);
+		return R.data(pages);
+	}
+
 	/**
 	 * 配送在库订单 分页
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IAsyncDataService.java

@@ -23,6 +23,8 @@ public interface IAsyncDataService {
 	void handlerZbDataToHt(Long orderId);
 
 
+
+
 	void handlerOuPaiDataToHt(String carNum);
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -514,6 +514,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				}
 			} else {
 				//todo 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
+
+
+				// 更新bap
+
+
+
+
 				log.info(">>>>>>>>>>>更新订单信息已在老系统存在");
 			}
 
@@ -562,10 +569,22 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				update = true;
 			}
 
+			// 更新车次
+			if(!advanceDetailEntity.getMctsTruck().equals(advanceEntity.getMctsTruck())){
+				advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());
+				update = true;
+			}
+			// 更新订单ID
+			if(!advanceDetailEntity.getAdvanceId().equals(advanceEntity.getId())){
+				advanceDetailEntity.setAdvanceId(advanceEntity.getId());
+				update = true;
+			}
+
+
+
 			//更新包件
 			if (update) {
 				advanceDetailClient.updateAdvanceDetail(advanceDetailEntity);
-				// todo 需要更新包件的物料信息
 			}