From b53328dc7bebe146dc5814ef7aafeb4db4ce286e Mon Sep 17 00:00:00 2001
From: yxw <xinwang.yi@estsh.com>
Date: Tue, 24 Oct 2023 16:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/ext/mes/api/base/jx/ITorqueManageService.java |  2 +-
 .../i3plus/ext/mes/pojo/bean/MesProcessTorqueManage.java | 10 ++++++++++
 .../mes/pojo/bean/MesProcessTorqueManageTaskDetail.java  | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ITorqueManageService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ITorqueManageService.java
index 3c9ed86..8d05ce8 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ITorqueManageService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ITorqueManageService.java
@@ -52,7 +52,7 @@ public interface ITorqueManageService {
      * @param userName 操作人
      */
     @ApiOperation("软删扭矩管理信息")
-    void deleteWeaklyMesProcessTorqueManageByIds(Long[] ids, String userName);
+    void deleteWeaklyMesProcessTorqueManageByIds(String[] ids, String userName);
 
     /**
      * 批量禁用/启用详情
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManage.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManage.java
index 8dc61fd..e8cdf22 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManage.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManage.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -40,6 +41,10 @@ public class MesProcessTorqueManage extends BaseBean implements Serializable {
     @ApiParam("零件编号")
     private String partNo;
 
+    @Column(name="PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
     @Column(name = "PROCESS_CODE")
     @ApiParam(value = "工序编号")
     public String processCode;
@@ -64,4 +69,9 @@ public class MesProcessTorqueManage extends BaseBean implements Serializable {
     @ApiParam("下限值")
     private String downLimit;
 
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
 }
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManageTaskDetail.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManageTaskDetail.java
index 2fae926..2a0a6eb 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManageTaskDetail.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/MesProcessTorqueManageTaskDetail.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -46,6 +47,10 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial
     @ApiParam("产线代码")
     private String workCenterCode;
 
+    @Column(name="WORK_CENTER_NAME")
+    @ApiParam("产线代码")
+    private String workCenterName;
+
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工位代码")
     private String workCellCode;
@@ -63,9 +68,13 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial
     private String shiftName;
 
     @Column(name="PART_NO")
-    @ApiParam("零件编号")
+    @ApiParam("物料编号")
     private String partNo;
 
+    @Column(name="PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
     @Column(name = "PROCESS_CODE")
     @ApiParam(value = "工序编号")
     public String processCode;
@@ -192,6 +201,11 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial
     @ApiParam("扭矩螺丝刀-扭矩管理NO3")
     private String torqueManageNo3;
 
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
     @Transient
     @ApiParam("全称扭矩螺丝刀-扭矩管理NO3")
     private String torqueManageNo3Full;