diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index 1388062..345e305 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -1053,6 +1053,15 @@ public class BaseServiceImpl implements BaseService { responseData.setCode("500"); return responseData; } + ProductionLineData checkIn=new ProductionLineData(); + checkIn.setProLineNo(inData.getProLineNo()); + checkIn.setSite(inData.getSite()); + List checkProductionLine = baseMapper.getProLineNoDetail(checkIn); + if(checkProductionLine.size()==0){ + responseData.setMsg("该生产线编码不存在!"); + responseData.setCode("500"); + return responseData; + } List list=baseMapper.checkAccessSite(inData.getSite(),inData.getUser()); if(list.size()==0){ responseData.setMsg("角色没有该工厂的权限!"); @@ -1061,7 +1070,7 @@ public class BaseServiceImpl implements BaseService { } List list2=baseMapper.checkWorkCenter(inData); if(list2.size()!=0){ - responseData.setMsg("该生产线已经存在!"); + responseData.setMsg("该加工中心已经存在!"); responseData.setCode("500"); return responseData; } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java index f66b0c2..bc7af49 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java @@ -31,6 +31,18 @@ public class ProductionReportServiceImpl implements ProductionReportService { @Override public ResponseData saveProductionLineOperatorRegistration(OperatorData inData){ ResponseData responseData = new ResponseData(); + if("Y".equals(inData.getfQCFlag())){ + WorkCenterData checkWorkCenterNo=new WorkCenterData(); + checkWorkCenterNo.setSite(inData.getSite()); + checkWorkCenterNo.setWorkCenterNo(inData.getWorkCenterNo()); + List checkResult = productionReportMapper.getWorkCenterDetail(checkWorkCenterNo); + if (checkResult.size()==0){ + responseData.setMsg("该加工中心不存在!"); + responseData.setCode("500"); + return responseData; + } + } + if (inData.getAdd()==0){ List list3=baseMapper.checkSiteId(inData.getSite()); if(list3.size()==0){