From 5460c97d61ecea5818b97a6c6c59334b9dd1c49f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 22 十二月 2023 15:35:28 +0800
Subject: [PATCH] 0108、0109开头的物料BOM清单上传的时候覆盖之前相同编码的物料，保留之前的附件及附件状态
---
src/main/java/com/whyc/service/ProductService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index 4ff0da8..dea5255 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -1068,14 +1068,14 @@
materialHistoryService.addBatch(materialHistoryList);
}
//濡傛灉鏂颁笂浼犵殑bom涓瓨鍦�0108銆�0109寮�澶寸殑鐗╂枡,(鑲畾浼氳璇嗗埆鎴愭柊鐗╂枡,涔嬪墠鐨勬搷浣滃凡缁忚鎻掑叆鍒拌〃涓�)
- // 鍦ㄦ暟鎹簱瀛樺湪鐩稿悓鐨勭墿鏂欑紪鐮佸瓨鍦ㄤ笖涓嶅悓鐨勭墿鏂欏瀷鍙�,鍒欏皢鏁版嵁搴撴渶鏂扮殑鐗╂枡鐨勯檮浠跺鍒朵竴浠�,濉厖鍒版柊鐨勭墿鏂欒〃涓�
+ // 鍦ㄦ暟鎹簱瀛樺湪鐩稿悓鐨勭墿鏂欑紪鐮佸瓨鍦ㄤ笖涓嶅悓鐨勭墿鏂欏瀷鍙�,鍒欏皢鏁版嵁搴撴渶鏂扮殑鐗╂枡鐨勯檮浠跺鍒朵竴浠藉苟鐘舵�佸悓姝�,濉厖鍒版柊鐨勭墿鏂欒〃涓�
for (Material material : newMaterialList) { //鏂扮墿鏂�
String subCode = material.getSubCode();
String subModel = material.getSubModel();
if(subCode.startsWith("0108") || subCode.startsWith("0109")){
Material materialWithSameCodeLatest = mService.getByCodeAndModel(subCode, subModel, false);
//闄勪欢杞Щ骞惰缃�
- mService.transferCopiedAttachment(materialWithSameCodeLatest.getFileUrl(),material);
+ mService.transferCopiedAttachment(materialWithSameCodeLatest,material);
}
}
--
Gitblit v1.9.1