Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -42,6 +42,10 @@ public class MesFurnaceLocation extends BaseBean implements Serializable {
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
 
+    @Column(name = "orientation")
+    @ApiParam("方向")
+    private String orientation;
+
     @Column(name = "SEQ")
     @ApiParam("推荐顺序")
     private Integer seq;

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

@@ -265,4 +265,19 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.assyNo = assyNo;
         this.queueType = queueType;
     }
+
+    public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber,
+                               String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.vinCode = vinCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.productSn = productSn;
+        this.serialNumber = serialNumber;
+        this.groupSeq = groupSeq;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.groupSide = groupSide;
+        this.jisBackflushStatus = jisBackflushStatus;
+    }
 }

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

@@ -21,16 +21,16 @@ public class MaterialLotModel implements Serializable {
 
     private String modifyDateTime;
 
-    @ApiParam("生产日期")
+    @ApiParam("供应商批次")
     private String dateCode;
 
-    @ApiParam("批次")
+    @ApiParam("收货日期")
     private String lotNo;
 
     @ApiParam("特殊批次")
     private String fixLotNo;
 
-    @ApiParam("生产批次")
+    @ApiParam("生产日期")
     private String leftCode;
 
     @ApiParam("物料代码")