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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2591,7 +2591,7 @@ public class MesPcnEnumUtil {
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
         PROCESS_CONTENT("processContent", "过程组件内容"),
         TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
-        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
+//        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
         TIME_MODULE_START("timeModuleStart", "定时组件开始"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
         //TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件");

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author adair.song
+ * @date 2020/6/16 14:21
+ * @desc 枪头更换计数弹框model
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("枪头更换计数弹框model")
+public class TorqueHeadChangeModel {
+
+    @ApiParam(name = "确认密码")
+    private String passWord;
+
+    @ApiParam(name = "工厂")
+    private String organizeCode;
+
+    @ApiParam(name = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(name = "工作单元")
+    private String workCellCode;
+
+}

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

@@ -173,6 +173,10 @@ public class WmsDocMovementSn extends BaseBean {
     private String whNo;
 
     @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
@@ -254,7 +258,20 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String vendorNo,Integer snStatus,Double sumQty) {
+                            String version,String whNo,Integer snStatus,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.version = version;
+        this.whNo = whNo;
+        this.snStatus = snStatus;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -262,6 +279,7 @@ public class WmsDocMovementSn extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.version = version;
         this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }

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

@@ -92,6 +92,18 @@ public class WmsTaskInfo extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("是否同步")
+    public Integer syncStatus = 10;
+
+    @Column(name = "SYNC_DATE_TIME")
+    @ApiParam(value = "同步时间", example = "1")
+    public String syncDateTime;
+
+    @Column(name = "SYNC_USER")
+    @ApiParam(value = "同步人", example = "1")
+    public String syncUser;
+
     @Transient
     @ApiParam("计划日期")
     private String zdate;