diff --git a/src/main/java/com/heai/modules/production/controller/InspectController.java b/src/main/java/com/heai/modules/production/controller/InspectController.java index 5ec41b3..be8f98f 100644 --- a/src/main/java/com/heai/modules/production/controller/InspectController.java +++ b/src/main/java/com/heai/modules/production/controller/InspectController.java @@ -34,6 +34,12 @@ public class InspectController { List list =inspectService.getInspectData(inData); return R.ok().put("rows", list).put("total",list.size()); } + //入参只要site+ transNo + @PostMapping("/getInspectPrintForQMS") + public R getInspectPrintForQMS(@RequestBody SOOPInspectData inData){ + SOScheduledRoutingOutData result =inspectService.getInspectPrintForQMS(inData); + return R.ok().put("row", result); + } /** * @Description 保存检验并返回标签 diff --git a/src/main/java/com/heai/modules/production/service/InspectService.java b/src/main/java/com/heai/modules/production/service/InspectService.java index 7ffe7f1..be92851 100644 --- a/src/main/java/com/heai/modules/production/service/InspectService.java +++ b/src/main/java/com/heai/modules/production/service/InspectService.java @@ -17,7 +17,7 @@ public interface InspectService { * @throw */ List getInspectData(SOOPInspectData inData); - + SOScheduledRoutingOutData getInspectPrintForQMS(SOOPInspectData inData); /** * @Description 保存检验并返回标签 * @Title inspectSave diff --git a/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java index 2435f43..a70967a 100644 --- a/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java @@ -34,7 +34,14 @@ public class InspectServiceImpl implements InspectService { public List getInspectData(SOOPInspectData inData){ return soScheduledListMapper.getInspectData(inData); } - + @Override + public SOScheduledRoutingOutData getInspectPrintForQMS(SOOPInspectData inData){ + List inList=soScheduledListMapper.getInspectData(inData); + if(inList.isEmpty()){ + throw new RuntimeException("关联实验室单据不存在!"); + } + return inspectPrint(inList.get(0)); + } @Override @Transactional public SOScheduledRoutingOutData inspectSave(SOOPInspectData inData){ @@ -74,7 +81,6 @@ public class InspectServiceImpl implements InspectService { } @Override - @Transactional public SOScheduledRoutingOutData inspectPrint(SOOPInspectData inData){ if("I".equals(inData.getToTypeFlagDb())){ SOScheduledRoutingOutData searchDate=new SOScheduledRoutingOutData();