From ec8120682339a7b9feb64748320781e99fa0cb77 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 13 九月 2024 16:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/third/erp/task/ERPItemService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 58d4f88..dc32a83 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);
@@ -98,8 +102,8 @@
}
private Mat sync(Mat mat, ItemTB itemTB) {
- mat.setUuid(itemTB.getItemId());
- mat.setMatnr(itemTB.getItemCode());
+ mat.setModel(itemTB.getItemCode());
+ mat.setMatnr(itemTB.getItemId());
mat.setMaktx(itemTB.getItemName());
mat.setSpecs(itemTB.getItemSpc());
mat.setUnit(itemTB.getItemUnit());
--
Gitblit v1.9.1