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

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

@@ -4427,8 +4427,9 @@ public class WmsEnumUtil {
         WAIT_RECEIVING(10, "待收货"),
         RECEIVING(20, "收货中"),
         COMPLETE_RECEIVING(30, "收货完成"),
-        UN_RECEIVED(40, "延迟未收货"),
-        ELSE(50,"其他");
+        CLOSE(40,"已关闭"),
+        CANCEL(50,"已取消"),
+        UN_RECEIVED(60, "延迟未收货");
 
         private int value;
         private String description;

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

@@ -159,7 +159,7 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
-    @Column(name = "DOCK")
+    @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
     @ApiParam("道口")
     public String dock;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1203,6 +1199,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
         DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        //单据状态
+        DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result);
 
         getStringBuilderPack(wmsQCMaster, result);