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 | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 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 859cc9f..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
@@ -206,6 +206,11 @@
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();
@@ -213,11 +218,27 @@
String warehouseName = sparesPartInventory.getWarehouseId();
String warehouseAreaName = sparesPartInventory.getWarehouseAreaId();
String warehouseLocationName = sparesPartInventory.getWarehouseLocationId();
- Supplier supplierId = supplierService.getByName(supplierName);
- Unit unitById = unitService.getUnitByName(mainUnitName);
- Warehouse warehouseId = warehouseService.getByName(warehouseName);
- WarehouseArea warehouseAreaId = warehouseAreaService.getByName(warehouseAreaName);
- WarehouseLocation warehouseLocationId = warehouseLocationService.getByName(warehouseLocationName);
+
+ 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()))
@@ -226,17 +247,14 @@
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) + "琛屽簱浣嶄笉瀛樺湪");
+ /* 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 (!StringUtils.isNotEmpty(sparesPartInventory.getBatchNum()))
- return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾壒娆″彿涓嶈兘涓虹┖");
- if (sparesPartInventory.getMainQuantity() <= 0)
- return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾暟閲忎笉鑳戒负灏忎簬绛変簬0");
+ /* list.get(i).setSupplierId(warehouseLocationId.getId());*/
+
}
sparesPartInventoryService.saveBatch(list);
--
Gitblit v1.9.3