diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 96c2d065..77e05505 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -48,13 +48,13 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class ProdReadyTaskServiceImpl extends ServiceImpl implements ProdReadyTaskService { - public static final String P01="P01"; - public static final String P02="P02"; - public static final String P03="P03"; - public static final String STATUS_NEW="NEW"; - public static final String STATUS_DOING="DOING"; - public static final String STATUS_FINISH="FINISH"; - public static final String STATUS_CANCEL="CANCEL"; + public static final String P01 = "P01"; + public static final String P02 = "P02"; + public static final String P03 = "P03"; + public static final String STATUS_NEW = "NEW"; + public static final String STATUS_DOING = "DOING"; + public static final String STATUS_FINISH = "FINISH"; + public static final String STATUS_CANCEL = "CANCEL"; @Autowired private ProdReadyTaskMapper prodReadyTaskMapper; @@ -68,6 +68,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ProdReadyTask prodReadyTask) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -83,122 +84,134 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl sfcDispatchDtoList) { + public void createTask(List sfcDispatchDtoList) { //根据站点及派工BO查询数据 String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); - for (SfcDispatchDto sfcDispatchDto: sfcDispatchDtoList) { - String sfcDispatchBO=sfcDispatchDto.getHandle(); - String dispatchStatus=sfcDispatchDto.getDispatchStatus(); - String shopOrder=sfcDispatchDto.getShopOrder(); - String sfc=sfcDispatchDto.getSfc(); - String operation=sfcDispatchDto.getOperation(); - String resrce=sfcDispatchDto.getResrce(); - String stepId=sfcDispatchDto.getStepId(); - String workCenter=sfcDispatchDto.getWorkCenter(); + for (SfcDispatchDto sfcDispatchDto : sfcDispatchDtoList) { + String sfcDispatchBO = sfcDispatchDto.getHandle(); + String dispatchStatus = sfcDispatchDto.getDispatchStatus(); + String shopOrder = sfcDispatchDto.getShopOrder(); + String sfc = sfcDispatchDto.getSfc(); + String operation = sfcDispatchDto.getOperation(); + String resrce = sfcDispatchDto.getResrce(); + String stepId = sfcDispatchDto.getStepId(); + String workCenter = sfcDispatchDto.getWorkCenter(); - ShopOrder byId = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder)); - if (DispatchStatusEnum.RELEASE.getCode().equals(dispatchStatus)) { - ProdReadyTask prodReadyTask=new ProdReadyTask(); - prodReadyTask.setSite(site); - prodReadyTask.setTaskNo(StringUtil.createQUID()); - prodReadyTask.setHandle(HandleEnum.PROD_READY_TASK.getHandle(site,prodReadyTask.getTaskNo())); - prodReadyTask.setSfcDispatchBo(sfcDispatchBO); - prodReadyTask.setShopOrder(shopOrder); - prodReadyTask.setWorkCenter(workCenter); - prodReadyTask.setSfc(sfc); - prodReadyTask.setOperation(operation); - prodReadyTask.setStepId(stepId); - prodReadyTask.setItem(StringUtil.trimHandle(byId.getItemBo())); - prodReadyTask.setResrce(resrce); - prodReadyTask.setCreateUser(user); - prodReadyTask.setCreatedDateTime(LocalDateTime.now()); - prodReadyTask.setModifyUser(user); - prodReadyTask.setModifiedDateTime(LocalDateTime.now()); - List prodReadyTaskDetailList = new ArrayList<>(); + ShopOrder byId = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder)); + if (DispatchStatusEnum.RELEASE.getCode().equals(dispatchStatus)) { + ProdReadyTask prodReadyTask = new ProdReadyTask(); + prodReadyTask.setSite(site); + prodReadyTask.setTaskNo(StringUtil.createQUID()); + prodReadyTask.setHandle(HandleEnum.PROD_READY_TASK.getHandle(site, prodReadyTask.getTaskNo())); + prodReadyTask.setSfcDispatchBo(sfcDispatchBO); + prodReadyTask.setShopOrder(shopOrder); + prodReadyTask.setWorkCenter(workCenter); + prodReadyTask.setSfc(sfc); + prodReadyTask.setOperation(operation); + prodReadyTask.setStepId(stepId); + prodReadyTask.setItem(StringUtil.trimHandle(byId.getItemBo())); + prodReadyTask.setResrce(resrce); + prodReadyTask.setCreateUser(user); + prodReadyTask.setCreatedDateTime(LocalDateTime.now()); + prodReadyTask.setModifyUser(user); + prodReadyTask.setModifiedDateTime(LocalDateTime.now()); + List prodReadyTaskDetailList = new ArrayList<>(); - String sfcBo = HandleEnum.SFC.getHandle(site, sfc); - List bomComponentList = bomComponentService.getSfcBomComponent(sfcBo); - if (!bomComponentList.isEmpty()){ - bomComponentList.forEach(bomComponentDto ->{ - if (bomComponentDto.getOperation().equals(operation)&&bomComponentDto.getStepId().equals(stepId)){ - String accessoryType = bomComponentDto.getAccessoryType(); - //物料P001，校验当前派工单（SFC+工序/步骤）加工是否需要准备物料 - if (accessoryType==null||accessoryType.equals("0")){ - ProdReadyTaskDetail prodReadyTaskDetail=new ProdReadyTaskDetail(); - prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(),P01)); - prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); - prodReadyTaskDetail.setInspectionItem(P01); - prodReadyTaskDetail.setResult(""); - prodReadyTaskDetail.setRemarks(""); - prodReadyTaskDetail.setCreateUser(user); - prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); - prodReadyTaskDetail.setModifyUser(user); - prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); - prodReadyTaskDetailList.add(prodReadyTaskDetail); - }else if (accessoryType.equals("1")){ - //刀具P002，校验当前派工单（SFC+工序/步骤）加工是否需要准备物料 - ProdReadyTaskDetail prodReadyTaskDetail=new ProdReadyTaskDetail(); - prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(),P02)); - prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); - prodReadyTaskDetail.setInspectionItem(P02); - prodReadyTaskDetail.setResult(""); - prodReadyTaskDetail.setRemarks(""); - prodReadyTaskDetail.setCreateUser(user); - prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); - prodReadyTaskDetail.setModifyUser(user); - prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); - prodReadyTaskDetailList.add(prodReadyTaskDetail); + String sfcBo = HandleEnum.SFC.getHandle(site, sfc); + List bomComponentList = bomComponentService.getSfcBomComponent(sfcBo); + if (!bomComponentList.isEmpty()) { + for (BomComponentDto bomComponentDto : bomComponentList) { + if (bomComponentDto.getOperation().equals(operation) && bomComponentDto.getStepId().equals(stepId)) { + String accessoryType = bomComponentDto.getAccessoryType(); + //物料P001，校验当前派工单（SFC+工序/步骤）加工是否需要准备物料 + if (accessoryType == null || accessoryType.equals("0")) { + if (prodReadyTaskDetailList.size()>0){ + long count = prodReadyTaskDetailList.stream().filter(prodReadyTaskDetail -> prodReadyTaskDetail.getInspectionItem().equals(P01)).count(); + if (count>0){ + continue; + } + } + ProdReadyTaskDetail prodReadyTaskDetail = new ProdReadyTaskDetail(); + prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(), P01)); + prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); + prodReadyTaskDetail.setInspectionItem(P01); + prodReadyTaskDetail.setResult(""); + prodReadyTaskDetail.setRemarks(""); + prodReadyTaskDetail.setCreateUser(user); + prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); + prodReadyTaskDetail.setModifyUser(user); + prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); + prodReadyTaskDetailList.add(prodReadyTaskDetail); + } else if (accessoryType.equals("1")) { + if (prodReadyTaskDetailList.size()>0){ + long count = prodReadyTaskDetailList.stream().filter(prodReadyTaskDetail -> prodReadyTaskDetail.getInspectionItem().equals(P02)).count(); + if (count>0){ + continue; + } + } + //刀具P002，校验当前派工单（SFC+工序/步骤）加工是否需要准备物料 + ProdReadyTaskDetail prodReadyTaskDetail = new ProdReadyTaskDetail(); + prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(), P02)); + prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); + prodReadyTaskDetail.setInspectionItem(P02); + prodReadyTaskDetail.setResult(""); + prodReadyTaskDetail.setRemarks(""); + prodReadyTaskDetail.setCreateUser(user); + prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); + prodReadyTaskDetail.setModifyUser(user); + prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); + prodReadyTaskDetailList.add(prodReadyTaskDetail); + } } } - } ); - } - //工控程序P003，工控程序，校验是否需要准备工控程序 - String customFieldsValue = customFieldsService.getCustomFieldsValue(HandleEnum.WORK_CENTER.getHandle(site, workCenter), CustomFieldConstant.WORK_CENTER_CUSTOM_FIELD_PROCESS_CONTROL); - if (StringUtil.notBlank(customFieldsValue)&&customFieldsValue.equals(Constants.STATUS_Y)){ - customFieldsValue = customFieldsService.getCustomFieldsValue(HandleEnum.RESOURCE.getHandle(site, resrce), CustomFieldConstant.RESRCE_CUSTOM_FIELD_PROCESS_CONTROL); - if (StringUtil.notBlank(customFieldsValue)&&customFieldsValue.equals(Constants.STATUS_Y)) { - ProdReadyTaskDetail prodReadyTaskDetail=new ProdReadyTaskDetail(); - prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(),P03)); - prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); - prodReadyTaskDetail.setInspectionItem(P03); - prodReadyTaskDetail.setResult(""); - prodReadyTaskDetail.setRemarks(""); - prodReadyTaskDetail.setCreateUser(user); - prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); - prodReadyTaskDetail.setModifyUser(user); - prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); - prodReadyTaskDetailList.add(prodReadyTaskDetail); } + //工控程序P003，工控程序，校验是否需要准备工控程序 + String customFieldsValue = customFieldsService.getCustomFieldsValue(HandleEnum.WORK_CENTER.getHandle(site, workCenter), CustomFieldConstant.WORK_CENTER_CUSTOM_FIELD_PROCESS_CONTROL); + if (StringUtil.notBlank(customFieldsValue) && customFieldsValue.equals(Constants.STATUS_Y)) { + customFieldsValue = customFieldsService.getCustomFieldsValue(HandleEnum.RESOURCE.getHandle(site, resrce), CustomFieldConstant.RESRCE_CUSTOM_FIELD_PROCESS_CONTROL); + if (StringUtil.notBlank(customFieldsValue) && customFieldsValue.equals(Constants.STATUS_Y)) { + ProdReadyTaskDetail prodReadyTaskDetail = new ProdReadyTaskDetail(); + prodReadyTaskDetail.setHandle(HandleEnum.PROD_READY_TASK_DETAIL.getHandle(prodReadyTask.getHandle(), P03)); + prodReadyTaskDetail.setProdReadyTaskBo(prodReadyTask.getHandle()); + prodReadyTaskDetail.setInspectionItem(P03); + prodReadyTaskDetail.setResult(""); + prodReadyTaskDetail.setRemarks(""); + prodReadyTaskDetail.setCreateUser(user); + prodReadyTaskDetail.setCreatedDateTime(LocalDateTime.now()); + prodReadyTaskDetail.setModifyUser(user); + prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); + prodReadyTaskDetailList.add(prodReadyTaskDetail); + } + } + if (prodReadyTaskDetailList.size() > 0) { + prodReadyTask.setStatus(STATUS_NEW); + prodReadyTaskDetailService.saveBatch(prodReadyTaskDetailList); + } else { + prodReadyTask.setStatus(STATUS_FINISH); + prodReadyTask.setResult(Constants.RSESULT_OK); + prodReadyTask.setCompleteUser(user); + prodReadyTask.setCompleteDateTime(LocalDateTime.now()); + } + save(prodReadyTask); + } else if (DispatchStatusEnum.CANCEL.getCode().equals(dispatchStatus)) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProdReadyTask::getSfcDispatchBo, sfcDispatchBO); + lambdaQueryWrapper.orderByDesc(ProdReadyTask::getCreatedDateTime); + List list = list(lambdaQueryWrapper); + if (list.size() < 1) { + throw new BaseException("根据派工主键未找到产前准备任务"); + } + if (list.get(0).getStatus().equals(STATUS_CANCEL)) { + throw new BaseException("产前准备任务任务已取消"); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ProdReadyTask::getStatus, STATUS_CANCEL); + updateWrapper.set(ProdReadyTask::getCancelUser, user); + updateWrapper.set(ProdReadyTask::getCancelDateTime, LocalDateTime.now()); + updateWrapper.eq(ProdReadyTask::getSfcDispatchBo, sfcDispatchBO); + update(updateWrapper); } - if (prodReadyTaskDetailList.size()>0){ - prodReadyTask.setStatus(STATUS_NEW); - prodReadyTaskDetailService.saveBatch(prodReadyTaskDetailList); - }else { - prodReadyTask.setStatus(STATUS_FINISH); - prodReadyTask.setResult(Constants.RSESULT_OK); - prodReadyTask.setCompleteUser(user); - prodReadyTask.setCompleteDateTime(LocalDateTime.now()); - } - save(prodReadyTask); - }else if(DispatchStatusEnum.CANCEL.getCode().equals(dispatchStatus)){ - LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProdReadyTask::getSfcDispatchBo,sfcDispatchBO); - lambdaQueryWrapper.orderByDesc(ProdReadyTask::getCreatedDateTime); - List list = list(lambdaQueryWrapper); - if (list.size()<1){ - throw new BaseException("根据派工主键未找到产前准备任务"); - } - if (list.get(0).getStatus().equals(STATUS_CANCEL)){ - throw new BaseException("产前准备任务任务已取消"); - } - LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); - updateWrapper.set(ProdReadyTask::getStatus,STATUS_CANCEL); - updateWrapper.set(ProdReadyTask::getCancelUser,user); - updateWrapper.set(ProdReadyTask::getCancelDateTime,LocalDateTime.now()); - updateWrapper.eq(ProdReadyTask::getSfcDispatchBo,sfcDispatchBO); - update(updateWrapper); - } } } @@ -210,7 +223,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl workCenters = workCenterService.selectList(workCenter); prodReadyTask.setWorkCenterDesc(workCenters.get(0).getDescription()); prodReadyTask.setDispatchNo(StringUtil.trimHandle(prodReadyTask.getSfcDispatchBo())); - LambdaQueryWrapper lambdaQuery=new LambdaQueryWrapper<>(); - lambdaQuery.eq(ProdReadyTaskDetail::getProdReadyTaskBo,taskBo); + LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); + lambdaQuery.eq(ProdReadyTaskDetail::getProdReadyTaskBo, taskBo); List list = prodReadyTaskDetailService.list(lambdaQuery); prodReadyTask.setProdReadyTaskDetailList(list); return prodReadyTask; @@ -237,13 +250,13 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl> returnMap = null; String site = CommonMethods.getSite(); - if (type.equals(P01)){ + if (type.equals(P01)) { //物料接收数据 - returnMap=prodReadyTaskMapper.getItemDetail(site,LocaleContextHolder.getLocale().getLanguage(),dispatchNo); - }else if (type.equals(P02)){ + returnMap = prodReadyTaskMapper.getItemDetail(site, LocaleContextHolder.getLocale().getLanguage(), dispatchNo); + } else if (type.equals(P02)) { //刀具 - returnMap=prodReadyTaskMapper.getToolDetail(site,LocaleContextHolder.getLocale().getLanguage(),dispatchNo); - }else { + returnMap = prodReadyTaskMapper.getToolDetail(site, LocaleContextHolder.getLocale().getLanguage(), dispatchNo); + } else { //通过加工的零件号、设备类型、设备获取发布状态的工控程序 } return returnMap; @@ -253,10 +266,10 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl prodReadyTaskDetailList = prodReadyTask.getProdReadyTaskDetailList(); @@ -266,8 +279,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl0){ - for (ProdReadyTaskDetail prodReadyTaskDetail:prodReadyTaskDetailList) { + if (prodReadyTaskDetailList != null && prodReadyTaskDetailList.size() > 0) { + for (ProdReadyTaskDetail prodReadyTaskDetail : prodReadyTaskDetailList) { prodReadyTaskDetail.setModifyUser(user); prodReadyTaskDetail.setModifiedDateTime(LocalDateTime.now()); prodReadyTaskDetailService.updateById(prodReadyTaskDetail); diff --git a/quality/pom.xml b/quality/pom.xml index 5ca7bf39..671ddaa2 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -41,5 +41,9 @@ org.apache.httpcomponents httpclient + + com.foreverwin.mesnac + production + \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectController.java deleted file mode 100644 index a33067c6..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectController.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.foreverwin.mesnac.quality.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.quality.mapper.InspectionProjectDetailMapper; -import com.foreverwin.mesnac.quality.mapper.InspectionProjectMapper; -import com.foreverwin.mesnac.quality.model.InspectionProject; -import com.foreverwin.mesnac.quality.model.InspectionProjectDetail; -import com.foreverwin.mesnac.quality.service.InspectionProjectDetailService; -import com.foreverwin.mesnac.quality.service.InspectionProjectService; -import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.R; -import com.visiprise.common.exception.BaseException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; - -/** - * - * @author Robert - * @since 2021-06-03 - */ -@RestController -@RequestMapping("/Z-INSPECTION-PROJECT") -public class InspectionProjectController { - - @Autowired - public InspectionProjectService inspectionProjectService; - - @Autowired - public InspectionProjectMapper inspectionProjectMapper; - - @Autowired - public InspectionProjectDetailMapper inspectionProjectDetailMapper; - - @Autowired - public InspectionProjectDetailService inspectionProjectDetailService; - - /** - * 根据id查询 - * - * @param id 主键 - * @return - */ - @ResponseBody - @GetMapping("/{id:.+}") - public R getInspectionProjectById(@PathVariable String id) { - return R.ok( inspectionProjectService.getById(id)); - } - - /** - * 查询所有数据 - * - * @return - */ - @ResponseBody - @GetMapping("") - public R getInspectionProjectList(InspectionProject inspectionProject){ - List result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProject); - result = inspectionProjectService.list(queryWrapper); - return R.ok(result); - } - - /** - * 分页查询数据 - * - * @param frontPage 分页信息 - * @return - */ - @ResponseBody - @GetMapping("/page") - public R page(FrontPage frontPage, InspectionProject inspectionProject){ - IPage result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProject); - if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { - //TODO modify global query - queryWrapper.lambda().and(wrapper -> wrapper - .like(InspectionProject::getHandle, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getSite, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getInspectProjectNo, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getInspectType, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getRevision, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getCurrentRevision, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getDescription, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getStatus, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getItemBo, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getItem, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getOperation, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getStepId, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getSubStep, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getCreateUser, frontPage.getGlobalQuery()) - .or().like(InspectionProject::getModifyUser, frontPage.getGlobalQuery()) - ); - } - result = inspectionProjectService.page(frontPage.getPagePlus(), queryWrapper); - return R.ok(result); - } - - /** - * 新增 - * @param inspectionProject 传递的实体 - * @return null 失败 实体成功 - */ - @PostMapping - public R save(@RequestBody InspectionProject inspectionProject) { - return R.ok(inspectionProjectService.save(inspectionProject)); - } - - /** - * 修改 - * @param inspectionProject 传递的实体 - * @return null 失败 实体成功 - */ - @PutMapping - public R updateById(@RequestBody InspectionProject inspectionProject) { - return R.ok(inspectionProjectService.updateById(inspectionProject)); - } - - /** - * 根据id删除对象 - * @param id 实体ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") - public R removeById(@PathVariable("id") String id){ - return R.ok(inspectionProjectService.removeById(id)); - } - - /** - * 批量删除对象 - * @param ids 实体集合ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") - public R removeByIds(List ids){ - return R.ok(inspectionProjectService.removeByIds(ids)); - } - - - @PostMapping("/saveAll") - public R saveAll(@RequestBody InspectionProject inspectionProject){ - boolean b = false; - if(StringUtil.isEmpty(inspectionProject.getInspectProjectNo())){ - b = true; - inspectionProject.setInspectProjectNo(inspectionProjectService.InspectProjectNoGenerationRules(inspectionProject)); - } - inspectionProject.setSite(CommonMethods.getSite()); - inspectionProject.setHandle("InspectionProjectBO:"+inspectionProject.getSite()+","+inspectionProject.getInspectProjectNo()+","+inspectionProject.getRevision()); - //保存检验项目维护-副 - //移除 - HashMap removeCondition = new HashMap<>(); - removeCondition.put("INSPECT_PROJECT_BO",inspectionProject.getHandle()); - inspectionProjectDetailService.removeByMap(removeCondition); - if(null != inspectionProject.getInspectionProjectDetailList() && inspectionProject.getInspectionProjectDetailList().size() > 0){ - List inspectionProjectDetailList = inspectionProject.getInspectionProjectDetailList(); - for (InspectionProjectDetail inspectionProjectDetail : inspectionProjectDetailList) { - inspectionProjectDetail.setHandle(UUID.randomUUID().toString()); - inspectionProjectDetail.setInspectProjectBo(inspectionProject.getHandle()); - inspectionProjectDetail.setCreatedDateTime(LocalDateTime.now()); - inspectionProjectDetail.setCreateUser(CommonMethods.getUser()); - inspectionProjectDetail.setModifiedDateTime(LocalDateTime.now()); - inspectionProjectDetail.setModifyUser(CommonMethods.getUser()); - } - //保存 - inspectionProjectDetailService.saveBatch(inspectionProjectDetailList); - - } - //保存检验项目维护-主 - if(inspectionProject.selectById(inspectionProject.getHandle()) == null){ - inspectionProject.setCreatedDateTime(LocalDateTime.now()); - inspectionProject.setCreateUser(CommonMethods.getUser()); - inspectionProject.setModifiedDateTime(LocalDateTime.now()); - inspectionProject.setModifyUser(CommonMethods.getUser()); - inspectionProjectService.save(inspectionProject); - }else{ - inspectionProject.setModifiedDateTime(LocalDateTime.now()); - inspectionProject.setModifyUser(CommonMethods.getUser()); - if(b){ - throw new BaseException("请先检索再保存"); - } - inspectionProjectService.saveOrUpdate(inspectionProject); - } - return R.ok(); - } - @PostMapping("/deleteById") - public R deleteById(@RequestBody InspectionProject inspectionProject){ - boolean bool = false; - if(StringUtil.isEmpty(inspectionProject.getInspectProjectNo())){ - inspectionProject.setInspectProjectNo(inspectionProjectService.InspectProjectNoGenerationRules(inspectionProject)); - bool = true; - } - inspectionProject.setSite(CommonMethods.getSite()); - inspectionProject.setHandle("InspectionProjectBO:"+inspectionProject.getSite()+","+inspectionProject.getInspectProjectNo()+","+inspectionProject.getRevision()); - HashMap removeCondition = new HashMap<>(); - removeCondition.put("INSPECT_PROJECT_BO",inspectionProject.getHandle()); - inspectionProjectDetailService.removeByMap(removeCondition); - boolean b = inspectionProjectService.removeById(inspectionProject); - if(bool){ - if(b){ - throw new BaseException("请先检索再保存"); - } - } - return R.ok(); - } - @GetMapping("/queryAll") - public R queryAll(InspectionProject inspectionProject){ - if(StringUtil.isEmpty(inspectionProject.getInspectProjectNo())){ - inspectionProject.setInspectProjectNo(inspectionProjectService.InspectProjectNoGenerationRules(inspectionProject)); - } - if(StringUtil.isEmpty(inspectionProject.getRevision())){ - String revision = inspectionProjectService.findRevisionByCurrentRevision(inspectionProject.getInspectProjectNo()); - if(StringUtil.isEmpty(revision)){ - throw new BaseException("请输入版本号"); - } - inspectionProject.setRevision(revision); - } - inspectionProject.setSite(CommonMethods.getSite()); - inspectionProject.setHandle("InspectionProjectBO:"+inspectionProject.getSite()+","+inspectionProject.getInspectProjectNo()+","+inspectionProject.getRevision()); - - HashMap findCondition = new HashMap<>(); - findCondition.put("INSPECT_PROJECT_BO",inspectionProject.getHandle()); - List inspectionProjectDetails = inspectionProjectDetailMapper.selectByMap(findCondition); - InspectionProject handle = inspectionProjectMapper.selectById(inspectionProject.getHandle()); - handle.setInspectionProjectDetailList(inspectionProjectDetails); - if(null == handle){ - throw new BaseException("根据此项目编号以及版本未检索到数据"); - } - return R.ok(handle); - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectDetailController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectDetailController.java deleted file mode 100644 index 36abde40..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionProjectDetailController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.foreverwin.mesnac.quality.controller; - -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.foreverwin.mesnac.quality.service.InspectionProjectDetailService; -import com.foreverwin.mesnac.quality.model.InspectionProjectDetail; -import java.util.List; - -/** - * - * @author Robert - * @since 2021-06-03 - */ -@RestController -@RequestMapping("/Z-INSPECTION-PROJECT-DETAIL") -public class InspectionProjectDetailController { - - @Autowired - public InspectionProjectDetailService inspectionProjectDetailService; - - /** - * 根据id查询 - * - * @param id 主键 - * @return - */ - @ResponseBody - @GetMapping("/{id:.+}") - public R getInspectionProjectDetailById(@PathVariable String id) { - return R.ok( inspectionProjectDetailService.getById(id)); - } - - /** - * 查询所有数据 - * - * @return - */ - @ResponseBody - @GetMapping("") - public R getInspectionProjectDetailList(InspectionProjectDetail inspectionProjectDetail){ - List result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProjectDetail); - result = inspectionProjectDetailService.list(queryWrapper); - return R.ok(result); - } - - /** - * 分页查询数据 - * - * @param frontPage 分页信息 - * @return - */ - @ResponseBody - @GetMapping("/page") - public R page(FrontPage frontPage, InspectionProjectDetail inspectionProjectDetail){ - IPage result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProjectDetail); - if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { - //TODO modify global query - queryWrapper.lambda().and(wrapper -> wrapper - .like(InspectionProjectDetail::getHandle, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getInspectProjectBo, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getParamNo, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getDescription, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getInspectMethod, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getParamType, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getParamUnit, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getStandardValue, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getFalseValue, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getTrueValue, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getIsRequired, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getCreateUser, frontPage.getGlobalQuery()) - .or().like(InspectionProjectDetail::getModifyUser, frontPage.getGlobalQuery()) - ); - } - result = inspectionProjectDetailService.page(frontPage.getPagePlus(), queryWrapper); - return R.ok(result); - } - - /** - * 新增 - * @param inspectionProjectDetail 传递的实体 - * @return null 失败 实体成功 - */ - @PostMapping - public R save(@RequestBody InspectionProjectDetail inspectionProjectDetail) { - return R.ok(inspectionProjectDetailService.save(inspectionProjectDetail)); - } - - /** - * 修改 - * @param inspectionProjectDetail 传递的实体 - * @return null 失败 实体成功 - */ - @PutMapping - public R updateById(@RequestBody InspectionProjectDetail inspectionProjectDetail) { - return R.ok(inspectionProjectDetailService.updateById(inspectionProjectDetail)); - } - - /** - * 根据id删除对象 - * @param id 实体ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") - public R removeById(@PathVariable("id") String id){ - return R.ok(inspectionProjectDetailService.removeById(id)); - } - - /** - * 批量删除对象 - * @param ids 实体集合ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") - public R removeByIds(List ids){ - return R.ok(inspectionProjectDetailService.removeByIds(ids)); - } -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java index c4f3aa20..0a150696 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java @@ -12,6 +12,7 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @@ -24,7 +25,17 @@ public class SelfReportController { @Autowired public SelfReportService selfReportService; - + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @PostMapping("/doAdd") + public R doAdd(@RequestBody Map map){ + selfReportService.doAdd(map); + return R.ok(); + } /** * 根据id查询 * diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/dto/inspectionProjectDto.java b/quality/src/main/java/com/foreverwin/mesnac/quality/dto/inspectionProjectDto.java deleted file mode 100644 index 87463060..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/dto/inspectionProjectDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.foreverwin.mesnac.quality.dto; - -import com.foreverwin.mesnac.quality.model.InspectionProject; - -/** - * @Description TODO - * @Author zhaojiawei - * @Since 2021-06-03 - */ -public class inspectionProjectDto extends InspectionProject { - private String seq; -} diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectDetailMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectDetailMapper.java deleted file mode 100644 index 81c16643..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectDetailMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.foreverwin.mesnac.quality.mapper; - -import com.foreverwin.mesnac.quality.model.InspectionProjectDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springframework.stereotype.Repository; - -/** - *

- * 检验项目维护-副 Mapper 接口 - *

- * - * @author Robert - * @since 2021-06-03 - */ -@Repository -public interface InspectionProjectDetailMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectMapper.java deleted file mode 100644 index 71168825..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionProjectMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.foreverwin.mesnac.quality.mapper; - -import com.foreverwin.mesnac.quality.model.InspectionProject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -/** - *

- * 检验项目维护-主 Mapper 接口 - *

- * - * @author Robert - * @since 2021-06-03 - */ -@Repository -public interface InspectionProjectMapper extends BaseMapper { - - String findRevisionByCurrentRevision(@Param("site")String site, @Param("inspectProjectNo") String inspectProjectNo); -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProject.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProject.java deleted file mode 100644 index ae94a764..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProject.java +++ /dev/null @@ -1,328 +0,0 @@ -package com.foreverwin.mesnac.quality.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** - *

- * 检验项目维护-主 - *

- * - * @author Robert - * @since 2021-06-03 - */ - -@TableName("Z_INSPECTION_PROJECT") - -public class InspectionProject extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "HANDLE", type = IdType.INPUT) - private String handle; - /** - * 站点 - */ - @TableField("SITE") - private String site; - /** - * 检验项目编号：检验类型+物料+工序/步骤+工步 - */ - @TableField("INSPECT_PROJECT_NO") - private String inspectProjectNo; - /** - * 检验类型:S|首检、H｜互检、Z｜自检、P｜专检 - */ - @TableField("INSPECT_TYPE") - private String inspectType; - /** - * 版本 - */ - @TableField("REVISION") - private String revision; - /** - * 当前版本：TRUE｜当前版本、FALSE｜不是当前版本 - */ - @TableField("CURRENT_REVISION") - private String currentRevision; - /** - * 检验项目描述 - */ - @TableField("DESCRIPTION") - private String description; - /** - * 状态：Y｜启用、N｜停用 - */ - @TableField("STATUS") - private String status; - /** - * 物料BO - */ - @TableField("ITEM_BO") - private String itemBo; - /** - * 物料编号 - */ - @TableField("ITEM") - private String item; - /** - * 操作 - */ - @TableField("OPERATION") - private String operation; - /** - * 步骤 - */ - @TableField("STEP_ID") - private String stepId; - /** - * 子步骤/工步 - */ - @TableField("SUB_STEP") - private String subStep; - /** - * 创建人 - */ - @TableField("CREATE_USER") - private String createUser; - /** - * 创建时间 - */ - @TableField("CREATED_DATE_TIME") - private LocalDateTime createdDateTime; - /** - * 修改人 - */ - @TableField("MODIFY_USER") - private String modifyUser; - /** - * 修改时间 - */ - @TableField("MODIFIED_DATE_TIME") - private LocalDateTime modifiedDateTime; - - /** - * 明细数据 - */ - @TableField(exist = false) - private List inspectionProjectDetailList; - - - public String getHandle() { - return handle; - } - - public void setHandle(String handle) { - this.handle = handle; - } - - public String getSite() { - return site; - } - - public void setSite(String site) { - this.site = site; - } - - public String getInspectProjectNo() { - return inspectProjectNo; - } - - public void setInspectProjectNo(String inspectProjectNo) { - this.inspectProjectNo = inspectProjectNo; - } - - public String getInspectType() { - return inspectType; - } - - public void setInspectType(String inspectType) { - this.inspectType = inspectType; - } - - public String getRevision() { - return revision; - } - - public void setRevision(String revision) { - this.revision = revision; - } - - public String getCurrentRevision() { - return currentRevision; - } - - public void setCurrentRevision(String currentRevision) { - this.currentRevision = currentRevision; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getItemBo() { - return itemBo; - } - - public void setItemBo(String itemBo) { - this.itemBo = itemBo; - } - - public String getItem() { - return item; - } - - public void setItem(String item) { - this.item = item; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } - - public String getStepId() { - return stepId; - } - - public void setStepId(String stepId) { - this.stepId = stepId; - } - - public String getSubStep() { - return subStep; - } - - public void setSubStep(String subStep) { - this.subStep = subStep; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public LocalDateTime getCreatedDateTime() { - return createdDateTime; - } - - public void setCreatedDateTime(LocalDateTime createdDateTime) { - this.createdDateTime = createdDateTime; - } - - public String getModifyUser() { - return modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public LocalDateTime getModifiedDateTime() { - return modifiedDateTime; - } - - public void setModifiedDateTime(LocalDateTime modifiedDateTime) { - this.modifiedDateTime = modifiedDateTime; - } - - public List getInspectionProjectDetailList() { - return inspectionProjectDetailList; - } - - public void setInspectionProjectDetailList(List inspectionProjectDetailList) { - this.inspectionProjectDetailList = inspectionProjectDetailList; - } - - public static final String HANDLE = "HANDLE"; - -public static final String SITE = "SITE"; - -public static final String INSPECT_PROJECT_NO = "INSPECT_PROJECT_NO"; - -public static final String INSPECT_TYPE = "INSPECT_TYPE"; - -public static final String REVISION = "REVISION"; - -public static final String CURRENT_REVISION = "CURRENT_REVISION"; - -public static final String DESCRIPTION = "DESCRIPTION"; - -public static final String STATUS = "STATUS"; - -public static final String ITEM_BO = "ITEM_BO"; - -public static final String ITEM = "ITEM"; - -public static final String OPERATION = "OPERATION"; - -public static final String STEP_ID = "STEP_ID"; - -public static final String SUB_STEP = "SUB_STEP"; - -public static final String CREATE_USER = "CREATE_USER"; - -public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; - -public static final String MODIFY_USER = "MODIFY_USER"; - -public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; - - - @Override - protected Serializable pkVal() { - return this.handle; - } - - @Override - public String toString() { - return "InspectionProject{" + - "handle = " + handle + - ", site = " + site + - ", inspectProjectNo = " + inspectProjectNo + - ", inspectType = " + inspectType + - ", revision = " + revision + - ", currentRevision = " + currentRevision + - ", description = " + description + - ", status = " + status + - ", itemBo = " + itemBo + - ", item = " + item + - ", operation = " + operation + - ", stepId = " + stepId + - ", subStep = " + subStep + - ", createUser = " + createUser + - ", createdDateTime = " + createdDateTime + - ", modifyUser = " + modifyUser + - ", modifiedDateTime = " + modifiedDateTime + - "}"; - } - -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProjectDetail.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProjectDetail.java deleted file mode 100644 index 19a4fc20..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionProjectDetail.java +++ /dev/null @@ -1,361 +0,0 @@ -package com.foreverwin.mesnac.quality.model; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; - -/** - *

- * 检验项目维护-副 - *

- * - * @author Robert - * @since 2021-06-03 - */ - -@TableName("Z_INSPECTION_PROJECT_DETAIL") - -public class InspectionProjectDetail extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "HANDLE", type = IdType.INPUT) - private String handle; - /** - * 检验项目维护-主 - */ - @TableField("INSPECT_PROJECT_BO") - private String inspectProjectBo; - /** - * 序号 - */ - @TableField("SEQ") - private Long seq; - /** - * 参数名称 - */ - @TableField("PARAM_NO") - private String paramNo; - /** - * 参数描述 - */ - @TableField("DESCRIPTION") - private String description; - /** - * 检验方法 - */ - @TableField("INSPECT_METHOD") - private String inspectMethod; - /** - * 类型：N｜数字、B｜布尔、 T｜文本 - */ - @TableField("PARAM_TYPE") - private String paramType; - /** - * 参数单位 - */ - @TableField("PARAM_UNIT") - private String paramUnit; - /** - * 小数位数 - */ - @TableField("DECIMAL_NUM") - private Long decimalNum; - /** - * 最小值 - */ - @TableField("MIN_VALUE") - private Double minValue; - /** - * 标准值 - */ - @TableField("STANDARD_VALUE") - private String standardValue; - /** - * 最大值 - */ - @TableField("MAX_VALUE") - private Double maxValue; - /** - * FALSE值 - */ - @TableField("FALSE_VALUE") - private String falseValue; - /** - * TRUE值 - */ - @TableField("TRUE_VALUE") - private String trueValue; - /** - * 是否必输：TRUE｜是、FALSE｜否 - */ - @TableField("IS_REQUIRED") - private String isRequired; - /** - * 检验次数 - */ - @TableField("CHECK_NUM") - private Long checkNum; - /** - * 创建人 - */ - @TableField("CREATE_USER") - private String createUser; - /** - * 创建时间 - */ - @TableField("CREATED_DATE_TIME") - private LocalDateTime createdDateTime; - /** - * 修改人 - */ - @TableField("MODIFY_USER") - private String modifyUser; - /** - * 修改时间 - */ - @TableField("MODIFIED_DATE_TIME") - private LocalDateTime modifiedDateTime; - - - public String getHandle() { - return handle; - } - - public void setHandle(String handle) { - this.handle = handle; - } - - public String getInspectProjectBo() { - return inspectProjectBo; - } - - public void setInspectProjectBo(String inspectProjectBo) { - this.inspectProjectBo = inspectProjectBo; - } - - public Long getSeq() { - return seq; - } - - public void setSeq(Long seq) { - this.seq = seq; - } - - public String getParamNo() { - return paramNo; - } - - public void setParamNo(String paramNo) { - this.paramNo = paramNo; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getInspectMethod() { - return inspectMethod; - } - - public void setInspectMethod(String inspectMethod) { - this.inspectMethod = inspectMethod; - } - - public String getParamType() { - return paramType; - } - - public void setParamType(String paramType) { - this.paramType = paramType; - } - - public String getParamUnit() { - return paramUnit; - } - - public void setParamUnit(String paramUnit) { - this.paramUnit = paramUnit; - } - - public Long getDecimalNum() { - return decimalNum; - } - - public void setDecimalNum(Long decimalNum) { - this.decimalNum = decimalNum; - } - - public Double getMinValue() { - return minValue; - } - - public void setMinValue(Double minValue) { - this.minValue = minValue; - } - - public String getStandardValue() { - return standardValue; - } - - public void setStandardValue(String standardValue) { - this.standardValue = standardValue; - } - - public Double getMaxValue() { - return maxValue; - } - - public void setMaxValue(Double maxValue) { - this.maxValue = maxValue; - } - - public String getFalseValue() { - return falseValue; - } - - public void setFalseValue(String falseValue) { - this.falseValue = falseValue; - } - - public String getTrueValue() { - return trueValue; - } - - public void setTrueValue(String trueValue) { - this.trueValue = trueValue; - } - - public String getIsRequired() { - return isRequired; - } - - public void setIsRequired(String isRequired) { - this.isRequired = isRequired; - } - - public Long getCheckNum() { - return checkNum; - } - - public void setCheckNum(Long checkNum) { - this.checkNum = checkNum; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public LocalDateTime getCreatedDateTime() { - return createdDateTime; - } - - public void setCreatedDateTime(LocalDateTime createdDateTime) { - this.createdDateTime = createdDateTime; - } - - public String getModifyUser() { - return modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public LocalDateTime getModifiedDateTime() { - return modifiedDateTime; - } - - public void setModifiedDateTime(LocalDateTime modifiedDateTime) { - this.modifiedDateTime = modifiedDateTime; - } - -public static final String HANDLE = "HANDLE"; - -public static final String INSPECT_PROJECT_BO = "INSPECT_PROJECT_BO"; - -public static final String SEQ = "SEQ"; - -public static final String PARAM_NO = "PARAM_NO"; - -public static final String DESCRIPTION = "DESCRIPTION"; - -public static final String INSPECT_METHOD = "INSPECT_METHOD"; - -public static final String PARAM_TYPE = "PARAM_TYPE"; - -public static final String PARAM_UNIT = "PARAM_UNIT"; - -public static final String DECIMAL_NUM = "DECIMAL_NUM"; - -public static final String MIN_VALUE = "MIN_VALUE"; - -public static final String STANDARD_VALUE = "STANDARD_VALUE"; - -public static final String MAX_VALUE = "MAX_VALUE"; - -public static final String FALSE_VALUE = "FALSE_VALUE"; - -public static final String TRUE_VALUE = "TRUE_VALUE"; - -public static final String IS_REQUIRED = "IS_REQUIRED"; - -public static final String CHECK_NUM = "CHECK_NUM"; - -public static final String CREATE_USER = "CREATE_USER"; - -public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; - -public static final String MODIFY_USER = "MODIFY_USER"; - -public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; - - - @Override - protected Serializable pkVal() { - return this.handle; - } - - @Override - public String toString() { - return "InspectionProjectDetail{" + - "handle = " + handle + - ", inspectProjectBo = " + inspectProjectBo + - ", seq = " + seq + - ", paramNo = " + paramNo + - ", description = " + description + - ", inspectMethod = " + inspectMethod + - ", paramType = " + paramType + - ", paramUnit = " + paramUnit + - ", decimalNum = " + decimalNum + - ", minValue = " + minValue + - ", standardValue = " + standardValue + - ", maxValue = " + maxValue + - ", falseValue = " + falseValue + - ", trueValue = " + trueValue + - ", isRequired = " + isRequired + - ", checkNum = " + checkNum + - ", createUser = " + createUser + - ", createdDateTime = " + createdDateTime + - ", modifyUser = " + modifyUser + - ", modifiedDateTime = " + modifiedDateTime + - "}"; - } -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectDetailService.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectDetailService.java deleted file mode 100644 index c5f92b22..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectDetailService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.foreverwin.mesnac.quality.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.quality.model.InspectionProjectDetail; -import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.modular.core.util.FrontPage; - -import java.util.List; - -/** - *

- * 检验项目维护-副 服务类 - *

- * - * @author Robert - * @since 2021-06-03 - */ -public interface InspectionProjectDetailService extends IService { - - /** - * 分页查询 - * @param frontPage - * @return - */ - IPage selectPage(FrontPage frontPage, InspectionProjectDetail inspectionProjectDetail); - - List selectList(InspectionProjectDetail inspectionProjectDetail); -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectService.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectService.java deleted file mode 100644 index 582dfc53..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionProjectService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.foreverwin.mesnac.quality.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.quality.model.InspectionProject; -import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.modular.core.util.FrontPage; - -import java.util.List; - -/** - *

- * 检验项目维护-主 服务类 - *

- * - * @author Robert - * @since 2021-06-03 - */ -public interface InspectionProjectService extends IService { - - /** - * 分页查询 - * @param frontPage - * @return - */ - IPage selectPage(FrontPage frontPage, InspectionProject inspectionProject); - - List selectList(InspectionProject inspectionProject); - - String InspectProjectNoGenerationRules(InspectionProject inspectionProject); - - String findRevisionByCurrentRevision(String inspectProjectNo); - -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java index 8c36d310..ca94901f 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java @@ -8,6 +8,7 @@ import com.foreverwin.modular.core.util.FrontPage; import java.time.LocalDate; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +32,6 @@ public interface SelfReportService extends IService { Object reject(String handle); List selectList(QueryWrapper queryWrapper, String locale, LocalDate startTime, LocalDate endTime); + + void doAdd(Map map); } \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectDetailServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectDetailServiceImpl.java deleted file mode 100644 index 654cc715..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectDetailServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.foreverwin.mesnac.quality.service.impl; - -import com.foreverwin.modular.core.util.FrontPage; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.quality.model.InspectionProjectDetail; -import com.foreverwin.mesnac.quality.mapper.InspectionProjectDetailMapper; -import com.foreverwin.mesnac.quality.service.InspectionProjectDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -/** - *

- * 检验项目维护-副 服务实现类 - *

- * - * @author Robert - * @since 2021-06-03 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class InspectionProjectDetailServiceImpl extends ServiceImpl implements InspectionProjectDetailService { - - - @Autowired - private InspectionProjectDetailMapper inspectionProjectDetailMapper; - - @Override - public IPage selectPage(FrontPage frontPage, InspectionProjectDetail inspectionProjectDetail) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProjectDetail); - return super.page(frontPage.getPagePlus(), queryWrapper); - } - - @Override - public List selectList(InspectionProjectDetail inspectionProjectDetail) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProjectDetail); - return super.list(queryWrapper); - } - - -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectServiceImpl.java deleted file mode 100644 index 53ed45f3..00000000 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionProjectServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.foreverwin.mesnac.quality.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.quality.mapper.InspectionProjectMapper; -import com.foreverwin.mesnac.quality.model.InspectionProject; -import com.foreverwin.mesnac.quality.service.InspectionProjectService; -import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -/** - *

- * 检验项目维护-主 服务实现类 - *

- * - * @author Robert - * @since 2021-06-03 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class InspectionProjectServiceImpl extends ServiceImpl implements InspectionProjectService { - - - @Autowired - private InspectionProjectMapper inspectionProjectMapper; - - @Override - public IPage selectPage(FrontPage frontPage, InspectionProject inspectionProject) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProject); - return super.page(frontPage.getPagePlus(), queryWrapper); - } - - @Override - public List selectList(InspectionProject inspectionProject) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(inspectionProject); - return super.list(queryWrapper); - } - - @Override - public String InspectProjectNoGenerationRules(InspectionProject inspectionProject) { - if(StringUtil.isEmpty(inspectionProject.getItem())){ - inspectionProject.setInspectProjectNo(inspectionProject.getInspectType()+",*"+",*"+",*"+",*"); - inspectionProject.setItemBo("*"); - inspectionProject.setItem("*"); - inspectionProject.setOperation("*"); - inspectionProject.setStepId("*"); - inspectionProject.setSubStep("*"); - }else if(StringUtil.isEmpty(inspectionProject.getOperation())){ - inspectionProject.setInspectProjectNo(inspectionProject.getInspectType()+","+inspectionProject.getItem()+",*"+",*"+",*"); - inspectionProject.setOperation("*"); - inspectionProject.setStepId("*"); - inspectionProject.setSubStep("*"); - - }else if(StringUtil.isEmpty(inspectionProject.getSubStep())){ - inspectionProject.setInspectProjectNo(inspectionProject.getInspectType()+","+inspectionProject.getItem()+"," - +inspectionProject.getOperation()+","+inspectionProject.getStepId()+",*"); - inspectionProject.setSubStep("*"); - }else { - inspectionProject.setInspectProjectNo(inspectionProject.getInspectType()+","+inspectionProject.getItem()+"," - +inspectionProject.getOperation()+","+inspectionProject.getStepId()+","+inspectionProject.getSubStep()); - } - return inspectionProject.getInspectProjectNo(); - } - - @Override - public String findRevisionByCurrentRevision(String inspectProjectNo) { - String site = CommonMethods.getSite(); - return inspectionProjectMapper.findRevisionByCurrentRevision(site,inspectProjectNo); - } - - -} \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java index 5733a774..22ca9064 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java @@ -1,21 +1,26 @@ package com.foreverwin.mesnac.quality.service.impl; -import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.quality.model.SelfReport; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.meapi.dto.SfcDto; +import com.foreverwin.mesnac.production.mapper.SfcCrossMapper; import com.foreverwin.mesnac.quality.mapper.SelfReportMapper; +import com.foreverwin.mesnac.quality.model.SelfReport; import com.foreverwin.mesnac.quality.service.SelfReportService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; import com.visiprise.common.exception.BaseException; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; + /** *

* 自报代办事项 服务实现类 @@ -31,6 +36,8 @@ public class SelfReportServiceImpl extends ServiceImpl map) { + String site = CommonMethods.getSite(); + String sfc = (String)map.get("sfc"); + String resrce = (String)map.get("resrce"); + List list = (List)map.get("ncList"); + SfcDto sfcDto = new SfcDto(); + sfcDto.setSfc(sfc); + sfcDto.setResrce(resrce); + Map sfcMapper = sfcCorssMapper.querySfcData(site, LocaleContextHolder.getLocale().getLanguage(), sfcDto); + + + } + @Override public Object reject(String handle) { SelfReport selfReport = getById(handle); diff --git a/quality/src/main/resources/InspectionProjectDetailMapper.xml b/quality/src/main/resources/InspectionProjectDetailMapper.xml deleted file mode 100644 index b88454d9..00000000 --- a/quality/src/main/resources/InspectionProjectDetailMapper.xml +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HANDLE, INSPECT_PROJECT_BO, SEQ, PARAM_NO, DESCRIPTION, INSPECT_METHOD, PARAM_TYPE, PARAM_UNIT, DECIMAL_NUM, MIN_VALUE, STANDARD_VALUE, MAX_VALUE, FALSE_VALUE, TRUE_VALUE, IS_REQUIRED, CHECK_NUM, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO Z_INSPECTION_PROJECT_DETAIL - - HANDLE, - INSPECT_PROJECT_BO, - SEQ, - PARAM_NO, - DESCRIPTION, - INSPECT_METHOD, - PARAM_TYPE, - PARAM_UNIT, - DECIMAL_NUM, - MIN_VALUE, - STANDARD_VALUE, - MAX_VALUE, - FALSE_VALUE, - TRUE_VALUE, - IS_REQUIRED, - CHECK_NUM, - CREATE_USER, - CREATED_DATE_TIME, - MODIFY_USER, - MODIFIED_DATE_TIME, - VALUES - - #{handle}, - #{inspectProjectBo}, - #{seq}, - #{paramNo}, - #{description}, - #{inspectMethod}, - #{paramType}, - #{paramUnit}, - #{decimalNum}, - #{minValue}, - #{standardValue}, - #{maxValue}, - #{falseValue}, - #{trueValue}, - #{isRequired}, - #{checkNum}, - #{createUser}, - #{createdDateTime}, - #{modifyUser}, - #{modifiedDateTime}, - - - - - INSERT INTO Z_INSPECTION_PROJECT_DETAIL - - - VALUES - - #{handle}, - #{inspectProjectBo}, - #{seq}, - #{paramNo}, - #{description}, - #{inspectMethod}, - #{paramType}, - #{paramUnit}, - #{decimalNum}, - #{minValue}, - #{standardValue}, - #{maxValue}, - #{falseValue}, - #{trueValue}, - #{isRequired}, - #{checkNum}, - #{createUser}, - #{createdDateTime}, - #{modifyUser}, - #{modifiedDateTime}, - - - - - - UPDATE Z_INSPECTION_PROJECT_DETAIL - INSPECT_PROJECT_BO=#{et.inspectProjectBo}, - SEQ=#{et.seq}, - PARAM_NO=#{et.paramNo}, - DESCRIPTION=#{et.description}, - INSPECT_METHOD=#{et.inspectMethod}, - PARAM_TYPE=#{et.paramType}, - PARAM_UNIT=#{et.paramUnit}, - DECIMAL_NUM=#{et.decimalNum}, - MIN_VALUE=#{et.minValue}, - STANDARD_VALUE=#{et.standardValue}, - MAX_VALUE=#{et.maxValue}, - FALSE_VALUE=#{et.falseValue}, - TRUE_VALUE=#{et.trueValue}, - IS_REQUIRED=#{et.isRequired}, - CHECK_NUM=#{et.checkNum}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - - - - - UPDATE Z_INSPECTION_PROJECT_DETAIL - INSPECT_PROJECT_BO=#{et.inspectProjectBo}, - SEQ=#{et.seq}, - PARAM_NO=#{et.paramNo}, - DESCRIPTION=#{et.description}, - INSPECT_METHOD=#{et.inspectMethod}, - PARAM_TYPE=#{et.paramType}, - PARAM_UNIT=#{et.paramUnit}, - DECIMAL_NUM=#{et.decimalNum}, - MIN_VALUE=#{et.minValue}, - STANDARD_VALUE=#{et.standardValue}, - MAX_VALUE=#{et.maxValue}, - FALSE_VALUE=#{et.falseValue}, - TRUE_VALUE=#{et.trueValue}, - IS_REQUIRED=#{et.isRequired}, - CHECK_NUM=#{et.checkNum}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - - - - - UPDATE Z_INSPECTION_PROJECT_DETAIL - INSPECT_PROJECT_BO=#{et.inspectProjectBo}, - SEQ=#{et.seq}, - PARAM_NO=#{et.paramNo}, - DESCRIPTION=#{et.description}, - INSPECT_METHOD=#{et.inspectMethod}, - PARAM_TYPE=#{et.paramType}, - PARAM_UNIT=#{et.paramUnit}, - DECIMAL_NUM=#{et.decimalNum}, - MIN_VALUE=#{et.minValue}, - STANDARD_VALUE=#{et.standardValue}, - MAX_VALUE=#{et.maxValue}, - FALSE_VALUE=#{et.falseValue}, - TRUE_VALUE=#{et.trueValue}, - IS_REQUIRED=#{et.isRequired}, - CHECK_NUM=#{et.checkNum}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - - - - - HANDLE=#{ew.entity.handle} - AND INSPECT_PROJECT_BO=#{ew.entity.inspectProjectBo} - AND SEQ=#{ew.entity.seq} - AND PARAM_NO=#{ew.entity.paramNo} - AND DESCRIPTION=#{ew.entity.description} - AND INSPECT_METHOD=#{ew.entity.inspectMethod} - AND PARAM_TYPE=#{ew.entity.paramType} - AND PARAM_UNIT=#{ew.entity.paramUnit} - AND DECIMAL_NUM=#{ew.entity.decimalNum} - AND MIN_VALUE=#{ew.entity.minValue} - AND STANDARD_VALUE=#{ew.entity.standardValue} - AND MAX_VALUE=#{ew.entity.maxValue} - AND FALSE_VALUE=#{ew.entity.falseValue} - AND TRUE_VALUE=#{ew.entity.trueValue} - AND IS_REQUIRED=#{ew.entity.isRequired} - AND CHECK_NUM=#{ew.entity.checkNum} - AND CREATE_USER=#{ew.entity.createUser} - AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFY_USER=#{ew.entity.modifyUser} - AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - - - ${ew.sqlSegment} - - - - - ${ew.sqlSegment} - - - - - DELETE FROM Z_INSPECTION_PROJECT_DETAIL WHERE HANDLE=#{handle} - - - - DELETE FROM Z_INSPECTION_PROJECT_DETAIL - - - - - ${k} = #{cm[${k}]} - - - - - - - - DELETE FROM Z_INSPECTION_PROJECT_DETAIL - - - - - HANDLE=#{ew.entity.handle} - - AND INSPECT_PROJECT_BO=#{ew.entity.inspectProjectBo} - AND SEQ=#{ew.entity.seq} - AND PARAM_NO=#{ew.entity.paramNo} - AND DESCRIPTION=#{ew.entity.description} - AND INSPECT_METHOD=#{ew.entity.inspectMethod} - AND PARAM_TYPE=#{ew.entity.paramType} - AND PARAM_UNIT=#{ew.entity.paramUnit} - AND DECIMAL_NUM=#{ew.entity.decimalNum} - AND MIN_VALUE=#{ew.entity.minValue} - AND STANDARD_VALUE=#{ew.entity.standardValue} - AND MAX_VALUE=#{ew.entity.maxValue} - AND FALSE_VALUE=#{ew.entity.falseValue} - AND TRUE_VALUE=#{ew.entity.trueValue} - AND IS_REQUIRED=#{ew.entity.isRequired} - AND CHECK_NUM=#{ew.entity.checkNum} - AND CREATE_USER=#{ew.entity.createUser} - AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFY_USER=#{ew.entity.modifyUser} - AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - - - ${ew.sqlSegment} - - - - - ${ew.sqlSegment} - - - - - DELETE FROM Z_INSPECTION_PROJECT_DETAIL WHERE HANDLE IN ( - #{item} - ) - - - - diff --git a/quality/src/main/resources/InspectionProjectMapper.xml b/quality/src/main/resources/InspectionProjectMapper.xml deleted file mode 100644 index c5e6ce72..00000000 --- a/quality/src/main/resources/InspectionProjectMapper.xml +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - HANDLE, SITE, INSPECT_PROJECT_NO, INSPECT_TYPE, REVISION, CURRENT_REVISION, DESCRIPTION, STATUS, ITEM_BO, ITEM, OPERATION, STEP_ID, SUB_STEP, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO Z_INSPECTION_PROJECT - - HANDLE, - SITE, - INSPECT_PROJECT_NO, - INSPECT_TYPE, - REVISION, - CURRENT_REVISION, - DESCRIPTION, - STATUS, - ITEM_BO, - ITEM, - OPERATION, - STEP_ID, - SUB_STEP, - CREATE_USER, - CREATED_DATE_TIME, - MODIFY_USER, - MODIFIED_DATE_TIME, - VALUES - - #{handle}, - #{site}, - #{inspectProjectNo}, - #{inspectType}, - #{revision}, - #{currentRevision}, - #{description}, - #{status}, - #{itemBo}, - #{item}, - #{operation}, - #{stepId}, - #{subStep}, - #{createUser}, - #{createdDateTime}, - #{modifyUser}, - #{modifiedDateTime}, - - - - - INSERT INTO Z_INSPECTION_PROJECT - - - VALUES - - #{handle}, - #{site}, - #{inspectProjectNo}, - #{inspectType}, - #{revision}, - #{currentRevision}, - #{description}, - #{status}, - #{itemBo}, - #{item}, - #{operation}, - #{stepId}, - #{subStep}, - #{createUser}, - #{createdDateTime}, - #{modifyUser}, - #{modifiedDateTime}, - - - - - - UPDATE Z_INSPECTION_PROJECT - SITE=#{et.site}, - INSPECT_PROJECT_NO=#{et.inspectProjectNo}, - INSPECT_TYPE=#{et.inspectType}, - REVISION=#{et.revision}, - CURRENT_REVISION=#{et.currentRevision}, - DESCRIPTION=#{et.description}, - STATUS=#{et.status}, - ITEM_BO=#{et.itemBo}, - ITEM=#{et.item}, - OPERATION=#{et.operation}, - STEP_ID=#{et.stepId}, - SUB_STEP=#{et.subStep}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - - - - - UPDATE Z_INSPECTION_PROJECT - SITE=#{et.site}, - INSPECT_PROJECT_NO=#{et.inspectProjectNo}, - INSPECT_TYPE=#{et.inspectType}, - REVISION=#{et.revision}, - CURRENT_REVISION=#{et.currentRevision}, - DESCRIPTION=#{et.description}, - STATUS=#{et.status}, - ITEM_BO=#{et.itemBo}, - ITEM=#{et.item}, - OPERATION=#{et.operation}, - STEP_ID=#{et.stepId}, - SUB_STEP=#{et.subStep}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} - - - - - UPDATE Z_INSPECTION_PROJECT - SITE=#{et.site}, - INSPECT_PROJECT_NO=#{et.inspectProjectNo}, - INSPECT_TYPE=#{et.inspectType}, - REVISION=#{et.revision}, - CURRENT_REVISION=#{et.currentRevision}, - DESCRIPTION=#{et.description}, - STATUS=#{et.status}, - ITEM_BO=#{et.itemBo}, - ITEM=#{et.item}, - OPERATION=#{et.operation}, - STEP_ID=#{et.stepId}, - SUB_STEP=#{et.subStep}, - CREATE_USER=#{et.createUser}, - CREATED_DATE_TIME=#{et.createdDateTime}, - MODIFY_USER=#{et.modifyUser}, - MODIFIED_DATE_TIME=#{et.modifiedDateTime}, - - - - - HANDLE=#{ew.entity.handle} - AND SITE=#{ew.entity.site} - AND INSPECT_PROJECT_NO=#{ew.entity.inspectProjectNo} - AND INSPECT_TYPE=#{ew.entity.inspectType} - AND REVISION=#{ew.entity.revision} - AND CURRENT_REVISION=#{ew.entity.currentRevision} - AND DESCRIPTION=#{ew.entity.description} - AND STATUS=#{ew.entity.status} - AND ITEM_BO=#{ew.entity.itemBo} - AND ITEM=#{ew.entity.item} - AND OPERATION=#{ew.entity.operation} - AND STEP_ID=#{ew.entity.stepId} - AND SUB_STEP=#{ew.entity.subStep} - AND CREATE_USER=#{ew.entity.createUser} - AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFY_USER=#{ew.entity.modifyUser} - AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - - - ${ew.sqlSegment} - - - - - ${ew.sqlSegment} - - - - - DELETE FROM Z_INSPECTION_PROJECT WHERE HANDLE=#{handle} - - - - DELETE FROM Z_INSPECTION_PROJECT - - - - - ${k} = #{cm[${k}]} - - - - - - - - DELETE FROM Z_INSPECTION_PROJECT - - - - - HANDLE=#{ew.entity.handle} - - AND SITE=#{ew.entity.site} - AND INSPECT_PROJECT_NO=#{ew.entity.inspectProjectNo} - AND INSPECT_TYPE=#{ew.entity.inspectType} - AND REVISION=#{ew.entity.revision} - AND CURRENT_REVISION=#{ew.entity.currentRevision} - AND DESCRIPTION=#{ew.entity.description} - AND STATUS=#{ew.entity.status} - AND ITEM_BO=#{ew.entity.itemBo} - AND ITEM=#{ew.entity.item} - AND OPERATION=#{ew.entity.operation} - AND STEP_ID=#{ew.entity.stepId} - AND SUB_STEP=#{ew.entity.subStep} - AND CREATE_USER=#{ew.entity.createUser} - AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} - AND MODIFY_USER=#{ew.entity.modifyUser} - AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - - - ${ew.sqlSegment} - - - - - ${ew.sqlSegment} - - - - - DELETE FROM Z_INSPECTION_PROJECT WHERE HANDLE IN ( - #{item} - ) - - - - -