Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -66,6 +67,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Transient
+    @ApiParam("工单号")
+    private String orderNo;
+
 
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java

@@ -66,6 +66,11 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+
 
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java

@@ -30,6 +30,6 @@ public class CellFeedModel {
 
     private String scanQty;
 
-    private String LineRemainQty;
+    private String lineRemainQty;
 
 }