From 0ea1db37c6da3b99eee7ecaa93a2de6bed53a36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 29 Jul 2021 14:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E8=87=AA?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/pom.xml                               |  4 ++
 .../controller/AbnormalBillController.java    | 19 +++++++++
 .../anomaly/mapper/AbnormalBillMapper.java    |  4 +-
 .../service/impl/AbnormalBillServiceImpl.java | 10 +++++
 .../resources/mapper/AbnormalBillMapper.xml   | 41 +++++++++++++++++++
 .../mesnac/meapi/mapper/NcCodeMapper.java     |  4 ++
 .../mesnac/meapi/service/NcCodeService.java   |  3 ++
 .../meapi/service/impl/NcCodeServiceImpl.java |  8 ++++
 .../main/resources/mapper/NcCodeMapper.xml    | 16 ++++++++
 9 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/anomaly/pom.xml b/anomaly/pom.xml
index 47f0bbd1..9afd3d68 100644
--- a/anomaly/pom.xml
+++ b/anomaly/pom.xml
@@ -76,6 +76,10 @@
             <artifactId>commons-net</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>quality</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index e90edfc3..db7f0d2d 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -7,8 +7,10 @@ import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
 import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
+import com.foreverwin.mesnac.anomaly.service.ProductionScrap;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
+import com.foreverwin.mesnac.meapi.service.NcCodeService;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
@@ -37,6 +39,12 @@ public class AbnormalBillController {
     @Autowired
     private FileUploadedService fileUploadedService;
 
+    @Autowired
+    private ProductionScrap productionScrap;
+
+    @Autowired
+    private NcCodeService ncCodeService;
+
 
     /**
     * 根据id查询
@@ -334,4 +342,15 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.anomalyReveseRepair(abnormalBill,abnormalBillDispose));
     }
 
+    @GetMapping("/getScrapDtoBysfc")
+    public R getScrapDtoBysfc(String site,String sfc){
+        return R.ok(productionScrap.getScrapDtoBysfc(site,sfc));
+    }
+
+    @GetMapping("/findNcCodeDescriptionByNcCode")
+    public R findNcCodeDescriptionByNcCode(String ncCode){
+        return R.ok(ncCodeService.findNcCodeDescriptionByNcCode(ncCode));
+    }
+
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
index daa9fbe1..8a4f1c9e 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
+import com.foreverwin.mesnac.anomaly.dto.ScrapDto;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -31,6 +32,7 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
 
     List<AbnormalBill> findCountBySfc(@Param("site")String site, @Param("type")String type, @Param("sfc")String sfc, @Param("status")List<String> status);
 
+    Integer findAbnormalMethodBySFC(@Param("site")String site,@Param("sfc")String sfc);
 
-
+    List<ScrapDto> findScrapDtoBySfc(@Param("site")String site,@Param("sfc")String sfc);
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 65fe6105..56d6b14f 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -22,6 +22,7 @@ import com.foreverwin.mesnac.meapi.mapper.*;
 import com.foreverwin.mesnac.meapi.model.*;
 import com.foreverwin.mesnac.meapi.service.*;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.mesnac.quality.service.SelfReportService;
 import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -131,6 +132,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Autowired
     private AbnormalMessageService abnormalMessageService;
 
+    @Autowired
+    private SelfReportService selfReportService;
 
 
     @Override
@@ -212,6 +215,13 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes);
             abnormalBill.setNcCode(ncCodes.substring(0,ncCodes.length() - 1));
         }
+        //判断是否是用户自报
+        if(!StringUtil.isBlank(abnormalBill.getInspector())){
+            abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(abnormalBill.getSite(),abnormalBill.getObjectBo()));
+            selfReportService.updateState(abnormalBill.getObjectBo(),Constants.STATE_CONFIRM);
+        }
+
+
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
         //发送消息
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 57024160..79e6ec35 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -58,6 +58,17 @@
         <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
     </resultMap>
 
+    <resultMap id="scrapDto" type="com.foreverwin.mesnac.anomaly.dto.ScrapDto" >
+        <result column="SFC" property="sfc"/>
+        <result column="STATUS" property="status"/>
+        <result column="OPERATION" property="operation"/>
+        <result column="RESRCE" property="resrce"/>
+        <result column="SHOP_ORDER" property="shopOrder"/>
+        <result column="ITEM" property="item"/>
+        <result column="ROUTER" property="router"/>
+        <result column="BOM" property="bom"/>
+    </resultMap>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
@@ -957,5 +968,35 @@
         </where>
     </select>
 
+    <select id="findAbnormalMethodBySFC" resultType="int">
+        SELECT COUNT(*)
+        FROM Z_ABNORMAL_BILL_VIEW zabv
+        WHERE  SITE = #{site} AND  SFC = #{sfc} AND ABNORMAL_METHOD = 'C'
+    </select>
+
+    <select id="findScrapDtoBySfc" resultMap="scrapDto">
+        SELECT   S.SFC SFC, CASE WHEN S2.STATUS = '401' THEN '新建'
+                                 WHEN S2.STATUS = '402' THEN '排队'
+                                 WHEN S2.STATUS = '403' THEN '活动'
+                                 END STATUS,
+                 SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION,
+                 ZSD.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER,
+                 CASE WHEN I.ITEM != 'NULL'  THEN I.ITEM || '/' || I.REVISION END ITEM,
+                 CASE WHEN R.ROUTER != 'NULL'  THEN R.ROUTER || '/' || R.REVISION END ROUTER ,
+                 CASE WHEN B.BOM != 'NULL'  THEN B.BOM || '/' || B.REVISION END BOM
+        FROM SFC S
+                 INNER JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
+                 INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE
+                 INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
+                 INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
+                 INNER  JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
+                 LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE
+                 LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
+                 LEFT JOIN ROUTER R ON R.HANDLE  = ZSD.ROUTER_BO
+                 LEFT JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO
+        <where>
+            S.SITE = #{site} AND S.SFC = #{sfc}
+        </where>
+    </select>
 
 </mapper>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
index 5cc7b576..bff2bf4b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
@@ -3,6 +3,7 @@ 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.dto.NcCodeDto;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.foreverwin.mesnac.meapi.model.NcGroup;
 import org.apache.ibatis.annotations.Param;
@@ -36,4 +37,7 @@ public interface NcCodeMapper extends BaseMapper<NcCode> {
     Integer checkNcCode(@Param("NcCodeList")List<String> ncCodes,@Param("site")String site,@Param("category")String category);
 
     List<NcCode> findNcCodeByNcGroup(@Param("ncGroup")NcGroup ncGroup);
+
+
+    List<NcCodeDto> findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String ncCode);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
index e1814694..a0beafd4 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
@@ -2,6 +2,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.dto.NcCodeDto;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.mesnac.meapi.model.NcGroup;
@@ -35,4 +36,6 @@ public interface NcCodeService extends IService<NcCode> {
     IPage selectPageByNcGroup(Page<NcGroup> pagePlus, String globalQuery, String ncGroup);
 
     List<NcCode> findNcCodeByNcGroup(NcGroup ncGroup);
+
+    List<NcCodeDto> findNcCodeDescriptionByNcCode(String ncCode);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
index cb076984..fa1e9033 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
@@ -4,6 +4,7 @@ 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.dto.NcCodeDto;
 import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.foreverwin.mesnac.meapi.model.NcGroup;
@@ -81,5 +82,12 @@ public class NcCodeServiceImpl extends ServiceImpl<NcCodeMapper, NcCode> impleme
         return ncCodeMapper.findNcCodeByNcGroup(ncGroup);
     }
 
+    @Override
+    public List<NcCodeDto> findNcCodeDescriptionByNcCode(String ncCode) {
+        String site = CommonMethods.getSite();
+        String locale = LocaleContextHolder.getLocale().getLanguage();
+        return ncCodeMapper.findNcCodeDescriptionByNcCode(site,locale,ncCode);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml
index 20f2d09e..d389af87 100644
--- a/meapi/src/main/resources/mapper/NcCodeMapper.xml
+++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml
@@ -16,6 +16,11 @@
         <result column="DESCRIPTION" property="description"/>
     </resultMap>
 
+    <resultMap id="ncCodeDto" type="com.foreverwin.mesnac.meapi.dto.NcCodeDto">
+        <result column="NG_GROUP" property="ngGroup"/>
+        <result column="NG_DESCRIPTION" property="ngDescription"/>
+    </resultMap>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         HANDLE, CHANGE_STAMP, SITE, NC_CODE, STATUS_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME, NC_CATEGORY, DPMO_CATEGORY_BO,DESCRIPTION
@@ -415,4 +420,15 @@
 
         </where>
     </select>
+
+    <select id="findNcCodeDescriptionByNcCode" resultMap="ncCodeDto">
+        SELECT NC.NC_CODE NC_CODE, NCT.DESCRIPTION DESCRIPTION,NG.NC_GROUP NG_GROUP,NG.DESCRIPTION NG_DESCRIPTION
+        FROM NC_CODE NC
+        LEFT JOIN NC_CODE_T NCT ON NC.HANDLE = NCT.NC_CODE_BO AND NCT.LOCALE = #{locale}
+        LEFT JOIN NC_GROUP_MEMBER NGM ON NGM.NC_CODE_OR_GROUP_GBO = NC.HANDLE
+        LEFT JOIN NC_GROUP NG ON NG.HANDLE = NGM.NC_GROUP_BO
+        <where>
+            NC.SITE = #{site} AND NC.NC_CODE IN UPPER(#{ncCode})
+        </where>
+    </select>
 </mapper>