报告不良的代码

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -644,8 +644,53 @@ public class ScheduleController {
                 .put("success", true)
                 .put("msg", "操作成功!");
     }
-    //创建新卷的功能
-    //
+
+    /**
+     * TODO 查询派工单的不良记录
+     * @author LR
+     * @date 2021/12/28 15:09
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "getScheduleDefectHist")
+    public R getScheduleDefectHist(@RequestBody SearchScheduleData inData){
+        List<SfdcDefectData> resultList = scheduleService.getScheduleDefectHist(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!")
+                .put("rows", resultList);
+    }
+
+    /**
+     * TODO 检查不良代码
+     * @author LR
+     * @date 2021/12/28 11:31
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "checkDefectCode")
+    public R checkDefectCode(@RequestBody SearchScheduleData inData){
+        Map<String, Object> resultMap = scheduleService.checkDefectCode(inData);
+        return R.ok()
+                .put("resultMap", resultMap);
+    }
+
+
+    /**
+     * TODO 报告不良代码
+     * @author LR
+     * @date 2021/12/28 16:47
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "reportDefectCode")
+    public R reportDefectCode(@RequestBody SearchScheduleData inData){
+        scheduleService.reportDefectCode(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("success", true)
+                .put("msg", "操作成功!");
+    }
     //
     //创建新卷的功能
     //

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -64,6 +64,8 @@ public class SearchScheduleData extends BaseData {
     private String reportDate;//报告的年月日
     private String reportTime;//报告的时分
     private Float totalTime;//报告的时间
+    private String defectCode;//不良代码
+    private Float defectQty;//不良的数量
 
     public SearchScheduleData() {
     }
@@ -355,4 +357,20 @@ public class SearchScheduleData extends BaseData {
     public void setTotalTime(Float totalTime) {
         this.totalTime = totalTime;
     }
-}
+
+    public String getDefectCode() {
+        return defectCode;
+    }
+
+    public void setDefectCode(String defectCode) {
+        this.defectCode = defectCode;
+    }
+
+    public Float getDefectQty() {
+        return defectQty;
+    }
+
+    public void setDefectQty(Float defectQty) {
+        this.defectQty = defectQty;
+    }
+}

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -350,4 +350,13 @@ public interface ScheduleMapper {
      * @return java.lang.Integer
      **/
     Integer countSfdcMaterialHistByRollNo(SearchScheduleData inData);
+
+    /**
+     * TODO 查询派工单的不良记录数据
+     * @author LR
+     * @date 2021/12/28 15:11
+     * @param inData
+     * @return java.util.List<com.gaotao.modules.schedule.data.SfdcDefectData>
+     **/
+    List<SfdcDefectData> getScheduleDefectHist(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -355,4 +355,31 @@ public interface ScheduleService {
      * @return void
      **/
     void reportDownTime(SearchScheduleData inData);
+
+    /**
+     * TODO 检查不良代码
+     * @author LR
+     * @date 2021/12/28 11:31
+     * @param inData
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    Map<String, Object> checkDefectCode(SearchScheduleData inData);
+
+    /**
+     * TODO 查询派工单的不良记录
+     * @author LR
+     * @date 2021/12/28 15:09
+     * @param inData
+     * @return java.util.List<com.gaotao.modules.schedule.data.SfdcDefectData>
+     **/
+    List<SfdcDefectData> getScheduleDefectHist(SearchScheduleData inData);
+
+    /**
+     * TODO 报告不良代码
+     * @author LR
+     * @date 2021/12/28 16:47
+     * @param inData
+     * @return void
+     **/
+    void reportDefectCode(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1047,5 +1047,89 @@ public class ScheduleServiceImpl implements ScheduleService {
         procedureMapper.execProduceData("reportDownTime", params);
     }
 
+    @Override
+    public List<SfdcDefectData> getScheduleDefectHist(SearchScheduleData inData) {
+        return scheduleMapper.getScheduleDefectHist(inData);
+    }
+
+    @Override
+    public Map<String, Object> checkDefectCode(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String defectCode = inData.getDefectCode();
+        Map<String, Object> resultMap = this.checkDefectCode(site, orderNo, itemNo, seqNo, rollNo, defectCode);
+        //判断是否检验成功
+        String code = String.valueOf(resultMap.get("resultCode"));
+        if (!"200".equalsIgnoreCase(code)){
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw  new RRException(msg);
+        }
+        return resultMap;
+    }
+
+    /**
+     * TODO 校验不良代码
+     * @author LR
+     * @date 2021/12/28 14:40
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> checkDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(defectCode);
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkDefectCode", params);
+        return  resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void reportDefectCode(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String defectCode = inData.getDefectCode();
+        Float defectQty = inData.getDefectQty();
+        String username = inData.getOperatorId();
+        String reportDate = inData.getReportDate();
+
+        //调用检查方法
+        this.checkDefectCode(inData);
+
+        //执行报告不良的方法
+        this.reportDefectCode(site, orderNo, itemNo, seqNo, rollNo, defectCode, defectQty, username, reportDate);
+    }
+
+    /**
+     * TODO 执行报告不良代码的存储过程
+     * @author LR
+     * @date 2021/12/28 16:56
+     * @return void
+     **/
+    public void reportDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode, Float defectQty,
+                                 String username, String reportDate) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(defectCode);
+        params.add(defectQty);
+        params.add(username);
+        params.add(reportDate);
+        procedureMapper.execProduceData("reportDefectCode-", params);
+    }
+
 
 }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -885,6 +885,28 @@
         ORDER BY smh.HistSeqNo DESC
     </select>
 
+    <!--查询派工单的不良记录-->
+    <select id="getScheduleDefectHist" parameterType="SearchScheduleData" resultType="SfdcDefectData">
+        SELECT sdh.Site site, sdh.OrderNo orderNo, sdh.ItemNo itemNo, sdh.SeqNo seqNo, sdh.HistSeqNo histSeqNo, sdh.RollNo rollNo,
+        sdh.ReportDate reportedDate, sdh.Reportedby reportedBy, sdh.DefectCode defectCode, sdh.DefectQty defectQty, sdh.Remark remark,
+        (SELECT idc.DefectDesc FROM InspectionDefectCode idc WHERE idc.Site = sdh.Site AND idc.DefectCode = sdh.DefectCode) defectDesc
+        FROM SFDC_DefectHist sdh
+        <where>
+            <if test="site != null and site != ''">
+                AND sdh.Site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND sdh.OrderNo = #{orderNo}
+            </if>
+            <if test="itemNo != null and itemNo != ''">
+                AND sdh.ItemNo = #{itemNo}
+            </if>
+            <if test="seqNo != null and seqNo != ''">
+                AND sdh.SeqNo = #{seqNo}
+            </if>
+        </where>
+        ORDER BY sdh.HistSeqNo DESC
+    </select>
 
 
 </mapper>