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/DailyMaintenanceOrderController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index 65ecaef..ce8d82b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -37,6 +37,7 @@
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -106,6 +107,9 @@
@Autowired
private IMaintenanceStoveExemptService maintenanceStoveExemptService;
+
+ @Autowired
+ private ISysFileNameService sysFileNameService;
/**
@@ -214,7 +218,7 @@
*/
@GetMapping("getDailyMaintenanceOrder3List")
public Result<?> getDailyMaintenanceOrder3List(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrderList(pageNo, pageSize, params);
+ IPage<Map<String, Object>> dailyMaintenanceOrderList = dailyMaintenanceOrderService.getDailyMaintenanceOrder3List(pageNo, pageSize, params);
List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
for (Map<String, Object> record : records) {
String id = (String) record.get("id");
@@ -708,8 +712,10 @@
void createMaintenanceStoveExempt(DailyMaintenanceOrder dailyMaintenanceOrder){
+ List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("20");
MaintenanceStoveExempt maintenanceStoveExempt = new MaintenanceStoveExempt();
maintenanceStoveExempt.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ maintenanceStoveExempt.setReceipts(sysFileName.get(0).getReceipts());
maintenanceStoveExemptService.save(maintenanceStoveExempt);
}
@@ -733,9 +739,11 @@
String userId = sysUser.getId();
String orderId = dailyMaintenanceOrder.getId();
+ String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
String equipmentId = maintenanceOrder.getEquipmentId();
String confirmStatus = maintenanceOrder.getConfirmStatus();
+ String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
.eq(FinishTransferOrder::getMaintenanceOrderId, orderId)
@@ -746,12 +754,18 @@
finishTransferOrder.setRepairDirectorUser(userId);
finishTransferOrderService.updateById(finishTransferOrder);
+ if(StringUtils.isBlank(orderUda3)){
+ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
+ }
maintenanceOrder.setConfirmStatus("1");
dailyMaintenanceOrderService.updateById(maintenanceOrder);
}else{
finishTransferOrder.setEquipmentInspectorUser(userId);
finishTransferOrderService.updateById(finishTransferOrder);
+ if(StringUtils.isBlank(orderUda3)){
+ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
+ }
maintenanceOrder.setConfirmStatus("2");
maintenanceOrder.setStatus("8");
dailyMaintenanceOrderService.updateById(maintenanceOrder);
--
Gitblit v1.9.3