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

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

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

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

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

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

@@ -0,0 +1,18 @@
+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 org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 14:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReason")
+public class MesBasDowntimeReasonController extends BaseMesController<MesBasDowntimeReason>{
+}

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

@@ -0,0 +1,18 @@
+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 org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2024-05-17 14:16
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBasDowntimeReasonType")
+public class MesBasDowntimeReasonTypeController extends BaseMesController<MesBasDowntimeReasonType>{
+}

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

@@ -0,0 +1,28 @@
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesBasDowntimeReasonServiceImpl extends BaseMesService<MesBasDowntimeReason> implements IMesBasDowntimeReasonService {
+
+    protected void setPackQueryBean(MesBasDowntimeReason bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getReasonCode(), "reasonCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonName(), "reasonName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getReasonType(), "reasonType", packBean);
+    }
+
+}

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

@@ -0,0 +1,27 @@
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description : Maximo仪表主数据
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/17 14:06
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesBasDowntimeReasonTypeServiceImpl extends BaseMesService<MesBasDowntimeReasonType> implements IMesBasDowntimeReasonTypeService {
+
+    protected void setPackQueryBean(MesBasDowntimeReasonType bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getTypeCode(), "typeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTypeName(), "typeName", packBean);
+    }
+
+}

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

@@ -21,7 +21,7 @@ public class MesMaximoMeterMainDataServiceImpl extends BaseMesService<MesMaximoM
 
     protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getMeterName(), "meterName", packBean);
     }
 

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

@@ -79,7 +79,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
                         .setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode())
                         .build();
             }
-            if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getWorkVer())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
+            if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@@ -182,7 +182,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
                         .setErrorDetail("产线代码【%s】无效", item.getWorkCenterCode())
                         .build();
             }
-            if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getWorkVer())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
+            if(!Objects.equals(mesCraftRoute.getCraftRouteType(), mesWorkCenter.getType())){//todo 工作版本",notes = "使用: 生产线类型: 排序/非排序
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())

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

@@ -216,6 +216,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
@@ -311,9 +312,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             //校验物料生产版本是否存在
             ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean);
+            DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", ddlPackBean);
             DdlPreparedPack.getStringEqualPack(item.getProductVersion(), "productVersion", ddlPackBean);
             if (!mesProductVersionRDao.isExitByHql(ddlPackBean)) {
-                MesException.throwMesBusiException("物料【%s】生产版本【%s】信息不存在", item.getPartNo(), item.getProductVersion());
+                MesException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(),item.getWorkCenterCode(), item.getProductVersion());
             }
 
         } else {