From cb1db468bcaa90e9a0e2e4aee192088e9370ac52 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 27 五月 2024 09:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java       |    3 +++
 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java |   18 ++++++++++++++++++
 zy-asrs-openapi/src/main/webapp/views/md/createMat.md                                    |    1 +
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
index 930e3d7..21447ba 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
@@ -158,4 +158,7 @@
     //瀛樿揣鏍哥畻
     private String inventoryAccount;
 
+    //鍟嗗搧鍒嗙被
+    private String shopCategory;
+
 }
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index 26c2a7b..0316d44 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -247,6 +247,24 @@
             mat.setMatnr(matParam.getMatnr());//鐗╂枡鍙�
             mat.setHostId(hostId);//浠撳簱ID
             mat.setTagId(tag.getId());//鍒嗙被ID
+            if (!Cools.isEmpty(matParam.getShopCategory())) {
+                Tag shopTag = tagService.getOne(new LambdaQueryWrapper<Tag>()
+                        .eq(Tag::getName, matParam.getShopCategory())
+                        .eq(Tag::getHostId, hostId));
+                if (shopTag == null) {
+                    //鍟嗗搧鍒嗙被涓虹┖锛屽垱寤哄晢鍝佸垎绫�
+                    shopTag = new Tag();
+                    shopTag.setName(matParam.getShopCategory());
+                    shopTag.setParentId(tag.getId());
+                    shopTag.setStatus(1);
+                    shopTag.setHostId(hostId);
+                    shopTag.setCreateTime(new Date());
+                    shopTag.setUpdateTime(new Date());
+                    tagService.save(shopTag);
+                }
+                mat.setTagId(shopTag.getId());//鍒嗙被ID
+            }
+
             if (!Cools.isEmpty(matParam.getMaktx())) {
                 mat.setMaktx(matParam.getMaktx());
             }
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/createMat.md b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
index 472331f..f9b6ccf 100644
--- a/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
+++ b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
@@ -48,6 +48,7 @@
 &emsp;&emsp;accountingClass				|string		|鍙��			|浼氳鍒嗙被
 &emsp;&emsp;batch				|string		|鍙��			|鎵瑰彿绠＄悊
 &emsp;&emsp;inventoryAccount				|string		|鍙��			|瀛樿揣鏍哥畻
+&emsp;&emsp;shopCategory				|string		|鍙��			|鍟嗗搧鍒嗙被
 &emsp;sign				|string		|鍙��			|绛惧悕
 
 

--
Gitblit v1.9.1