Merge branch 'test' into ext-dev

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

@@ -2624,7 +2624,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
         CREATE(10, "创建"),
-        (20, "质检中"),
+        QUALITY_CONTROL(20, "质检中"),
         PRE_INSTOCK(30, "待入库"),
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -69,7 +69,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
-        DdlPreparedPack.getNumEqualwPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
 
         return ddlPackBean;