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/SparesPartInventoryController.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
index 0b9419d..b4a25ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java
@@ -11,6 +11,8 @@
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.*;
+import org.jeecg.modules.base.service.*;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
@@ -45,6 +47,20 @@
private ISparesPartInventoryService sparesPartInventoryService;
@Autowired
private ISparePartService sparePartService;
+ @Autowired
+ private IUnitService unitService;
+ @Autowired
+ private ISupplierService supplierService;
+
+ @Autowired
+ private IWarehouseService warehouseService;
+
+ @Autowired
+ private IWarehouseAreaService warehouseAreaService;
+
+ @Autowired
+ private IWarehouseLocationService warehouseLocationService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -188,31 +204,59 @@
params.setNeedSave(true);
try {
List<SparesPartInventory> list = ExcelImportUtil.importExcel(file.getInputStream(), SparesPartInventory.class, params);
- /* for (SparesPartInventory temp : list) {
- temp.setSparePartId(mainId);
- 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) + "琛屽浠跺瀷鍙蜂笉鑳戒负绌�");
-
- }*/
+ long start = System.currentTimeMillis();
for (int i = 0; i < list.size(); i++) {
-
+ Supplier supplierId = null;
+ Unit unitById = null;
+ Warehouse warehouseId = null;
+ WarehouseArea warehouseAreaId = null;
+ WarehouseLocation warehouseLocationId = null;
SparesPartInventory sparesPartInventory = list.get(i);
sparesPartInventory.setSparePartId(mainId);
+ String mainUnitName = sparesPartInventory.getMainUnitId();
+ String supplierName = sparesPartInventory.getSupplierId();
+ String warehouseName = sparesPartInventory.getWarehouseId();
+ String warehouseAreaName = sparesPartInventory.getWarehouseAreaId();
+ String warehouseLocationName = sparesPartInventory.getWarehouseLocationId();
+
+ if (supplierName != null) {
+ supplierId = supplierService.getByName(supplierName);
+ }
+ if (mainUnitName != null) {
+ unitById = unitService.getUnitByName(mainUnitName);
+ }
+ if (warehouseName != null) {
+ warehouseId = warehouseService.getByName(warehouseName);
+ }
+ if (warehouseAreaName != null) {
+ warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
+ }
+ if (warehouseLocationName != null) {
+ warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
+ }
+
if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾壒娆″彿涓嶈兘涓虹┖");
if (sparesPartInventory.getMainQuantity() <= 0)
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾暟閲忎笉鑳戒负灏忎簬绛変簬0");
+ if (!StringUtils.isNotEmpty(unitById.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
+ if (!StringUtils.isNotEmpty(supplierId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼緵搴斿晢涓嶅瓨鍦�");
+ if (!StringUtils.isNotEmpty(warehouseId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼粨搴撲笉瀛樺湪");
+ if (!StringUtils.isNotEmpty(warehouseAreaId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱鍖轰笉瀛樺湪");
+ /* if (!StringUtils.isNotEmpty(warehouseLocationId.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱浣嶄笉瀛樺湪");*/
+ list.get(i).setMainUnitId(unitById.getId());
+ list.get(i).setSupplierId(supplierId.getId());
+ list.get(i).setSupplierId(warehouseId.getId());
+ list.get(i).setSupplierId(warehouseAreaId.getId());
+ /* list.get(i).setSupplierId(warehouseLocationId.getId());*/
}
-
- long start = System.currentTimeMillis();
sparesPartInventoryService.saveBatch(list);
log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
--
Gitblit v1.9.3