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

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java

@@ -152,7 +152,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
     @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
     public ResultBean<T> queryByPager(T bean, Pager pager) {
         try {
-            bean.setOrganizeCode("CK01");
+            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
             ListPager<T> listPager = getBaseService().queryPager(bean, pager);
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService;
 import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService;
 import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService;
 import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords;
@@ -82,7 +83,7 @@ public class ExtProdOrgController extends MesBaseController {
 
             ListPager listPager = null;
 
-            ProdOrgExtModel.setOrganizeCode("CK01");
+            ProdOrgExtModel.setOrganizeCode(AuthUtilExt.getOrganizeCode());
             //工厂
             if (MesEnumUtil.PROD_ORG_LEVEL.LEVEL_ONE.getValue() == ProdOrgExtModel.getLevel()) {
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -75,11 +75,11 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
                     .build();
         }
 
-        if (equipmentSpotCheck.getTriggerMode() == MesExtEnumUtil.EQUIPMENT_SPOT_CHECK_TRIGGER_MODE.TIME.getValue()) {
+        if (equipmentSpotCheck.getTriggerMode() == MesExtEnumUtil.EQUIPMENT_CHECK_INSPECTION_TRIGGER_METHOD.TIME_TRIGGERED.getValue()) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】点检方案触发方式为【%s】，请勿手动创建", bean.getSpotCheckId(), MesExtEnumUtil.EQUIPMENT_SPOT_CHECK_TRIGGER_MODE.TIME.getDescription())
+                    .setErrorDetail("【%s】点检方案触发方式为【%s】，请勿手动创建", bean.getSpotCheckId(), MesExtEnumUtil.EQUIPMENT_CHECK_INSPECTION_TRIGGER_METHOD.TIME_TRIGGERED.getDescription())
                     .build();
         }
 

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java

@@ -16,6 +16,7 @@ public class MesCommonConstant {
 
     public static final String SPOT_CHECK_ORDER_TASK_RESOURCE = "MES";
 
+    //点检单据号
     public static final String SPOT_CHECK_ORDER_NO_RULE = "SPOT_CHECK_ORDER_NO_RULE";
     /***
      * 工单 报工