From d40c3ccad0e5264fefd33264254564dead8c80df Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 06 十一月 2023 11:44:36 +0800
Subject: [PATCH] 单据名称增加单据来源
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index 797eb38..b6375ac 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -203,8 +204,10 @@
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
+ String receipts = precisionInspection.getReceipts();//绮惧害妫�楠屽崟鍗曟嵁id
PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
+ String maintenanceOrderUda4 = maintenanceOrder.getMaintenanceOrderUda4();
Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();
@@ -243,8 +246,11 @@
equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
}
- preInspection.setRemark(precisionInspection.getRemark());
+ if(StringUtils.isBlank(maintenanceOrderUda4)){
+ maintenanceOrder.setMaintenanceOrderUda4(receipts);
+ }
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ preInspection.setRemark(precisionInspection.getRemark());
precisionInspectionService.updateById(preInspection);
equipmentService.updateById(equipment);
return Result.OK("瀹℃壒鎴愬姛!");
--
Gitblit v1.9.3