From 1aa233edc07e5085047413582d8eefc859de307c Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 10 Sep 2024 14:45:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?intelligentCode=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/bonus/sgzb/base/api/domain/MaType.java | 8 +++++++-
.../resources/mapper/base/MaMachineTypeMapper.xml | 12 ++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
index e808ef3..31fc4c3 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
@@ -210,8 +210,14 @@ public class MaType extends BaseEntity {
private String facModel;
/**
- * 厂家规格型号
+ * 机具编码
*/
@ApiModelProperty(value = "机具编号")
private String machineCode;
+
+ /*
+ * 推送智慧工程定义的门类分类机具编码
+ * */
+ @ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码")
+ private String intelligentCode;
}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 51aefb5..aeb51f5 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -33,11 +33,11 @@
-
+
- select type_id, type_name, parent_id, status, num, company_id, code, unit_id, unit_name, manage_type, lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,machine_code ,fac_model, child_photo from ma_type
+ select type_id, type_name, parent_id, status, num, company_id, code, unit_id, unit_name, manage_type, lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,intelligent_code ,fac_model, child_photo from ma_type
@@ -71,7 +71,7 @@
is_ancuo,
remark,
fac_model,
- machine_code,
+ intelligent_code,
#{typeName},
@@ -102,7 +102,7 @@
#{isAncuo},
#{remark},
#{facModel},
- #{machineCode},
+ #{intelligentCode},
@@ -160,7 +160,7 @@
remark = #{remark},
company_id = #{companyId},
fac_model = #{facModel},
- machine_code = #{machineCode},
+ intelligent_code = #{intelligentCode},
where type_id = #{typeId}
@@ -287,7 +287,7 @@
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
m.del_flag, m.create_by, m.create_time,
- m.remark, m.company_id,m.fac_model as facModel,m.machine_code
+ m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code
from ma_type m
left join ma_prop_set mps on m.type_id = mps.type_id
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
From b841fef4175349cb12a9daef240aa0bb2a195feb Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 10 Sep 2024 14:46:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?intelligentCode=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/bonus/sgzb/base/api/domain/MaType.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
index 31fc4c3..38bc931 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
@@ -209,12 +209,6 @@ public class MaType extends BaseEntity {
@ApiModelProperty(value = "厂家规格型号")
private String facModel;
- /**
- * 机具编码
- */
- @ApiModelProperty(value = "机具编号")
- private String machineCode;
-
/*
* 推送智慧工程定义的门类分类机具编码
* */
From 6436cc92fb7d0b0d5a95472920a951b9ab1fee78 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 10 Sep 2024 15:32:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?intelligentCode=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index aeb51f5..a40302b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -342,7 +342,7 @@
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
- m.remark, m.company_id,m.fac_model as facModel,m.machine_code
+ m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code
from ma_type m
left join ma_prop_set mps on m.type_id = mps.type_id
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id