From 5ef746eb014ff4e1249823f3b07c6d9840e2181b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 08:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 3 +++
1 files changed, 3 insertions(+), 0 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 2ac629b..4dfdfb1 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -152,9 +152,12 @@
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);
--
Gitblit v1.9.1