工艺流程界面问题修复

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesRoute;
+
+/**
+ * @Description : 流程表
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/7/3 9:46
+ * @Modify:
+ **/
+public interface IMesRouteService extends IBaseMesService<MesRoute> {
+
+}

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

@@ -0,0 +1,20 @@
+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.MesRoute;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 流程表
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/7/3 9:45
+ * @Modify:
+ **/
+@Api(description = "流程表")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRoute")
+public class MesRouteController extends BaseMesController<MesRoute> {
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesCraftDaoImpl.java

@@ -9,12 +9,14 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesCraft;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Description :工艺信息
@@ -49,8 +51,8 @@ public class MesCraftDaoImpl implements IMesCraftDao {
         if (!StringUtil.isEmpty(mesCraft.getCraftName())) {
             hql.append(" and mc.craftName like '%").append(mesCraft.getCraftName()).append("%' ");
         }
-        Query query = entityManager.createQuery("select mc " + hql, MesCraft.class);
+        Query query = entityManager.createQuery("select distinct mc " + hql, MesCraft.class);
-        Query countQuery = entityManager.createQuery("select count(1) " + hql, Long.class);
+        Query countQuery = entityManager.createQuery("select count(1) " + hql+" group by mc.id ",Long.class);
         query.setParameter("organizeCode", mesCraft.getOrganizeCode());
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
@@ -66,7 +68,8 @@ public class MesCraftDaoImpl implements IMesCraftDao {
             query.setParameter("craftCode", mesCraft.getCraftCode());
             countQuery.setParameter("craftCode", mesCraft.getCraftCode());
         }
-        int count = Integer.parseInt(String.valueOf(countQuery.getSingleResult()));
+        List resultLst = countQuery.getResultList();
+        int count = CollectionUtils.isEmpty(resultLst) ? 0 : resultLst.size();
         pager = PagerHelper.getPager(pager, count);
         if (count <= 0) {
             return new ListPager<>(new ArrayList<>(), pager);

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesRouteService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesRoute;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 流程表
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/7/3 9:47
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesRouteServiceImpl extends BaseMesService<MesRoute> implements IMesRouteService {
+
+    @Override
+    protected void setPackQueryBean(MesRoute bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getRouteName(), "routeName", packBean);
+    }
+}