From f6261adaab448e52a83e3615242dab1ad33023ec Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 20 三月 2026 10:55:47 +0800
Subject: [PATCH] #需求第六条

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 40251b3..da394a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -465,6 +465,7 @@
                 tagId = tagService.getTop().getId();
             }
             mat.setTagId(tagId);
+            mat.setLocType(tagId);
             mat.setMatnr(analyse.getMatnr());
             mat.setMaktx(param.getMaterialName());
             mat.setSpecs(param.getConfigureDesc());
@@ -530,8 +531,14 @@
                             throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                         }
                     }
-                    // 浜岀骇鍒嗙被
-                    Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+                    //2026.3.20淇敼闇�姹俋_锛孴_鐨勯兘鏄垚鍝� 鍏朵粬鐨勫叏鏄厤浠�
+                    String groupName = null;
+                    if (matParam.getMatnr().startsWith("T_") || matParam.getMatnr().startsWith("X_")) {
+                        groupName = "鎴愬搧";
+                    }else {
+                        groupName = "閰嶄欢";
+                    }
+                    Tag secTag = tagService.selectByName(groupName, 3);
                     if (secTag == null) {
                         NodeUtils nodeUtils = new NodeUtils();
                         nodeUtils.executePath(priTag.getId());
@@ -564,13 +571,14 @@
                 } else {
                     tagId = tagService.getTop().getId();
                 }
-                mat.sync(param);
+                mat.sync(matParam);
 //            mat.setMatnr(param.getMatnr());
 //            mat.setMaktx(param.getMaktx());
 //            mat.setSpecs(param.getSpecs());
 //            mat.setModel(param.getModel());
 
                 mat.setTagId(tagId);
+                mat.setLocType(tagId);
                 mat.setStatus(1);
                 mat.setCreateTime(now);
                 mat.setUpdateTime(now);
@@ -580,7 +588,7 @@
                     log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
                 }
             } else {
-                mat.sync(param);
+                mat.sync(matParam);
                 if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                     throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
                 }

--
Gitblit v1.9.1