From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
index 1a28779..0cba905 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java
@@ -11,6 +11,10 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.base.entity.Constructor;
+import org.jeecg.modules.base.entity.Unit;
+import org.jeecg.modules.base.service.IConstructorService;
+import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
@@ -48,6 +52,10 @@
@Autowired
private ISparesPartInventoryService sparesPartInventoryService;
+ @Autowired
+ private IConstructorService constructorService;
+ @Autowired
+ private IUnitService unitService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -225,16 +233,40 @@
long start = System.currentTimeMillis();
for (int i = 0; i < list.size(); i++) {
SparePart sparePart = list.get(i);
+
+ String constructorName = sparePart.getConstructorId();
+ String mainUnitName = sparePart.getMainUnitId();
+ String validityPeriodUnitName = sparePart.getValidityPeriodUnitId();
+ Constructor constructor = constructorService.getByName(constructorName);
+ Unit unit = unitService.getUnitByName(mainUnitName);
+ Unit validityPeriodUnit = unitService.getUnitByName(validityPeriodUnitName);
+
+
+ if (unit != null) {
+ if (!StringUtils.isNotEmpty(validityPeriodUnit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾湁鏁堟湡鍗曚綅涓嶅瓨鍦�");
+ list.get(i).setValidityPeriodUnitId(validityPeriodUnit.getId());
+ }
+ if (constructor != null) {
+ if (!StringUtils.isNotEmpty(constructor.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽埗閫犲晢涓嶅瓨鍦�");
+ list.get(i).setConstructorId(constructor.getId());
+ }
+ if (unit != null) {
+ if (!StringUtils.isNotEmpty(unit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
+ list.get(i).setMainUnitId(unit.getId());
+ }
if (!StringUtils.isNotEmpty(sparePart.getName()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠跺悕绉颁笉鑳戒负绌�");
if (!StringUtils.isNotEmpty(sparePart.getNum()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠剁紪鐮佷笉鑳戒负绌�");
if (!StringUtils.isNotEmpty(sparePart.getSpecification()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠惰鏍间笉鑳戒负绌�");
+
if (!StringUtils.isNotEmpty(sparePart.getModel()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽浠跺瀷鍙蜂笉鑳戒负绌�");
}
-
sparePartService.saveBatch(list);
log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
--
Gitblit v1.9.3