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/DailyInspectionStandardController.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 1 +
5 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index 26e2a1d..c5c4dff 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -462,6 +462,7 @@
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
dailyInspectionStandard.setWritePerson(sysUser.getRealname());
dailyInspectionStandard.setId("");
+ dailyInspectionStandard.setAssignMode("1");
dailyInspectionStandard.setApprovalStatus("1");
dailyInspectionStandard.setCreateTime(new Date());
dailyInspectionStandard.setTakeEffectTime(null);
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 bbe7f0b..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";
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 128eb2f..1c9c10d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -555,6 +555,7 @@
equipmentReportRepair.setNum(num);
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("2");
+ equipmentReportRepair.setType("2");//绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepair.setEquipmentId(inspectionOrder.getEquipmentId());
equipmentReportRepair.setFaultDescription(orderDetail.getAbnormalDesc());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index dc284b0..75abb77 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -149,6 +149,12 @@
@ApiModelProperty(value = "鏉ユ簮Id")
private String sourceId;
+ /**
+ * qsw 2023-12-29
+ */
+ @ApiModelProperty(value = "绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�")
+ private String type;
+
/*********************************************** 鎵� 灞� 瀛� 娈� ********************************************************/
/**
* 璁惧缂栧彿
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 0a1d0b9..4a2c70c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -15,6 +15,7 @@
t1.approval approval,
t1.fault_time faultTime,
t1.source source,
+ t1.type,
t1.source_id sourceId,
t1.urgency urgency,
t1.is_create_order isCreateOrder,
--
Gitblit v1.9.3