diff --git a/src/main/java/com/heai/modules/app/entity/SoBomData.java b/src/main/java/com/heai/modules/app/entity/SoBomData.java index 4cb8eba..9dafe1a 100644 --- a/src/main/java/com/heai/modules/app/entity/SoBomData.java +++ b/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; } diff --git a/src/main/java/com/heai/modules/board/controller/BoardController.java b/src/main/java/com/heai/modules/board/controller/BoardController.java index afead63..a6d4f17 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/src/main/java/com/heai/modules/board/controller/BoardController.java @@ -332,8 +332,24 @@ public class BoardController { List resultList = boardService.getStockPrintListHunlian(); List 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 resultList8 = boardService.getStockPrintListHunlianReturn(); - return R.ok().put("rows", resultList).put("rows2", resultList2).put("rows8", resultList8); + return R.ok().put("rows8", resultList8); } /** * @Description 沟通看板 diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java index 9c0a4a8..b541c83 100644 --- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java +++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java @@ -1030,4 +1030,6 @@ public interface DailyPlanMapper { SfdcTimeHistSOSData getProductTimeHist(SfdcCancel inData); List getTimeHistListForSfdc(SfdcTimeHistSOSData inData); + + List checkSPBOMIsIssure(SOScheduledRoutingOutData inData); } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index de89e6a..d7761d0 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/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 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 //----------检查前道工序是否报工----------------- diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index b4416be..da9fed3 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -672,7 +672,7 @@ + + \ No newline at end of file