From f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 20:07:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 0499cd0..b2d4976 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -83,6 +84,7 @@
/**
* @return
*/
+ @Transactional
public ReturnT<String> start1() {
Page<NccBdCustomerWms> page = new Page<>(1, pageSize);
Page<NccBdCustomerWms> wmsFlag = nccBdCustomerWmsService.selectPage(page, new EntityWrapper<NccBdCustomerWms>().ne("wms_flag", 1));
@@ -96,6 +98,7 @@
/**
* @return
*/
+ @Transactional
public ReturnT<String> start2() {
Page<NccCgCgdhdWms> page = new Page<>(1, pageSize);
Page<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectPage(page, new EntityWrapper<NccCgCgdhdWms>().ne("wms_flag", 1));
@@ -105,6 +108,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start3() {
Page<NccCkPddWms> page = new Page<>(1, pageSize);
Page<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectPage(page, new EntityWrapper<NccCkPddWms>().ne("wms_flag", 1));
@@ -114,6 +118,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start4() {
Page<NccJcBmWms> page = new Page<>(1, pageSize);
Page<NccJcBmWms> wmsFlag = nccJcBmWmsService.selectPage(page, new EntityWrapper<NccJcBmWms>().ne("wms_flag", 1));
@@ -123,7 +128,7 @@
return SUCCESS;
}
-
+ @Transactional
public ReturnT<String> start5() {
Page<NccJcCkhw> page = new Page<>(1, pageSize);
Page<NccJcCkhw> wmsFlag = nccJcCkhwService.selectPage(page, new EntityWrapper<NccJcCkhw>().ne("wms_flag", 1));
@@ -133,6 +138,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start6() {
Page<NccJcCkWms> page = new Page<>(1, pageSize);
Page<NccJcCkWms> wmsFlag = nccJcCkWmsService.selectPage(page, new EntityWrapper<NccJcCkWms>().ne("wms_flag", 1));
@@ -146,17 +152,21 @@
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;
}
+ @Transactional
public ReturnT<String> start7() {
Page<NccJcQilibcBarcodeflowWms> page = new Page<>(1, pageSize);
Page<NccJcQilibcBarcodeflowWms> wmsFlag = nccJcQilibcBarcodeflowWmsService.selectPage(page, new EntityWrapper<NccJcQilibcBarcodeflowWms>().ne("wms_flag", 1));
@@ -166,15 +176,17 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start8() {
Page<NccJcRyWms> page = new Page<>(1, pageSize);
- Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzmc", "娴欐睙绂忚幈鏂版潗鏂欒偂浠芥湁闄愬叕鍙哥儫鍙板垎鍏徃"));
+ Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzbm", "FYT"));
for (NccJcRyWms nccJcRyWms : wmsFlag.getRecords()) {
User user = userService.selectOne(new EntityWrapper<User>().eq("username", nccJcRyWms.getRybm()));
if (user == null) {
user = new User();
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
+ user.setMobile(nccJcRyWms.getRybm());
user.setRoleId(12L);
user.setStatus(1);
user.setCreateTime(new Date());
@@ -182,18 +194,19 @@
} else {
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
- user.setRoleId(12L);
+ user.setMobile(nccJcRyWms.getRybm());
user.setStatus(1);
userService.updateById(user);
}
nccJcRyWms.setWmsFlag(1);
- nccJcRyWmsService.updateById(nccJcRyWms);
+ nccJcRyWmsService.update(nccJcRyWms, new EntityWrapper<NccJcRyWms>().eq("rybm", nccJcRyWms.getRybm()));
log.info("NccJcRyWms鏁版嵁:{}", JSONObject.toJSON(nccJcRyWms));
}
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start9() {
Page<NccJcWlflWms> page = new Page<>(1, pageSize);
Page<NccJcWlflWms> wmsFlag = nccJcWlflWmsService.selectPage(page, new EntityWrapper<NccJcWlflWms>().ne("wms_flag", 1));
@@ -246,6 +259,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start10() {
Page<NccOrgCorpWms> page = new Page<>(1, pageSize);
Page<NccOrgCorpWms> wmsFlag = nccOrgCorpWmsService.selectPage(page, new EntityWrapper<NccOrgCorpWms>().ne("wms_flag", 1));
@@ -256,7 +270,7 @@
return SUCCESS;
}
-
+ @Transactional
public ReturnT<String> start13() {
Page<VGetBdMaterial> page = new Page<>(1, pageSize);
Page<VGetBdMaterial> wmsFlag = vGetBdMaterialService.selectPage(page, new EntityWrapper<VGetBdMaterial>().ne("wms_flag", 1));
@@ -274,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()) {
@@ -285,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