From fd771bccf8e9eb2f396ef3685d25dcca5b47c9f1 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 22 Aug 2020 15:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=8A=9F=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index 807a90b..f259c54 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -139,4 +139,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "QC_STATUS")
     @ApiParam("质量状态")
     private Integer qcStatus = 10;
+
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
index 79c108a..b091b3a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
@@ -29,7 +29,7 @@ public class Part implements Serializable {
     private String qty;
 
     @ApiParam("是否是baseModule")
-    private boolean isBaseModule;
+    private Integer isBaseModule;
 
     @ApiParam("前左数量")
     private String flQty;