Merge branch 'dev' into test

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

@@ -3815,7 +3815,8 @@ public class WmsEnumUtil {
         AUTO_OPT(20, "AUTO_OPT", "自动操作"),
         MENU_OPT(30, "MENU_OPT", "手工操作"),
         AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"),
-        CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单");
+        CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"),
+        UPDATE_TASK(60, "UPDATE_TASK", "复用任务");
         private int value;
         private String code;
         private String description;

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

@@ -603,6 +603,8 @@ public class WmsHqlPack {
 
         //供应商编号
         DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
+        //客户编号
+        DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getCustNo(), "custNo", result);
         //供应商简称
         DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
         //供应商全称