From 01824c5104590b96a3040faa317969bcd812bcca Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:17:04 +0800
Subject: [PATCH] Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing
---
src/main/java/com/zy/third/erp/task/ERPItemService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
index fb751fc..8a81a98 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -77,10 +77,14 @@
}
}
}
- priTag = tagService.selectByName(itemTB.getItemKind(), 2);
- mat = sync(mat, itemTB);
+ if (!Cools.isEmpty(itemTB.getItemKind())) {
+ priTag = tagService.selectByName(itemTB.getItemKind(), 2);
+ }
- mat.setTagId(priTag.getId());
+ mat = sync(mat, itemTB);
+ if (priTag!=null){
+ mat.setTagId(priTag.getId());
+ }
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
--
Gitblit v1.9.1