diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 7341ecfc..08d54141 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -69,7 +69,7 @@ public class SysLoginService { throw new ServiceException("用户名不在指定范围"); } // IP黑名单校验 - isBlackIp(username); +// isBlackIp(username); // 查询用户信息 R userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java index aa4dee25..8474f537 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java @@ -120,7 +120,7 @@ public class NwRegisterServiceImpl implements NwRegisterService { if (StringUtils.isEmpty(registerForms.getMobilePhone())) { throw new BaseException(NwLoginConstants.PHONE_NOT_NULL_CODE, NwLoginConstants.PHONE_NOT_NULL_MSG); } - if (!this.checkPhone(registerForms.getMobilePhone())) { + if (!checkPhone(registerForms.getMobilePhone())) { throw new BaseException(NwLoginConstants.MOBILE_FORMAT_ERROR_CODE, NwLoginConstants.MOBILE_FORMAT_ERROR_CODE_MSG); } if (StringUtils.isBlank(registerForms.getUserAccount())) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java index 39abd080..a8e17acd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckDetailsController.java @@ -73,6 +73,16 @@ public class PurchaseCheckDetailsController extends BaseController return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsByTaskId(taskId)); } + /** + * 新购验收提交审核 + */ + @ApiOperation(value = "新购验收提交审核") + @GetMapping(value = "/submitCheck/{taskId}") + public AjaxResult submitCheck(@PathVariable("taskId") Long taskId) + { + return purchaseCheckDetailsService.submitCheck(taskId); + } + /** * 新增新购验收任务详细 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index 76851136..dad9f704 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -44,21 +44,8 @@ public class PurchaseCheckInfoController extends BaseController { @ApiOperation("查询新购入库任务列表") @GetMapping("/putInList") public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { - List list = new ArrayList<>(); - //判断该组织是否开启综合服务中心审核 - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - int re = purchaseCheckServiceCenterService.selectExamineType(companyId); startPage(); - list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); - /*if (re > 0) { - //若依框架多个查询会导致分页失效，需分批处理 - startPage(); - list = purchaseCheckInfoService.selectPutInListExamine(purchaseCheckInfo); - } else { - startPage(); - list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); - }*/ - return getDataTable(list); + return getDataTable(purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo)); } /** @@ -163,6 +150,10 @@ public class PurchaseCheckInfoController extends BaseController { @Log(title = "新购验收任务", businessType = BusinessType.DELETE) @DeleteMapping("/{taskId}") public AjaxResult remove(@PathVariable Long taskId) { - return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId)); + try { + return purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId); + } catch (Exception e) { + return AjaxResult.error("删除失败"); + } } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index ee66601b..8c85558e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -47,14 +47,7 @@ public class PurchaseCheckServiceCenterController extends BaseController public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { startPage(); - List list=new ArrayList<>(); - //判断该组织是否开启综合服务中心审核 - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - int re =purchaseCheckServiceCenterService.selectExamineType(companyId); - if (re>0){ - list = purchaseCheckServiceCenterService.selectPutInListList(purchaseCheckInfo); - } - return getDataTable(list); + return getDataTable(purchaseCheckServiceCenterService.selectPutInListList(purchaseCheckInfo)); } /** @@ -73,8 +66,14 @@ public class PurchaseCheckServiceCenterController extends BaseController */ @ApiOperation(value = "综合服务中心审核") @PutMapping("/manageStatus") - public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { - return toAjax(purchaseCheckServiceCenterService.modifyManageStatus(maInputVO)); + public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO){ + try { + return purchaseCheckServiceCenterService.modifyManageStatus(maInputVO); + } catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error("审核失败"); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index bbf4927e..f96250b7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -124,7 +124,12 @@ public class PurchaseMacodeInfoController extends BaseController { @Log(title = "新购验收任务", businessType = BusinessType.MATERIAL) @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { - return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); + try { + return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); + } catch (Exception e){ + e.printStackTrace(); + return AjaxResult.error("审核失败"); + } } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java index c8eafccd..e281c950 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java @@ -123,6 +123,18 @@ public class PurchaseCheckInfo extends BaseEntity @ApiModelProperty(value = "新购验收任务详情") private List checkDetailsList; + /** + * 通过数量 + */ + @ApiModelProperty(value = "通过数量") + private Integer passNum; + + /** + * 未通过数量 + */ + @ApiModelProperty(value = "未通过数量") + private Integer noPassNum; + @@ -133,6 +145,22 @@ public class PurchaseCheckInfo extends BaseEntity private Integer taskStatus; private String keyWord; + public Integer getPassNum() { + return passNum; + } + + public void setPassNum(Integer passNum) { + this.passNum = passNum; + } + + public Integer getNoPassNum() { + return noPassNum; + } + + public void setNoPassNum(Integer noPassNum) { + this.noPassNum = noPassNum; + } + public Long getId() { return id; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index d545a92d..2f636c39 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.mapper; +import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.domain.PurchaseCheckDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -151,4 +152,11 @@ public interface PurchaseCheckDetailsMapper { int updateStatusByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails); int updateByTaskId(@Param("taskId") Long taskId,@Param("typeId") Long typeId); + + /** + * 修改purchase_check_details表设备状态 + * @param maInputRecord + * @return + */ + int updatePuchaseCheckDetailsStatus(MaInputRecord maInputRecord); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java index cc30fe69..4098f73e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java @@ -122,4 +122,20 @@ public interface PurchaseCheckInfoMapper { List selectTypeNameAndManageTypeByTaskId(Long taskId); List getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo); + + /** + * 查询 + * + * @param taskId + * @return + */ + List selectPurchaseMacodeInfoByTaskId(Long taskId); + + /** + * 删除 + * + * @param code + * @return + */ + int deletePurchaseMacodeInfoByTaskId(String code); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java index 8874fbab..c8cafee7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java @@ -206,4 +206,25 @@ public interface PurchaseCheckServiceCenterMapper * @return */ int selectPurchaseCheckDetailsStatus(Long taskId); + + /** + * 修改purchase_macode_info表设备状态 + * @param maInputRecord + * @return + */ + int updatePurchaseMacodeInfoStatus(MaInputRecord maInputRecord); + + /** + * 判断该任务该类型是否全部操作 + * @param maInputRecord + * @return + */ + int isOperateAllPurchaseMacodeInfo(MaInputRecord maInputRecord); + + /** + * 判断该任务该类型是否全部不通过 + * @param maInputRecord + * @return + */ + int isOperateAllNot(MaInputRecord maInputRecord); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 9d8f7232..66e1f4d9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -5,10 +5,7 @@ import com.bonus.sgzb.base.api.domain.MaLabelBind; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaMachineLabel; import com.bonus.sgzb.base.api.domain.MaType; -import com.bonus.sgzb.material.domain.InputApplyDetails; -import com.bonus.sgzb.material.domain.MaInputRecord; -import com.bonus.sgzb.material.domain.MachinePart; -import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; +import com.bonus.sgzb.material.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -282,4 +279,25 @@ public interface PurchaseMacodeInfoMapper { int updateMaTypeNum(MachinePart wholeSetDetail); List selectPurchaseMacodeInfoListDetails(PurchaseMacodeInfo purchaseMacodeInfo); + + /** + * 判断该任务该类型是否全部操作 + * @param maInputRecord + * @return + */ + int isOperateAllPurchaseMacodeInfo(MaInputRecord maInputRecord); + + /** + * 判断该任务该类型是否全部操作 + * @param maInputRecord + * @return + */ + PurchaseCheckInfo selectPassAndNoPassNum(MaInputRecord maInputRecord); + + /** + * 判断是全通过还是部分通过 + * @param taskId + * @return + */ + int isOperateAllPass(Long taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java index 94f87b25..bbfc41d0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckDetailsService.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.service; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.PurchaseCheckDetails; import java.util.List; @@ -59,4 +60,12 @@ public interface IPurchaseCheckDetailsService * @return 结果 */ public int deletePurchaseCheckDetailsByTaskId(Long id); + + /** + * 新购验收提交审核 + * + * @param taskId + * @return + */ + AjaxResult submitCheck(Long taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java index 8d3c2fcc..6b5f6495 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.service; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.BmNoticeInfo; import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -62,7 +63,7 @@ public interface IPurchaseCheckInfoService * @param taskId 新购验收任务purchase_check_info主键 * @return 结果 */ - public int deletePurchaseCheckInfoByTaskId(Long taskId); + public AjaxResult deletePurchaseCheckInfoByTaskId(Long taskId); /** * 验收通知 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java index cff0f674..139169b0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.service; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; @@ -115,7 +116,7 @@ public interface PurchaseCheckServiceCenterService * @param maInputVO * @return */ - int modifyManageStatus(MaInputVO maInputVO); + AjaxResult modifyManageStatus(MaInputVO maInputVO); /** * 查询组织是否开启审核 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 5b04b893..3dec5ca2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -1,11 +1,17 @@ package com.bonus.sgzb.material.service.impl; +import java.math.BigDecimal; import java.util.List; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.PurchaseCheckDetails; +import com.bonus.sgzb.material.domain.PurchaseCheckInfo; +import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; +import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; +import com.bonus.sgzb.material.mapper.PurchaseMacodeInfoMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.service.IPurchaseCheckDetailsService; import com.bonus.sgzb.common.core.utils.DateUtils; @@ -26,6 +32,12 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer @Resource private PurchaseCheckDetailsMapper purchaseCheckDetailsMapper; + @Resource + private PurchaseMacodeInfoMapper purchaseMacodeInfoMapper; + + @Resource + private PurchaseCheckInfoMapper purchaseCheckInfoMapper; + @Resource private TaskMapper taskMapper; @@ -75,7 +87,13 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { taskId = purchaseCheckDetails.getTaskId(); if ("通过".equals(purchaseCheckDetails.getCheckResult())) { - purchaseCheckDetails.setStatus(1); + //前端去除驳回操作，验收数量为0即为驳回 + if (purchaseCheckDetails.getCheckNum() == null || purchaseCheckDetails.getCheckNum().compareTo(BigDecimal.ZERO) == 0){ + purchaseCheckDetails.setStatus(3); + purchaseCheckDetails.setCheckResult("不通过"); + }else { + purchaseCheckDetails.setStatus(1); + } } else if ("不通过".equals(purchaseCheckDetails.getCheckResult())) { purchaseCheckDetails.setStatus(3); } else { @@ -131,4 +149,57 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer public int deletePurchaseCheckDetailsByTaskId(Long id) { return purchaseCheckDetailsMapper.deletePurchaseCheckDetailsByTaskId(id); } + + @Override + public AjaxResult submitCheck(Long taskId) { + //查询该任务中是否有编码设备 + List taskInfoList = purchaseCheckInfoMapper.selectTypeNameAndManageTypeByTaskId(taskId); + if (taskInfoList.size() > 0){ + if (taskInfoList.get(0).getManageType().contains("0")){ + //有编码设备判断是否绑定 + PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); + purchaseMacodeInfo.setTaskId(taskId); + List purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo); + if (purchaseMacodeInfoList.size() > 0){ + for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) { + // 将Integer转换为BigDecimal + BigDecimal bindNumDecimal = new BigDecimal(purchaseMacodeInfo1.getBindNum()); + // 使用compareTo方法进行比较 + int comparisonResult = bindNumDecimal.compareTo(purchaseMacodeInfo1.getCheckNum()); + if (comparisonResult<0){ + //有未绑定设备 + return AjaxResult.error("该任务有未绑定的编码设备，请先绑定"); + } + } + //全部已绑定，提交审核 + return updateTaskStatus(taskId,122); + }else { + //提交审核失败 + return AjaxResult.error("提交审核失败"); + } + }else { + //无编码设备，提交审核 + return updateTaskStatus(taskId,122); + } + }else { + return AjaxResult.error("提交审核失败"); + } + } + + /** + * 修改任务状态 + */ + public AjaxResult updateTaskStatus(Long taskId,int taskStatus){ + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(taskStatus); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + int i =taskMapper.updateTmTask(task); + if (i>0){ + return AjaxResult.success("提交审核成功"); + }else { + return AjaxResult.error("提交审核失败"); + } + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index 48e0ecf2..b72bf086 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; @@ -66,7 +67,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPutInListList(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPutInListList(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(), "2"); + String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(), "3"); checkInfo.setPurchasingTypeName(typeName); } return purchaseCheckInfos; @@ -250,20 +251,38 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { * @return 结果 */ @Override - public int deletePurchaseCheckInfoByTaskId(Long taskId) { - int result = 0; - try { - // 第一步：删除验收任务表 - purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId); - // 第二步：删除验收任务详情表 - purchaseCheckDetailsMapper.deleteCheckDetailsByTaskId(taskId); - // 第三步：删除任务表 - taskMapper.deleteTmTaskByTaskId(taskId); - result = 1; - } catch (Exception e) { - throw new RuntimeException(e); + @Transactional(rollbackFor = Exception.class) + public AjaxResult deletePurchaseCheckInfoByTaskId(Long taskId) { + int result = 1; + // 第一步：删除验收任务表 + result = purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId); + if (result <= 0) { + throw new RuntimeException("删除验收任务表失败"); } - return result; + // 第二步：删除验收任务详情表 + result = purchaseCheckDetailsMapper.deleteCheckDetailsByTaskId(taskId); + if (result <= 0) { + throw new RuntimeException("删除验收任务详情表失败"); + } + // 第三步：删除任务表 + result = taskMapper.deleteTmTaskByTaskId(taskId); + if (result <= 0) { + throw new RuntimeException("删除任务表失败"); + } + //先查询该任务下purchase_macode_info表是否有数据 + List purchaseCheckInfoList = purchaseCheckInfoMapper.selectPurchaseMacodeInfoByTaskId(taskId); + if (purchaseCheckInfoList.size() > 0) { + for (PurchaseCheckInfo purchaseCheckInfo : purchaseCheckInfoList) { + //删除ma_machine、ma_machine_label、ma_label_bind、purchase_macode_info等表 + result = purchaseCheckInfoMapper.deletePurchaseMacodeInfoByTaskId(purchaseCheckInfo.getCode()); + if (result <= 0) { + throw new RuntimeException("删除ma_machine、ma_machine_label、ma_label_bind、purchase_macode_info等表失败"); + } + } + } else { + result = 1; + } + return result > 0 ? AjaxResult.success() : AjaxResult.error(); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java index 227482cd..b7cf726f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; @@ -140,65 +141,106 @@ public class PurchaseCheckServiceCenterServiceImpl implements PurchaseCheckServi * @return 结果 */ @Override - public int modifyManageStatus(MaInputVO maInputVO) { + @Transactional(rollbackFor = Exception.class) + public AjaxResult modifyManageStatus(MaInputVO maInputVO) { Long taskId = maInputVO.getTaskId(); String checkResult = maInputVO.getCheckResult(); List inputRecordList = maInputVO.getInputRecordList(); for (MaInputRecord maInputRecord : inputRecordList) { - Long typeId = maInputRecord.getTypeId(); - - //修改编码管理表入库状态 - PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); - purchaseMacodeInfo.setTaskId(taskId); - purchaseMacodeInfo.setTypeId(typeId); - purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode()); - - // 修改验收任务详细表入库数量 - if ("1".equals(checkResult)) { - //修改机具状态为在库 - PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails(); - purchaseCheckDetails.setStatus(6); - purchaseCheckDetails.setTaskId(taskId); - purchaseCheckDetails.setTypeId(typeId); - checkDetailsMapper.updateStatusByTaskIdTypeId(purchaseCheckDetails); - }else { - //删除ma_machine表 - purchaseCheckServiceCenterMapper.deleteMaMachineInfoByMaId(maInputRecord.getMaId()); - //删除ma_machine_label表 - purchaseCheckServiceCenterMapper.deleteMaMachineLabelByMaId(maInputRecord.getMaId()); - //删除ma_label_bind表 - purchaseCheckServiceCenterMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId()); - //修改purchase_macode_info表 - purchaseCheckServiceCenterMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId,typeId,maInputRecord.getMaCode()); - //修改purchase_check_details表 - checkDetailsMapper.updateByTaskId(taskId,typeId); + //判断是编码设备还是数量 + if (StringHelper.isNotEmpty(maInputRecord.getMaCode())) { + //编码设备先修改purchase_macode_info表设备状态 + int i = updatePurchaseMacodeInfoStatus(maInputRecord, checkResult); + if (i > 0) { + //再判断该任务该类型是否全部操作，全部操作后修改purchase_check_details表状态 + if (purchaseCheckServiceCenterMapper.isOperateAllPurchaseMacodeInfo(maInputRecord) <= 0) { + //判断是否全部不通过 + if (purchaseCheckServiceCenterMapper.isOperateAllNot(maInputRecord) <= 0) { + //修改purchase_check_details表状态 综合服务中心-不通过 + i = updatePuchaseCheckDetails(maInputRecord, "7"); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } + } else { + //修改purchase_check_details表状态 综合服务中心-通过 + i = updatePuchaseCheckDetails(maInputRecord, "6"); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } + } + } + } else { + throw new RuntimeException("状态修改失败"); + } + } else { + //直接修改purchase_check_details表设备状态 + if ("1".equals(checkResult)){ + int i = updatePuchaseCheckDetails(maInputRecord, "6"); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } + }else { + int i = updatePuchaseCheckDetails(maInputRecord, "7"); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } + } } } - //判断是否全部已操作（通过或不通过） - int count=purchaseCheckServiceCenterMapper.isOperateAll(taskId); - if (count<=0) { + int count = purchaseCheckServiceCenterMapper.isOperateAll(taskId); + if (count <= 0) { //是否为全部不通过 int count1 = purchaseCheckServiceCenterMapper.selectPurchaseCheckDetailsStatus(taskId); if (count1 <= 0) { - //是则将任务状态改为验收不通过 - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(106); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + //全部不通过，任务状态改为综合服务中心审核不通过 + int i = updateTaskStatus(taskId, 106); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } } else { - // 当全部操作,修改任务为验收状态 - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(105); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + // 否则，任务状态改为综合服务中心审核通过 + int i = updateTaskStatus(taskId, 105); + if (i <= 0) { + throw new RuntimeException("状态修改失败"); + } } } - return 1; + return AjaxResult.success("审核成功"); + } + + /** + * 修改任务状态 + */ + public int updateTaskStatus(Long taskId, int taskStatus) { + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(taskStatus); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + return taskMapper.updateTmTask(task); + } + + /** + * 修改purchase_check_details表设备状态 + */ + private int updatePuchaseCheckDetails(MaInputRecord maInputRecord, String state) { + maInputRecord.setStatus(state); + return checkDetailsMapper.updatePuchaseCheckDetailsStatus(maInputRecord); + } + + /** + * 修改purchase_macode_info表设备状态 + */ + private int updatePurchaseMacodeInfoStatus(MaInputRecord maInputRecord ,String checkResult) { + if ("1".equals(checkResult)){ + //综合服务中心通过 + maInputRecord.setStatus("3"); + }else { + //综合服务中心不通过 + maInputRecord.setStatus("4"); + } + return purchaseCheckServiceCenterMapper.updatePurchaseMacodeInfoStatus(maInputRecord); } @Override diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 02d3fa20..9e77dda6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject; import com.bonus.sgzb.base.api.domain.*; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; @@ -296,31 +297,53 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService * 通过/不通过 */ @Override + @Transactional(rollbackFor = Exception.class) public int modifyManageStatus(MaInputVO maInputVO) { Long taskId = maInputVO.getTaskId(); String checkResult = maInputVO.getCheckResult(); List inputRecordList = maInputVO.getInputRecordList(); for (MaInputRecord maInputRecord : inputRecordList) { + int i; Long typeId = maInputRecord.getTypeId(); - // 修改机具入库状态 - MaMachine maMachine = new MaMachine(); - maMachine.setMaId(maInputRecord.getMaId()); - maMachine.setMaCode(maInputRecord.getMaCode()); + //判断是编码设备还是数量设备 + if (StringHelper.isNotEmpty(maInputRecord.getMaCode())){ + //编码设备--修改机具状态 + i = updataMaMachineStatus(maInputRecord,checkResult); + if (i>0){ + //修改purchase_macode_info表设备状态 + i = updatePurchaseMacodeInfoStatus(maInputRecord,checkResult); + if (i>0){ + //判断该任务该类型是否全部操作，全部操作后修改purchase_check_details表状态 + if (purchaseMacodeInfoMapper.isOperateAllPurchaseMacodeInfo(maInputRecord) <= 0) { + //查询通过和未通过数量 + PurchaseCheckInfo purchaseCheckInfo = purchaseMacodeInfoMapper.selectPassAndNoPassNum(maInputRecord); + if (purchaseCheckInfo != null && purchaseCheckInfo.getPassNum()==0){ + //修改purchase_check_details表状态--全部未通过 + updatePuchaseCheckDetails(maInputRecord,"5"); + }else if (purchaseCheckInfo != null && purchaseCheckInfo.getNoPassNum()==0){ + //修改purchase_check_details表状态--全部通过 + updatePuchaseCheckDetails(maInputRecord,"4"); + }else if (purchaseCheckInfo != null && purchaseCheckInfo.getPassNum()>0 && purchaseCheckInfo.getNoPassNum()>0){ + //修改purchase_check_details表状态--部分通过(状态暂时给通过) + updatePuchaseCheckDetails(maInputRecord,"4"); + } + } + }else { + throw new RuntimeException("修改purchase_macode_info表设备状态失败"); + } + }else { + throw new RuntimeException("修改ma_machine机具状态失败"); + } + }else { + //修改purchase_check_details表状态 + if ("1".equals(checkResult)){ + updatePuchaseCheckDetails(maInputRecord,"4"); + }else { + updatePuchaseCheckDetails(maInputRecord,"5"); + } + } - //修改编码管理表入库状态 - PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); - purchaseMacodeInfo.setTaskId(taskId); - purchaseMacodeInfo.setTypeId(typeId); - purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode()); - - // 修改验收任务详细表入库数量 - if ("1".equals(checkResult)) { - //修改机具状态为在库 - maMachine.setMaStatus("15"); - purchaseMacodeInfoMapper.updateMaMachine(maMachine); - - - // 修改编码管理的入库状态 + if ("1".equals(checkResult)){ MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId); // 库存添加 maType.setNum((maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum()) @@ -343,7 +366,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService purchaseCheckDetails.setTaskId(taskId); purchaseCheckDetails.setTypeId(typeId); purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum())); - purchaseCheckDetails.setStatus(4); checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails); // 新增入库任务详细表 @@ -358,38 +380,99 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService applyDetails.setCompanyId(maInputRecord.getCompanyId()); purchaseMacodeInfoMapper.insertInputApplyDetails(applyDetails); - purchaseMacodeInfo.setStatus("1"); - purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo); - // 新增入库记录 purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord); - } else { - //删除ma_machine表 - purchaseMacodeInfoMapper.deleteMaMachineInfoByMaId(maInputRecord.getMaId()); - //删除ma_machine_label表 - purchaseMacodeInfoMapper.deleteMaMachineLabelByMaId(maInputRecord.getMaId()); - //删除ma_label_bind表 - purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId()); - //修改purchase_macode_info表 - purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId, typeId, maInputRecord.getMaCode()); - //修改purchase_check_details表 - checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId); + }else { } } //判断是否全部已操作（通过或不通过） int count=purchaseMacodeInfoMapper.isOperateAll(taskId); if (count<=0){ - //全部审核任务状态改为已审核 - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - taskMapper.updateTmTask(task); + int i; + //是否为全部不通过 + int count1 = purchaseMacodeInfoMapper.selectPurchaseCheckDetailsStatus(taskId); + if (count1<=0){ + //全不通过 + i=updateTaskStatus(taskId,107); + if (i<=0){ + throw new RuntimeException("修改任务状态失败"); + } + }else { + //判断是全通过还是部分通过 + int count2 = purchaseMacodeInfoMapper.isOperateAllPass(taskId); + if (count2>0){ + //部分通过 + i=updateTaskStatus(taskId,123); + if (i<=0){ + throw new RuntimeException("修改任务状态失败"); + } + }else { + //全部通过 + i=updateTaskStatus(taskId,28); + if (i<=0){ + throw new RuntimeException("修改任务状态失败"); + } + } + } } return 1; } + /** + * 修改任务状态 + */ + public int updateTaskStatus(Long taskId, int taskStatus) { + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(taskStatus); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + return taskMapper.updateTmTask(task); + } + + /** + * 修改purchase_check_details表设备状态 + */ + private int updatePuchaseCheckDetails(MaInputRecord maInputRecord, String state) { + maInputRecord.setStatus(state); + return checkDetailsMapper.updatePuchaseCheckDetailsStatus(maInputRecord); + } + + /** + * 修改ma_machine表设备状态 + */ + private int updataMaMachineStatus(MaInputRecord maInputRecord, String checkResult) { + int i=1; + if ("1".equals(checkResult)){ + //修改机具状态为在库 + MaMachine maMachine = new MaMachine(); + maMachine.setMaId(maInputRecord.getMaId()); + maMachine.setMaCode(maInputRecord.getMaCode()); + maMachine.setMaStatus("15"); + i= purchaseMacodeInfoMapper.updateMaMachine(maMachine); + } + return i; + } + + /** + * 修改purchase_macode_info表设备状态 + */ + private int updatePurchaseMacodeInfoStatus(MaInputRecord maInputRecord ,String checkResult) { + //修改编码管理表入库状态 + PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo(); + purchaseMacodeInfo.setTaskId(maInputRecord.getTaskId()); + purchaseMacodeInfo.setTypeId(maInputRecord.getTypeId()); + purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode()); + if ("1".equals(checkResult)){ + //入库通过 + purchaseMacodeInfo.setStatus("1"); + }else { + //入库不通过 + purchaseMacodeInfo.setStatus("2"); + } + return purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo); + } + private List selectPutinDetailsAddTypeId(PurchaseMacodeInfo purchaseMacodeInfo) { return purchaseMacodeInfoMapper.selectPutinDetailsAddTypeId(purchaseMacodeInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 82af489c..9d6ae2ec 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -250,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update purchase_check_details set check_num = #{inputNum},status = #{status},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId} + update purchase_check_details set check_num = #{inputNum},input_num=#{inputNum},input_status='1',input_time=NOW() where task_id = #{taskId} and type_id = #{typeId} update purchase_check_details set status = '0' where task_id = #{taskId} @@ -267,4 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update purchase_check_details set bind_num = bind_num - 1 , status='7' where task_id = #{taskId} and type_id = #{typeId} + + update purchase_check_details set status = #{status} where task_id = #{taskId} and type_id = #{typeId} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index ac6cffa5..cd15965e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on pci.purchaser = su.user_id LEFT JOIN purchase_check_details pcd on pcd.task_id=pci.task_id where task_type = 23 + and tk.task_status = #{taskStatus} and (tk.code like concat('%',#{keyWord},'%') or su.nick_name like concat('%',#{keyWord},'%') @@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')) - or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))) + AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}) + or (pci.arrival_time BETWEEN #{startTime} AND #{endTime}) GROUP BY pcd.task_id order by pci.create_time desc @@ -119,6 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taskId} + + DELETE + ma_machine, ma_label_bind, ma_machine_label, purchase_macode_info +FROM ma_machine +LEFT JOIN ma_label_bind ON ma_machine.ma_id = ma_label_bind.ma_id +LEFT JOIN ma_machine_label ON ma_machine.ma_id = ma_machine_label.ma_id +LEFT JOIN purchase_macode_info ON ma_machine.ma_code = purchase_macode_info.ma_code +WHERE ma_machine.ma_code = + #{code} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index f999f385..334b9c3f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_id = #{taskId} and type_id = #{typeId} + + update purchase_macode_info set status = #{status} where task_id = #{taskId} and ma_code = #{maCode} and type_id = #{typeId} + delete from purchase_check_info where task_id = #{taskId} @@ -276,7 +279,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on pci.purchaser = su.user_id LEFT JOIN sys_user us on us.user_id = tk.update_by LEFT JOIN purchase_check_details pcd on pcd.task_id=pci.task_id - where task_type = 23 and tk.task_status in (26,28,105,106,107) + where task_type = 23 + and tk.task_status = #{taskStatus} + and tk.task_status in (28,105,106,107,122,123) and (tk.code like concat('%',#{keyWord},'%') or su.user_name like concat('%',#{keyWord},'%') @@ -294,8 +299,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')) - or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))) + AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}) + or (pci.arrival_time BETWEEN #{startTime} AND #{endTime}) GROUP BY pcd.task_id order by pci.id desc @@ -436,4 +441,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE task_id = #{taskId} and status != 7 and `status` !=3 + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 14d02896..08eca158 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -366,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" CASE WHEN pmi.ma_code is null THEN CASE + WHEN pcd.status = 6 THEN 0 WHEN pcd.status = 4 THEN 1 WHEN pcd.status = 5 THEN 2 ELSE 0 @@ -376,7 +377,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mm.ma_id maId, if(pmi.ma_code is not null, 1, pcd.check_num) checkNum from purchase_check_details pcd - left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id + left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id and pmi.`status`!='4' left join ma_machine mm on pmi.ma_code = mm.ma_code left join ma_type mt on pcd.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id @@ -439,7 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id WHERE pcd.task_id = #{taskId} - AND pcd.`status` != 3 + AND pcd.`status` != '3' and pcd.`status`!='7' and (mt.type_name like concat('%',#{dictName},'%') or mt1.type_name like concat('%',#{dictName},'%')) @@ -448,8 +449,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" STATUS ) aa WHERE - `status` != 0 - AND `status` !=2 + `status` ='1' + + + update ma_type set num = #{num} where type_id = #{typeId} diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js index 26ac03d3..caf740d2 100644 --- a/sgzb-ui/src/api/store/newBuy.js +++ b/sgzb-ui/src/api/store/newBuy.js @@ -323,6 +323,15 @@ export function purchaseCheckInfoRemove(maCode) { method: 'delete', }) } + +//提交审核 +export function submitCheck(taskId) { + return request({ + url: `/material/purchaseCheckDetails/submitCheck/${taskId}`, + method: 'get', + }) +} + //新增计划管理 export function addPlanManagement(data) { return request({ @@ -371,4 +380,4 @@ export function getBindCodeDetails(query) { method: 'get', params: query, }) -} \ No newline at end of file +} diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index 612beb5c..8e0edb3a 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -46,7 +46,7 @@ - +