Merge remote-tracking branch 'origin/test' into test

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

@@ -2681,7 +2681,8 @@ public class MesPcnEnumUtil {
         ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
         ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"),
-        MESSAGE_POOL("messagePool", "消息池");
+        MESSAGE_POOL("messagePool", "消息池"),
+        FORCE_LOGOUT("forceLogout", "websocket强制下线");
 
         private String value;
         private String description;
@@ -6009,6 +6010,7 @@ public class MesPcnEnumUtil {
             }
             return null;
         }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -86,7 +86,7 @@ public class DdlPreparedPack {
      * @param isShowTime 是否包含时分秒
      */
     public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) {
-        if (date != null && date.trim().length() > 0) {
+        if (date != null && date.trim().length() > 2) {
             String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
             if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) {
                 //只有一个逗号

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

@@ -375,6 +375,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("完成时间")
     public String complateDatetime;
 
+    @Transient
+    @ApiParam("应拣数")
+    public Integer inQty;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
@@ -419,11 +423,10 @@ public class WmsDocMovementMaster extends BaseBean {
         this.custTel = custTel;
     }
 
-    public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) {
+    public WmsDocMovementMaster(String orderNo,String createDatetime,Integer inQty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) {
         this.orderNo = orderNo;
         this.createDatetime = createDatetime;
-        this.qty = qty;
+        this.inQty = inQty;
-        this.snp = snp;
         this.orderStatus = orderStatus;
         this.organizeCode = organizeCode;
         this.createUser = createUser;

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

@@ -138,4 +138,14 @@ public class WmsTaskInfo extends BaseBean {
         this.custNo = custNo;
         this.vendorNo = vendorNo;
     }
+
+    public WmsTaskInfo(String orderNo, Integer taskStatus, String transTypeCode, String createUser, String createDatetime, String organizeCode, String userNo) {
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.transTypeCode = transTypeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.organizeCode = organizeCode;
+        this.userNo = userNo;
+    }
 }