公共方法

common/pom.xml

@@ -78,5 +78,9 @@
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>meapi</artifactId>
+        </dependency>
     </dependencies>
 </project>

common/src/main/java/com/foreverwin/mesnac/common/service/CommonService.java

@@ -0,0 +1,19 @@
+package com.foreverwin.mesnac.common.service;
+
+import com.foreverwin.mesnac.meapi.model.Operation;
+
+public interface CommonService {
+    /**
+     * 根据资源或工作中心查找车间
+     * @param workCenterBo
+     * @return
+     */
+    String getWorkShopBo(String workCenterBo);
+
+    /**
+     * 根据sfc查所在工序
+     * @param sfcBo
+     * @return
+     */
+    Operation getOperationBySfcBo(String sfcBo);
+}

common/src/main/java/com/foreverwin/mesnac/common/service/impl/CommonServiceImpl.java

@@ -0,0 +1,59 @@
+package com.foreverwin.mesnac.common.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.foreverwin.mesnac.common.service.CommonService;
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.meapi.mapper.OperationMapper;
+import com.foreverwin.mesnac.meapi.model.Operation;
+import com.foreverwin.mesnac.meapi.model.WorkCenter;
+import com.foreverwin.mesnac.meapi.model.WorkCenterMember;
+import com.foreverwin.mesnac.meapi.service.WorkCenterMemberService;
+import com.foreverwin.mesnac.meapi.service.WorkCenterService;
+import com.foreverwin.modular.core.exception.BusinessException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+import java.util.List;
+
+public class CommonServiceImpl implements CommonService {
+    @Autowired
+    private WorkCenterMemberService workCenterMemberService;
+    @Autowired
+    private WorkCenterService workCenterService;
+    @Autowired
+    private OperationMapper operationMapper;
+
+    @Override
+    public String getWorkShopBo(String workCenterBo) {
+        if (StrUtil.isBlank(workCenterBo)) {
+            return null;
+        }
+        WorkCenterMember workCenterMember = new WorkCenterMember();
+        workCenterMember.setWorkCenterOrResourceGbo(workCenterBo);
+        QueryWrapper<WorkCenterMember> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(workCenterMember);
+        List<WorkCenterMember> workCenterMembers = workCenterMemberService.list(queryWrapper);
+        if (workCenterMembers.size() == 0) {
+            return null;
+        }
+        if (workCenterMembers.size() > 1) {
+            throw BusinessException.build("资源或工作中心"+ StringUtil.trimHandle(workCenterBo) +"不能属于多个产线");
+        }
+        workCenterMember = workCenterMembers.get(0);
+        if (workCenterMember != null) {
+            WorkCenter workCenter = workCenterService.getById(workCenterMember.getWorkCenterBo());
+            if ("LEVEL4".equals(workCenter.getWcCategory())) {
+                return workCenter.getHandle();
+            } else {
+                return getWorkShopBo(workCenter.getHandle());
+            }
+        }
+        return null;
+    }
+    @Override
+    public Operation getOperationBySfcBo(String sfcBo) {
+        Operation operation = operationMapper.selectOperationBySfcBo(sfcBo, LocaleContextHolder.getLocale().getLanguage());
+        return operation;
+    }
+}

common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java

@@ -49,6 +49,31 @@ public class StringUtil
 
 		return str_builer.toString();
 	}
+	public static String trimHandle(String handle) {
+		if (handle == null || handle.trim().length() == 0) {
+			return null;
+		}
+
+		String[] temp = handle.split(",");
+		if( temp.length < 2 ) {
+			return handle;
+		}
+		return temp[1];
+	}
+
+	public static String trimRevision(String handle) {
+		if (handle == null || handle.trim().length() == 0) {
+			return null;
+		}
+
+		int index = handle.lastIndexOf(",");
+		if (index < 0) {
+			return null;
+		}
+		else {
+			return handle.substring(index + 1);
+		}
+	}
 
 	public static String append(String str, String appender, int position)
 	{

meapi/pom.xml

@@ -28,10 +28,5 @@
             <groupId>com.foreverwin.modular</groupId>
             <artifactId>modular-melib</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.foreverwin.mesnac</groupId>
-            <artifactId>common</artifactId>
-        </dependency>
     </dependencies>
 </project>

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java

@@ -24,7 +24,17 @@ public class WorkCenterController {
     @Autowired
     public WorkCenterService workCenterService;
 
-
+    /**
+     * 查询车间
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/getWorkShopList")
+    public R getWorkShopList(){
+        List<WorkCenter> result=workCenterService.getWorkShopList();
+        return R.ok(result);
+    }
     /**
      * 查询所有数据
      *

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java

@@ -0,0 +1,25 @@
+package com.foreverwin.mesnac.meapi.dto;
+
+import com.foreverwin.mesnac.meapi.model.Sfc;
+
+public class SfcDto extends Sfc {
+    String resrce;
+
+    String operation;
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public String getResrce() {
+        return resrce;
+    }
+
+    public void setResrce(String resrce) {
+        this.resrce = resrce;
+    }
+}

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/WorkCenterDto.java

@@ -0,0 +1,15 @@
+package com.foreverwin.mesnac.meapi.dto;
+
+import com.foreverwin.mesnac.meapi.model.WorkCenter;
+
+public class WorkCenterDto extends WorkCenter {
+    String resrce;
+
+    public String getResrce() {
+        return resrce;
+    }
+
+    public void setResrce(String resrce) {
+        this.resrce = resrce;
+    }
+}

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/OperationMapper.java

@@ -20,4 +20,7 @@ import java.util.List;
 @Repository
 public interface OperationMapper extends BaseMapper<Operation> {
     List<Operation> selectPage(@Param("locale") String locale, IPage<Operation> page, @Param("ew") Wrapper<Operation> wrapper);
+
+    Operation selectOperationBySfcBo(@Param("sfcBo") String sfcBo, @Param("locale") String locale);
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java

@@ -4,6 +4,8 @@ import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -14,5 +16,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SfcMapper extends BaseMapper<Sfc> {
-
+    /**
+     * 获取资源上活动的sfc
+     */
+    List<Sfc> getSfcListByResrceBO(String resrceBO);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java

@@ -6,6 +6,8 @@ import com.foreverwin.mesnac.meapi.model.WorkCenter;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -17,4 +19,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WorkCenterMapper extends BaseMapper<WorkCenter> {
     IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter);
+
+    List<WorkCenter> getWorkShopList(@Param("site")String site, @Param("locale")String locale);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java

@@ -30,4 +30,9 @@ public interface SfcService extends IService<Sfc> {
      * 查询工单下生产批次
      */
     List<Sfc> getSfcListByShopOrderBo(String shopOrderBo);
+
+    /**
+     * 获取资源上活动的sfc
+     */
+    List<Sfc> getSfcListByResrceBO(String resrceBO);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java

@@ -27,4 +27,6 @@ public interface WorkCenterService extends IService<WorkCenter> {
     List<WorkCenter> selectList(WorkCenter workCenter);
 
     IPage workCenterlist(IPage page,String workCenter);
+
+    List<WorkCenter> getWorkShopList();
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java

@@ -51,5 +51,11 @@ public class SfcServiceImpl extends ServiceImpl<SfcMapper, Sfc> implements SfcSe
         return super.list(queryWrapper);
     }
 
+    @Override
+    public List<Sfc> getSfcListByResrceBO(String resrceBO) {
+        List<Sfc> sfc=sfcMapper.getSfcListByResrceBO(resrceBO);
+        return sfc;
+    }
+
 
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java

@@ -8,6 +8,7 @@ import com.foreverwin.mesnac.meapi.model.WorkCenter;
 import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper;
 import com.foreverwin.mesnac.meapi.service.WorkCenterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,4 +49,10 @@ public class WorkCenterServiceImpl extends ServiceImpl<WorkCenterMapper, WorkCen
         String site = CommonMethods.getSite();
         return workCenterMapper.workCenterlist(page,site, workCenter);
     }
+
+    @Override
+    public List<WorkCenter> getWorkShopList() {
+        String site = CommonMethods.getSite();
+        return workCenterMapper.getWorkShopList(site, LocaleContextHolder.getLocale().getLanguage());
+    }
 }

meapi/src/main/resources/mapper/OperationMapper.xml

@@ -612,5 +612,12 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="selectOperationBySfcBo" resultMap="BaseResultMap">
+        SELECT OP.HANDLE, OP.OPERATION,OT.DESCRIPTION FROM SFC_ROUTING SR
+        JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO
+        JOIN  SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO
+        JOIN OPERATION OP  ON 'OperationBO:'|| OP.SITE ||','|| OP.OPERATION||',#'=SS.OPERATION_BO
+        LEFT JOIN OPERATION_T OT ON OP.HANDLE = OT.OPERATION_BO AND OT.LOCALE = #{locale}
+        WHERE SR.SFC_BO =#{sfcBo} AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
+    </select>
 </mapper>

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -622,5 +622,16 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="getSfcListByResrceBO" resultMap="BaseResultMap">
+        SELECT S.SFC
+        FROM RESRCE RES
+        INNER JOIN SFC_IN_WORK IW ON IW.RESOURCE_BO = RES.HANDLE
+        INNER JOIN SFC_STEP SS ON SS.HANDLE = IW.SFC_STEP_BO
+        INNER JOIN SFC_ROUTER SRO ON SS.SFC_ROUTER_BO = SRO.HANDLE
+        INNER JOIN SFC_ROUTING SR ON SRO.SFC_ROUTING_BO = SR.HANDLE
+        INNER JOIN SFC S ON SR.SFC_BO = S.HANDLE
+        INNER JOIN STATUS ST ON ST.HANDLE = S.STATUS_BO AND ST.STATUS ='403'
+        WHERE RES.HANDLE = #{resrceBO}
+        ORDER BY IW.DATE_STARTED DESC
+    </select>
 </mapper>

meapi/src/main/resources/mapper/WorkCenterMapper.xml

@@ -480,5 +480,10 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="getWorkShopList" resultMap="BaseResultMap" >
+        SELECT WC.WORK_CENTER, CT.DESCRIPTION
+        FROM WORK_CENTER WC
+        INNER JOIN WORK_CENTER_T CT ON CT.WORK_CENTER_BO = WC.HANDLE AND CT.LOCALE = #{locale}
+        WHERE WC.WC_CATEGORY = 'LEVEL4' AND WC.SITE = #{site}
+    </select>
 </mapper>

production/pom.xml

@@ -18,6 +18,29 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>meapi</artifactId>
+        </dependency>
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.15</version>
+        </dependency>
+        <!---->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
 </project>