自报

common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java

@@ -106,6 +106,6 @@ public interface Constants {
     //异常单的类型
     String ABNORMAL_QUALITY = "Z";
     String ABNORMAL_OTHER = "Q";
-    String ABNORMAL_SERVICE = "S";
+    String ABNORMAL_RESRCE = "S";
 
 }

common/src/main/resources/mapper/ProdReadyTaskMapper.xml

@@ -664,21 +664,23 @@
     </select>
 
     <select id="getItemDetail" resultType="map">
-        SELECT zsd.OPERATION||'/'||zsd.STEP_ID OPERATION_STEP_ID, I.ITEM,0 RECEIVE_QTY,
+        SELECT zsd.OPERATION||'/'||zsd.STEP_ID OPERATION_STEP_ID, I.ITEM,SUM(INV.QTY_ON_HAND) RECEIVE_QTY,
         ITT.DESCRIPTION ITEM_DESC,S.QTY * BC.QTY NEED_QTY
         FROM Z_SFC_DISPATCH zsd
         INNER JOIN SFC S ON S.SFC = zsd.SFC AND S.SITE = zsd.SITE
         INNER JOIN SFC_BOM SB ON SB.SFC_BO = S.HANDLE
         INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
         INNER JOIN ITEM I ON I.HANDLE = BC.COMPONENT_GBO
+        LEFT JOIN INVENTORY INV ON I.HANDLE=Inv.ITEM_BO
         LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.HANDLE = I.HANDLE AND CF2."ATTRIBUTE" = 'ACCESSORY_TYPE'
-        INNER JOIN ITEM_T ITT ON ITT.ITEM_BO = I.HANDLE AND ITT.LOCALE =#{locale}
+        LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = I.HANDLE AND ITT.LOCALE =#{locale}
         INNER JOIN BOM_OPERATION BO ON BO.BOM_COMPONENT_BO = BC.HANDLE
         INNER JOIN OPERATION O ON o.OPERATION=zsd.OPERATION AND o.SITE=ZSD.SITE
         INNER JOIN CUSTOM_FIELDS CF ON CF.HANDLE = BC.HANDLE AND CF."ATTRIBUTE" = 'STEP_ID' AND CF.VALUE = zsd.STEP_ID
         AND BO.OPERATION_BO = 'OperationBO:'||S.SITE||','||zsd.OPERATION||',#'
         WHERE ZSD.SITE=#{site} AND ZSD.DISPATCH_NO=#{dispatchNo}
         AND (CF2.VALUE IS NULL OR cf2.VALUE='0')
+        GROUP BY zsd.OPERATION,zsd.STEP_ID,I.ITEM, ITT.DESCRIPTION,S.QTY,BC.QTY
     </select>
     <select id="getToolDetail" resultType="map">
         SELECT zsd.OPERATION||'/'||zsd.STEP_ID OPERATION_STEP_ID, I.ITEM,

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

@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.meapi.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.NcCode;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -24,6 +25,13 @@ public class NcCodeController {
     @Autowired
     public NcCodeService ncCodeService;
 
+    @ResponseBody
+    @GetMapping("/selectPageByNcGroup")
+    public R selectPageByNcGroup(FrontPage<NcGroup> frontPage, String ncGroup){
+        IPage result;
+        result = ncCodeService.selectPageByNcGroup(frontPage.getPagePlus(), frontPage.getGlobalQuery(),ncGroup);
+        return R.ok(result);
+    }
     /**
     * 根据id查询
     *

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

@@ -24,6 +24,13 @@ public class NcGroupController {
     @Autowired
     public NcGroupService ncGroupService;
 
+    @ResponseBody
+    @GetMapping("/selectPageByOperation")
+    public R selectPageByOperation(FrontPage<NcGroup> frontPage, String operation){
+        IPage result;
+        result = ncGroupService.selectPageByOperation(frontPage.getPagePlus(), frontPage.getGlobalQuery(),operation);
+        return R.ok(result);
+    }
     /**
     * 根据id查询
     *

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

@@ -1,7 +1,10 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.meapi.model.NcCode;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,4 +26,6 @@ public interface NcCodeMapper extends BaseMapper<NcCode> {
                             @Param("ncCode")String ncCode);
 
     List<NcCode> findSecondaryNcByNc(@Param("site")String site,@Param("locale")String locale,@Param("ncCode")String ncCode);
+
+    IPage selectPageByNcGroup(Page<NcGroup> pagePlus,@Param("ncGroupBO") String ncGroupBO,@Param("globalQuery") String globalQuery,@Param("locale") String locale);
 }

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

@@ -1,7 +1,10 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,4 +18,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface NcGroupMapper extends BaseMapper<NcGroup> {
 
+    IPage selectPageByOperation(Page<NcGroup> frontPage, @Param("site") String site, @Param("operationBO") String operationBO,@Param("globalQuery") String globalQuery);
 }

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

@@ -1,8 +1,10 @@
 package com.foreverwin.mesnac.meapi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;
@@ -29,4 +31,6 @@ public interface NcCodeService extends IService<NcCode> {
     List<NcCode> findNcByNG(String messageType,String ncCode);
 
     List<NcCode> findSecondaryNcByNc(String ncCode);
+
+    IPage selectPageByNcGroup(Page<NcGroup> pagePlus, String globalQuery, String ncGroup);
 }

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

@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.meapi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -25,4 +26,6 @@ public interface NcGroupService extends IService<NcGroup> {
     IPage<NcGroup> selectPage(FrontPage<NcGroup> frontPage, NcGroup ncGroup);
 
     List<NcGroup> selectList(NcGroup ncGroup);
+
+    IPage selectPageByOperation(Page<NcGroup> pagePlus, String globalQuery, String operation);
 }

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

@@ -2,12 +2,17 @@ package com.foreverwin.mesnac.meapi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper;
 import com.foreverwin.mesnac.meapi.model.NcCode;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
+import com.sap.me.nonconformance.NCGroupBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
@@ -59,5 +64,15 @@ public class NcCodeServiceImpl extends ServiceImpl<NcCodeMapper, NcCode> impleme
         return ncCodeMapper.findSecondaryNcByNc(site,locale,ncCode);
     }
 
+    @Override
+    public IPage selectPageByNcGroup(Page<NcGroup> pagePlus, String globalQuery, String ncGroup) {
+        String site = CommonMethods.getSite();
+        if (StringUtils.isBlank(ncGroup)) {
+            throw new BaseException("不良代码组不能为空");
+        }
+        String ncGroupBO = new NCGroupBOHandle(site, ncGroup).getValue();
+        return ncCodeMapper.selectPageByNcGroup(pagePlus, ncGroupBO, globalQuery,LocaleContextHolder.getLocale().getLanguage());
+    }
+
 
 }

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

@@ -1,17 +1,23 @@
 package com.foreverwin.mesnac.meapi.service.impl;
 
-import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.NcGroup;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
 import com.foreverwin.mesnac.meapi.service.NcGroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
-import org.springframework.stereotype.Service;
+import com.foreverwin.modular.core.exception.BaseException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.sap.me.productdefinition.OperationBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -42,5 +48,15 @@ public class NcGroupServiceImpl extends ServiceImpl<NcGroupMapper, NcGroup> impl
         return super.list(queryWrapper);
     }
 
+    @Override
+    public IPage selectPageByOperation(Page<NcGroup> frontPage, String globalQuery, String operation) {
+        String site = CommonMethods.getSite();
+        if (StringUtils.isBlank(operation)) {
+            throw new BaseException("工序不能为空");
+        }
+        String operationBO = new OperationBOHandle(site, operation, "#").getValue();
+        return ncGroupMapper.selectPageByOperation(frontPage, site, operationBO, globalQuery);
+    }
+
 
 }

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

@@ -373,4 +373,13 @@
         WHERE nc.NC_CODE = #{ncCode} AND nc.SITE = #{site}
     </select>
 
+    <select id="selectPageByNcGroup" resultMap="BaseResultMap">
+        SELECT nc.NC_CODE,nct.DESCRIPTION FROM NC_CODE nc
+        LEFT JOIN NC_CODE_T NCT ON nc.HANDLE=NCT.NC_CODE_BO AND NCT.LOCALE=#{locale}
+        JOIN NC_GROUP_MEMBER NGM ON nc.HANDLE=NGM.NC_CODE_OR_GROUP_GBO
+        WHERE NGM.NC_GROUP_BO = #{ncGroupBO}
+        <if test="globalQuery!=null and globalQuery!=''">
+            AND (nc.NC_CODE LIKE '%${globalQuery}%' or nct.DESCRIPTION  LIKE '%${globalQuery}%')
+        </if>
+    </select>
 </mapper>

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

@@ -342,5 +342,12 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="selectPageByOperation" resultMap="BaseResultMap">
+        SELECT DISTINCT ng.NC_GROUP,NG.DESCRIPTION FROM NC_GROUP ng
+        LEFT JOIN  NC_GROUP_VALID_OPER ngvo ON ng.HANDLE=ngvo.NC_GROUP_BO
+        WHERE SITE=#{site} AND (ng.VALID_AT_ALL_OPERATIONS='true' OR ngvo.OPERATION_BO=#{operationBO})
+        <if test="globalQuery!=null and globalQuery!=''">
+            AND (ng.NC_GROUP LIKE '%${globalQuery}%' or NG.DESCRIPTION LIKE '%${globalQuery}%')
+        </if>
+    </select>
 </mapper>