From 87ac63c5001f2deb6a3132ab75088fd20b6a5653 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 04 九月 2023 10:28:13 +0800
Subject: [PATCH] 备件库存/ 导入 判定修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java | 83 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 34 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 b4a25ad..1229c39 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
@@ -206,54 +206,69 @@
List<SparesPartInventory> list = ExcelImportUtil.importExcel(file.getInputStream(), SparesPartInventory.class, params);
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();
+ Supplier supplier = null;
+ Unit unit = null;
+ Warehouse warehouse = null;
+ WarehouseArea warehouseArea = null;
+ WarehouseLocation warehouseLocation = null;
+ list.get(i).setSparePartId(mainId);
+
+ String mainUnitName = list.get(i).getMainUnitId();
+ String supplierName = list.get(i).getSupplierId();
+ String warehouseName = list.get(i).getWarehouseId();
+ String warehouseAreaName = list.get(i).getWarehouseAreaId();
+ String warehouseLocationName = list.get(i).getWarehouseLocationId();
if (supplierName != null) {
- supplierId = supplierService.getByName(supplierName);
+ supplier = supplierService.getByName(supplierName);
}
if (mainUnitName != null) {
- unitById = unitService.getUnitByName(mainUnitName);
+ unit = unitService.getUnitByName(mainUnitName);
}
if (warehouseName != null) {
- warehouseId = warehouseService.getByName(warehouseName);
+ warehouse = warehouseService.getByName(warehouseName);
}
if (warehouseAreaName != null) {
- warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
+ warehouseArea = warehouseAreaService.getByName(warehouseAreaName);
}
if (warehouseLocationName != null) {
- warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
+ warehouseLocation = warehouseLocationService.getByName(warehouseLocationName);
+
}
- if (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
+ if (!StringUtils.isNotEmpty(list.get(i).getBatchNum()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾壒娆″彿涓嶈兘涓虹┖");
- if (sparesPartInventory.getMainQuantity() <= 0)
+ if (list.get(i).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());*/
+
+ if (unit != null) {
+ if (!StringUtils.isNotEmpty(unit.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽崟浣嶄笉瀛樺湪");
+ list.get(i).setMainUnitId(unit.getId());
+ }
+ if (supplier != null) {
+ if (!StringUtils.isNotEmpty(supplier.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼緵搴斿晢涓嶅瓨鍦�");
+ list.get(i).setSupplierId(supplier.getId());
+ }
+
+ if (warehouse != null) {
+ if (!StringUtils.isNotEmpty(warehouse.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屼粨搴撲笉瀛樺湪");
+ list.get(i).setWarehouseId(warehouse.getId());
+ }
+ if (warehouseArea != null) {
+ if (!StringUtils.isNotEmpty(warehouseArea.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱鍖轰笉瀛樺湪");
+ list.get(i).setWarehouseAreaId(warehouseArea.getId());
+ }
+
+ if (warehouseLocation != null) {
+ if (!StringUtils.isNotEmpty(warehouseLocation.getId()))
+ return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱浣嶄笉瀛樺湪");
+ list.get(i).setWarehouseLocationId(warehouseLocation.getId());
+ }
+
}
--
Gitblit v1.9.3