From a1f67e8727f7af3b3b472446616ab6c591caaebc Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 04 九月 2023 13:09:04 +0800
Subject: [PATCH] 备件库存
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java | 5 ++---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java | 35 ++++++++++++++++++++++-------------
3 files changed, 26 insertions(+), 18 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 a3ed76e..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
@@ -56,6 +56,7 @@
private IConstructorService constructorService;
@Autowired
private IUnitService unitService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -233,31 +234,39 @@
for (int i = 0; i < list.size(); i++) {
SparePart sparePart = list.get(i);
- String constructorName=sparePart.getConstructorId();
+ String constructorName = sparePart.getConstructorId();
String mainUnitName = sparePart.getMainUnitId();
- String validityPeriodUnitName= sparePart.getValidityPeriodUnitId();
- Constructor constructor = constructorService.getByName(constructorName);
+ 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 (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) + "琛屽浠跺瀷鍙蜂笉鑳戒负绌�");
- 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());
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 1229c39..829d06d 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
@@ -218,6 +218,7 @@
String warehouseName = list.get(i).getWarehouseId();
String warehouseAreaName = list.get(i).getWarehouseAreaId();
String warehouseLocationName = list.get(i).getWarehouseLocationId();
+ String num =list.get(i).getValidityForecast();
if (supplierName != null) {
supplier = supplierService.getByName(supplierName);
@@ -233,9 +234,7 @@
}
if (warehouseLocationName != null) {
warehouseLocation = warehouseLocationService.getByName(warehouseLocationName);
-
}
-
if (!StringUtils.isNotEmpty(list.get(i).getBatchNum()))
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屾壒娆″彿涓嶈兘涓虹┖");
if (list.get(i).getMainQuantity() <= 0)
@@ -268,7 +267,7 @@
return Result.error("鏂囦欢瀵煎叆澶辫触: 绗�" + (i + 1) + "琛屽簱浣嶄笉瀛樺湪");
list.get(i).setWarehouseLocationId(warehouseLocation.getId());
}
-
+ list.get(i).setValidityForecast(num);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
index 75a2d66..148ec52 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -102,8 +102,8 @@
/**
* 鍑哄巶鏃ユ湡
- */
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15)
+ **/
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,format = "yyyy-MM-dd")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private java.util.Date manufactureDate;
--
Gitblit v1.9.3