Mes设备停机原因+设备停机类型

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 
 /**
  * @Description :设备停机原因
@@ -9,5 +10,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
  * @CreateDate 2024/5/17 14:06
  * @Modify:
  **/
-public interface IMesBasDowntimeReasonService extends IBaseMesService<MesBasDowntimeReason> {
+public interface IMesBasDowntimeReasonService extends IBaseMesService<MesDowntimeReason> {
 }

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBasDowntimeReasonTypeService.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 
 /**
  * @Description :设备停机类型
@@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
  * @CreateDate 2024/5/17 14:06
  * @Modify:
  **/
-public interface IMesBasDowntimeReasonTypeService extends IBaseMesService<MesBasDowntimeReasonType> {
+public interface IMesBasDowntimeReasonTypeService extends IBaseMesService<MesDowntimeReasonType> {
 }

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason")
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReason")
-public class MesBasDowntimeReasonController extends BaseMesController<MesBasDowntimeReason>{
+public class MesBasDowntimeReasonController extends BaseMesController<MesDowntimeReason>{
 }

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType")
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesDowntimeReasonType")
-public class MesBasDowntimeReasonTypeController extends BaseMesController<MesBasDowntimeReasonType>{
+public class MesBasDowntimeReasonTypeController extends BaseMesController<MesDowntimeReasonType>{
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonServiceImpl.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReason;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReason;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -17,12 +17,12 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 @Slf4j
-public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesBasDowntimeReason> implements IMesBasDowntimeReasonService {
+public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesDowntimeReason> implements IMesBasDowntimeReasonService {
 
-    protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesDowntimeReason bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean);
     }
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBasDowntimeReasonTypeServiceImpl.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesBasDowntimeReasonTypeService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesBasDowntimeReasonType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDowntimeReasonType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -17,11 +17,11 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 @Slf4j
-public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesBasDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
+public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
 
-    protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesDowntimeReasonType bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeCode(), "reasonTypeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonTypeName(), "reasonTypeName", packBean);
     }
 
 }