0412更新

src/main/java/com/heai/modules/app/entity/SoBomData.java

@@ -43,4 +43,5 @@ public class SoBomData {
     private String partDescSpec;
 
     private String umid;
+    private Double qty;
 }

src/main/java/com/heai/modules/board/controller/BoardController.java

@@ -332,8 +332,24 @@ public class BoardController {
 
         List<StockPrintData> resultList = boardService.getStockPrintListHunlian();
         List<StockPrintData> resultList2 = boardService.getStockPrintListCaiGou(ip);
+
+        return R.ok().put("rows", resultList).put("rows2", resultList2);
+    }
+    /**
+     * @Description TODO
+     * @Title getStockPrintList
+     * @param
+     * @author rq
+     * @date 2022/9/25 20:46
+     * @return R
+     * @throw
+     */
+    @GetMapping("/getStockPrintListHunlianReturn/{ip}")
+    // @PostMapping("/getStockPrintListHunlian")
+    public R getStockPrintListHunlianReturn(@PathVariable("ip") String ip) {
+
         List<StockPrintData> resultList8 = boardService.getStockPrintListHunlianReturn();
-        return R.ok().put("rows", resultList).put("rows2", resultList2).put("rows8", resultList8);
+        return R.ok().put("rows8", resultList8);
     }
     /**
      * @Description 沟通看板

src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@@ -1030,4 +1030,6 @@ public interface DailyPlanMapper {
     SfdcTimeHistSOSData getProductTimeHist(SfdcCancel inData);
 
     List<SfdcTimeHistSOSData> getTimeHistListForSfdc(SfdcTimeHistSOSData inData);
+
+    List<SoBomData> checkSPBOMIsIssure(SOScheduledRoutingOutData inData);
 }

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1309,6 +1309,16 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if(checkFirstItem.isEmpty() &&"N".equals(checkUserSeqNo.get(0).getMatIssueflag())){
             throw new RuntimeException("派工单是首道工序且没有发料！请先发料！");
         }
+        //----------------------SP产品  即硫化派工单检验金属件和橡胶是否都发料-------------------------------
+        if(checkFirstItem.isEmpty()&& checkUserSeqNo.get(0).getPartNo().startsWith("SP")){
+            List<SoBomData> checkSPBOMIsIssure=dailyPlanMapper.checkSPBOMIsIssure(checkUserSeqNo.get(0));
+            for (int i = 0; i < checkSPBOMIsIssure.size(); i++) {
+                if(checkSPBOMIsIssure.get(i).getQty()<=0){
+                    throw new RuntimeException(checkSPBOMIsIssure.get(i).getComponentPartNo()+" 物料没有发料！请先发料！");
+                }
+            }
+        }
+
         //----------检查是否第一道工序 是否发料-----------------end
 
         //----------检查前道工序是否报工-----------------

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -672,7 +672,7 @@
     </update>
 
       <select id="checkFirstItem" resultType="SOScheduledRoutingOutData">
-        select site,OrderNo,ItemNo from SORouting where orderNo=#{orderNo} and site=#{site}  and #{itemNo} >itemNo order by itemNo desc
+        select site,OrderNo,ItemNo,PartNo from SORouting where orderNo=#{orderNo} and site=#{site}  and #{itemNo} >itemNo order by itemNo desc
       </select>
 
     <select id="searchSeqNo" resultType="SOScheduledRoutingOutData">
@@ -1488,4 +1488,12 @@
 
 
     </select>
+
+    <select id="checkSPBOMIsIssure" resultType="com.heai.modules.app.entity.SoBomData">
+        select a.ComponentPartNo, ISNULL(Sum( case when b.Direction='-' then TransQty else TransQty*(-1.0) end), 0)  as qty
+
+        from SOBOM a left join  TransDetail b on a.site=b.site and a.ComponentPartNo=b.PartNo and b.TransNo like 'SI%'
+        and OrderRef3=convert(varchar(20),#{seqNo})  and (a.ComponentPartNo like 'RC%' or a.ComponentPartNo like 'SC%' or a.ComponentPartNo like 'VP%' )
+        group by a.ComponentPartNo
+    </select>
  </mapper>