From 1ea41a22eadfb3eef3d434bef7d2efff3bae331c Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期日, 15 六月 2025 17:18:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/nc/task/handler/BaseDataHandler.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index e4319d6..b2d4976 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -152,13 +152,16 @@
                 storeType.setStoreId(nccJcCkWms.getCode());
                 storeType.setCreateBy(1L);
                 storeType.setCreateTime(new Date());
+                storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
+                //storeType.setDepartment();
                 storeTypeService.insert(storeType);
             } else {
                 storeType.setStoreName(nccJcCkWms.getName());
+                storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
                 storeTypeService.updateById(storeType);
             }
             nccJcCkWms.setWmsFlag(1);
-            nccJcCkWmsService.updateById(nccJcCkWms);
+            nccJcCkWmsService.update(nccJcCkWms, new EntityWrapper<NccJcCkWms>().eq("code", nccJcCkWms.getCode()));
         }
         return SUCCESS;
     }
@@ -192,7 +195,6 @@
                 user.setUsername(nccJcRyWms.getRybm());
                 user.setNickname(nccJcRyWms.getRymc());
                 user.setMobile(nccJcRyWms.getRybm());
-                user.setRoleId(12L);
                 user.setStatus(1);
                 userService.updateById(user);
             }
@@ -286,9 +288,11 @@
             matParam.setSpecs(vGetBdMaterial.get瑙勬牸());
             matParam.setModel(vGetBdMaterial.get鍨嬪彿());
             matParam.setUnit(vGetBdMaterial.get涓诲崟浣�());
+            matParam.setManu(vGetBdMaterial.get杈呭崟浣�());
             matParam.setMemo(vGetBdMaterial.get澶囨敞());
-            matParam.setGroupCode(vGetBdMaterial.get瀛樿揣鍒嗙被缂栫爜());
-            matParam.setGroupName(vGetBdMaterial.get瀛樿揣鍒嗙被鍚嶇О());
+            matParam.setSku(vGetBdMaterial.get鐗╂枡绠�绉皍8鏃у搧鍚�());
+            matParam.setOrigin(vGetBdMaterial.get涓昏緟鎹㈢畻姣�());
+            matParam.setGroupCode(priTag.getId() + "");
             matDetails.add(matParam);
         }
         if (!matDetails.isEmpty()) {
@@ -297,7 +301,9 @@
             for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
                 vGetBdMaterial.setWmsFlag(1);
             }
-            vGetBdMaterialService.updateBatchById(wmsFlag.getRecords());
+            for (VGetBdMaterial vGetBdMaterial : wmsFlag.getRecords()) {
+                vGetBdMaterialService.update(vGetBdMaterial, new EntityWrapper<VGetBdMaterial>().eq("鐗╂枡缂栫爜", vGetBdMaterial.get鐗╂枡缂栫爜()));
+            }
         }
         return SUCCESS;
     }

--
Gitblit v1.9.1