From 25bea9b16d66e9ae716997601d01319db55e258b Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期五, 01 九月 2023 18:53:37 +0800
Subject: [PATCH] 库存: 仓库版本控制
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 b569717..a3ed76e 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,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;
@@ -47,7 +52,10 @@
@Autowired
private ISparesPartInventoryService sparesPartInventoryService;
-
+ @Autowired
+ private IConstructorService constructorService;
+ @Autowired
+ private IUnitService unitService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -222,6 +230,34 @@
try {
List<SparePart> list = ExcelImportUtil.importExcel(file.getInputStream(), SparePart.class, params);
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 (!StringUtils.isNotEmpty(validityPeriodUnit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾湁鏁堟湡鍗曚綅涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(constructor.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽埗閫犲晢涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(unit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
+ 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) + "琛屽浠跺瀷鍙蜂笉鑳戒负绌�");
+ list.get(i).setConstructorId(constructor.getId());
+ list.get(i).setMainUnitId(unit.getId());
+ list.get(i).setValidityPeriodUnitId(validityPeriodUnit.getId());
+ }
+
sparePartService.saveBatch(list);
log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
--
Gitblit v1.9.3