From c3ada1ea0b1186d118e6f3d13040d6dc1d40fba5 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Fri, 17 Nov 2023 13:36:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicdataTripartiteMallEntity.java |  5 +++++
 .../DistributionStockArticleController.java   | 12 +++++++++++
 .../comfac/service/IAsyncDataService.java     |  2 ++
 .../service/impl/AsyncDataServiceImpl.java    | 21 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java
index 1419b23da..3277f5767 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java
+++ b/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;
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
index e6c150d14..a3e59d0bf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
+++ b/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);
+	}
+
 	/**
 	 * 配送在库订单 分页
 	 */
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IAsyncDataService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IAsyncDataService.java
index 8bba74198..ff89c60bf 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IAsyncDataService.java
+++ b/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);
 
 }
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
index 0fc956189..456182968 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
+++ b/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 需要更新包件的物料信息
 			}