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/MesQueueJitActual.java

@@ -134,6 +134,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("工单类型")
     private Integer woType;
 
+    @Column(name = "OFFLINE_TIME")
+    @ApiParam("下线时间")
+    private String offlineTime;
+
+    @Column(name = "NOTICE_SIGN")
+    @ApiParam("通知标识")
+    private String noticeSign;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码解绑实体
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class FutrueTaskModel {
+
+    @ApiParam("实现类")
+    private Object futrueTaskService;
+
+    @ApiParam("包装条码")
+    private StationRequestBean stationRequestBean;
+
+    @ApiParam("过程条码")
+    private MesProduceSn produceSn;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -545,6 +545,15 @@ public class WmsStockSn extends BaseBean {
         this.locateNo = locateNo;
     }
 
+    public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        this.zoneNo = zoneNo;
+        this.unit = unit;
+        this.whNo = whNo;
+    }
+
     //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid
     public WmsStockSn(String locateNo, String partNo, Integer snStatus,
                       Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) {