From b2580407f2d0d1428bcb77963fcdd897ed552827 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 29 十二月 2023 14:51:54 +0800
Subject: [PATCH] 提价
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index 595167d..3c0bdc6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -106,6 +106,7 @@
LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
+ equipmentReportRepair.setType("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
String IS_PRODUCT_YES = "yes";
@@ -264,14 +265,14 @@
FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
if(ObjectUtils.isNotNull(faultInfo)){
String isConfirm2 = faultInfo.getIsConfirm();
- if(!isConfirm1.equals("yes")||isConfirm2.equals("yes")){
- return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屽満锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
+ return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屾垚锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
}
}else {
return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜嬫晠鐧昏鍗�");
}
}else {
- return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у钩璐ㄩ噺纭");
+ return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у搧璐ㄩ噺纭");
}
}
LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
--
Gitblit v1.9.3