From ae33e68baf21878ce145d75ac377d14c1e2b2a82 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:59:26 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 5 +++++
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11(lnl)/lnl.sql | 19 +++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 2 +-
6 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 695e273..9b570d0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -859,10 +859,12 @@
@PostMapping("addLine")
@Transactional(rollbackFor = {Exception.class})
public Result<?> addLine(@RequestBody Equipment equipment){
+ equipment.setIsLineEquip("no");
equipmentService.save(equipment);
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
equipment1.setId(equipment1.getShowId());
+ equipment1.setIsLineEquip("yes");
equipment1.setLineId(equipment.getId());
}
equipmentService.updateBatchById(equipmentList);
@@ -876,6 +878,11 @@
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
equipment1.setLineId(equipment.getId());
+ String id = equipment1.getId();
+ if(StringUtils.isBlank(id)){
+ equipment1.setId(equipment1.getShowId());
+ }
+ equipment1.setIsLineEquip("yes");
}
equipmentService.updateBatchById(equipmentList);
return Result.OK("缂栬緫鎴愬姛");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
index e329163..6ddd177 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
@@ -606,7 +606,7 @@
// 灏嗗悎骞跺悗鐨刲ong鍊艰浆鎹负16杩涘埗瀛楃涓�
String hexString = Long.toHexString(combinedBits);
- String planNum = sysIdentityService.getNumByTypeAndLength("",4);
+ String planNum = sysIdentityService.getNumByTypeAndLength("MaintenancePlan",4);
plan.setId(hexString);
plan.setNum(planNum);
plan.setType("3");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
index 62e7c98..410caae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -79,6 +79,7 @@
@Param("warrantyStart")Date warrantyStart,
@Param("warrantyEnd")Date warrantyEnd,
@Param("lineId")String lineId,
+ @Param("isLineEquip")String isLineEquip,
@Param("sql")String sql
);
List<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 05462b7..8622ac1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -252,6 +252,8 @@
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
+ t1.is_line_equip isLineEquip,
+ t1.is_judging isJudging,
t3.sumOfEquipment
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
@@ -287,6 +289,9 @@
<if test="equipmentStatus != null and equipmentStatus != ''">
and t1.equipment_status = #{equipmentStatus}
</if>
+ <if test="isLineEquip != null and isLineEquip != ''">
+ and t1.is_line_equip = #{isLineEquip}
+ </if>
<if test="specificEquipment != null and specificEquipment != ''">
and t1.specific_equipment = #{specificEquipment}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 47e3f1c..a7d291d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -116,6 +116,7 @@
equipment.getWarrantyStart(),
equipment.getWarrantyEnd(),
equipment.getLineId(),
+ equipment.getIsLineEquip(),
sql
));
}
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl.sql"
index 73ed997..5de1d5c 100644
--- "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl.sql"
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl.sql"
@@ -13,3 +13,22 @@
'SCHEMA', N'dbo',
'TABLE', N'mom_eam_equipment_maintenance_plan',
'COLUMN', N'create_reason'
+-- 璁惧鍙拌处澧炲姞涓や釜瀛楁
+ALTER TABLE [dbo].[mom_eam_equipment] ADD [is_line_equip] nvarchar(32) NULL
+ GO
+
+ALTER TABLE [dbo].[mom_eam_equipment] ADD [is_judging] nvarchar(32) NULL
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'鏄惁鐢熶骇绾胯澶囷紙鏄細yes锛屽惁锛歯o锛�',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'mom_eam_equipment',
+ 'COLUMN', N'is_line_equip'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'鏄惁鍦ㄨ瘎鍒嗗綋涓紙鏄細yes锛屽惁锛歯o锛�',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'mom_eam_equipment',
+ 'COLUMN', N'is_judging'
--
Gitblit v1.9.3