From e86246cbd35aef35026dce45e005040fc93949bf Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Mon, 28 Jun 2021 17:39:16 +0800
Subject: [PATCH] =?UTF-8?q?meapi=E5=8A=A0=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/foreverwin/mesnac/meapi/model/Bom.java | 13 ++++++-------
.../foreverwin/mesnac/meapi/model/BomComponent.java | 4 +++-
.../foreverwin/mesnac/meapi/model/CustomFields.java | 11 +++++------
.../com/foreverwin/mesnac/meapi/model/NcCode.java | 4 +++-
.../com/foreverwin/mesnac/meapi/model/NcGroup.java | 4 +++-
.../foreverwin/mesnac/meapi/model/ResourceType.java | 11 ++++++-----
.../com/foreverwin/mesnac/meapi/model/Resrce.java | 12 ++++++------
.../com/foreverwin/mesnac/meapi/model/Router.java | 9 +++++----
.../mesnac/meapi/model/RouterSubstep.java | 4 +++-
.../java/com/foreverwin/mesnac/meapi/model/Sfc.java | 9 +++++----
.../com/foreverwin/mesnac/meapi/model/SfcBom.java | 4 +++-
.../foreverwin/mesnac/meapi/model/ShopOrder.java | 2 +-
.../mesnac/meapi/model/WorkCenterMember.java | 10 +++++-----
13 files changed, 54 insertions(+), 43 deletions(-)
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
index cc0a2841..e332dc53 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
@@ -1,16 +1,15 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.List;
-import com.baomidou.mybatisplus.annotation.IdType;
-
/**
*
*
@@ -25,7 +24,7 @@ public class Bom extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
index 88be2eb6..09b7f80c 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
@@ -1,6 +1,8 @@
package com.foreverwin.mesnac.meapi.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -22,7 +24,7 @@ public class BomComponent extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("BOM_BO")
private String bomBo;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
index 5240aa79..7ff61964 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
@@ -1,15 +1,14 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-
/**
*
*
@@ -25,7 +24,7 @@ public class CustomFields extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("ATTRIBUTE")
private String attribute;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
index 725fdb16..4bd7a3f2 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
@@ -1,6 +1,8 @@
package com.foreverwin.mesnac.meapi.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -22,7 +24,7 @@ public class NcCode extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
index 6abf54a0..6ff7f09a 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
@@ -1,6 +1,8 @@
package com.foreverwin.mesnac.meapi.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -22,7 +24,7 @@ public class NcGroup extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
index 9467618c..192d2879 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
@@ -1,13 +1,13 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
/**
*
@@ -22,6 +22,7 @@ public class ResourceType extends Model {
private static final long serialVersionUID = 1L;
+ @TableId(value = "HANDLE", type = IdType.INPUT)
@TableField("HANDLE")
private String handle;
@TableField("CHANGE_STAMP")
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
index 874ee010..b4b3fd75 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
@@ -1,13 +1,13 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
/**
*
@@ -22,7 +22,7 @@ public class Resrce extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
index 633bef3a..6b498aab 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
@@ -1,12 +1,13 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
/**
*
@@ -22,7 +23,7 @@ public class Router extends Model {
private static final long serialVersionUID = 1L;
- @TableId("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
index 776497b0..b4cac02b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
@@ -1,6 +1,8 @@
package com.foreverwin.mesnac.meapi.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -21,7 +23,7 @@ public class RouterSubstep extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("ROUTER_STEP_BO")
private String routerStepBo;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
index 273b9e6a..04ffca77 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
@@ -1,12 +1,13 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
/**
*
@@ -22,7 +23,7 @@ public class Sfc extends Model {
private static final long serialVersionUID = 1L;
- @TableId("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
index b52a378d..5753b517 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
@@ -1,6 +1,8 @@
package com.foreverwin.mesnac.meapi.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -22,7 +24,7 @@ public class SfcBom extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
index 40f77cc3..d2e8f43d 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
@@ -24,7 +24,7 @@ public class ShopOrder extends Model {
private static final long serialVersionUID = 1L;
- @TableId("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("CHANGE_STAMP")
private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
index 2f5f59bb..ba9e76c3 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
@@ -1,12 +1,12 @@
package com.foreverwin.mesnac.meapi.model;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
/**
*
@@ -21,7 +21,7 @@ public class WorkCenterMember extends Model {
private static final long serialVersionUID = 1L;
- @TableField("HANDLE")
+ @TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
@TableField("WORK_CENTER_BO")
private String workCenterBo;