From e8086ac4595ccf437ff285b067fd18d613dc4098 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 02 九月 2022 16:56:11 +0800
Subject: [PATCH] 更新对比
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 364d0ee..30b2722 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -343,17 +343,19 @@
List<ProductBomHistory> baseBomHistoryList = getLatestBomListByProductId(preProductId);
List<ProductBomHistory> bomHistoryList = getLatestBomListByProductId(productId);
- //List<ProductBomHistory> diffList = new LinkedList<>();
+ List<ProductBomHistory> diffList = new LinkedList<>();
List<ProductBomHistory> addList = new LinkedList<>();
List<ProductBomHistory> deleteList = new LinkedList<>();
- //閫氳繃鐗╂枡缂栫爜瀹氫綅,瀵规瘮瀛楁:鐗╂枡鍨嬪彿/鏁伴噺/鏉愯川/鏂欏帤/琛ㄩ潰澶勭悊/鐢熶骇鍟�/澶囨敞,鏃犳硶瀹炵幇,鐗╂枡娌℃湁鍘嗗彶璁板綍
+ //鐗╂枡id,瀵规瘮瀛楁:鏁伴噺
baseBomHistoryList.forEach(baseBom->{
bomHistoryList.forEach(bom->{
- if(bom.getSubCode().equals(baseBom.getSubCode())){
- ProductBomHistory history = new ProductBomHistory();
- if(!bom.getSubModel().equals(baseBom.getSubModel())){
- String diffSubModel = "鍘熺墿鏂欏瀷鍙�:"+baseBom.getSubModel()+"/鏂扮墿鏂欏瀷鍙�:"+bom.getSubModel();
- history.setSubModel(diffSubModel);
+ if(bom.getMaterialId().equals(baseBom.getMaterialId())){
+ if(!bom.getQuantity().equals(baseBom.getQuantity())){
+ ProductBomHistory history = new ProductBomHistory();
+ String diffSubModel = "鍘熸暟閲�:"+baseBom.getQuantity()+"/鏂版暟閲�:"+bom.getQuantity();
+ history.setNotes(diffSubModel);
+ history.setMaterialObj(bom.getMaterialObj());
+ diffList.add(history);
}
}
});
@@ -371,7 +373,7 @@
deleteList.add(baseBom);
}
});
- return new Response().setII(1,addList,deleteList,"瀵规瘮瀹屾垚");
+ return new Response().setIII(1,diffList,addList,deleteList,"瀵规瘮瀹屾垚");
}
/**鍏宠仈鏌ヨ鍒板叿浣撶殑bom鍐呯墿鏂欎俊鎭�*/
--
Gitblit v1.9.1