From 30a0ac5c8d328403a8423d080a3b8f3fab07aadd Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 14 十一月 2023 17:40:38 +0800
Subject: [PATCH] 质量隐患确认，故障单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 f82e765..20fe37e 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
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -14,12 +16,12 @@
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.entity.FaultDescription;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
-import org.jeecg.modules.eam.service.IFaultDescriptionService;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,15 +48,20 @@
private IEquipmentReportRepairService equipmentReportRepairService;
@Autowired
private IEamEquipmentService equipmentService;
-
@Autowired
private ISysBaseAPI sysBaseApi;
@Autowired
private ISysUserService userService;
-
+ @Autowired
+ private IQuanlityConfirmService quanlityConfirmService;
@Autowired
@Lazy
private IFaultDescriptionService faultDescriptionService;
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
+
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -95,14 +102,29 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody EquipmentReportRepair equipmentReportRepair) {
+ LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
+ String IS_PRODUCT_YES = "yes";
+ if(IS_PRODUCT_YES.equals(equipmentReportRepair.getErrUda1())){
+ String num = sysIdentityService.getNumByTypeAndLength("QuanlityConfirm",4);
+ QuanlityConfirm quanlityConfirm = new QuanlityConfirm();
+ quanlityConfirm.setNum(num);
+ quanlityConfirm.setReportId(equipmentReportRepair.getId());
+ String IS_PRODUCT_NO = "no";
+ quanlityConfirm.setIsConfirm(IS_PRODUCT_NO);
+ quanlityConfirm.setBatchNo(equipmentReportRepair.getBatchNo());
+ quanlityConfirm.setPartNumber(equipmentReportRepair.getPartNumber());
+ quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
+ quanlityConfirm.setOperator(curUser.getId());
+ quanlityConfirmService.save(quanlityConfirm);
+ }
Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
equipment.setEquipmentStatus("2");
String teamId = equipment.getTeamId();
- if(StringUtils.isNotBlank(teamId)){
+ if(ObjectUtils.isNotNull(teamId)){
List<SysUser> sysUsers = userService.list(new QueryWrapper<SysUser>()
.eq("team_id",teamId)
.eq("del_flag",0));
--
Gitblit v1.9.3