From 6957a7450a30cc3964b18bf591055c1969901fc0 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 10 Oct 2022 15:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=A3=E8=B9=84=E7=96=AB=E5=85=B0=E6=89=80?= =?UTF-8?q?=E5=8D=95=E6=9D=BF=E4=B8=B4=E7=95=8C=E5=80=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/ApplyController.java | 79 +++---------------- .../lims/controller/ContractController.java | 1 + .../RepairApplicationController.java | 2 + .../RetentionSimpleDestroyLogController.java | 2 + .../ScrapApplicationController.java | 2 + .../lims/service/impl/EntrustServiceImpl.java | 2 +- .../impl/TaskBlueprintServiceImpl.java | 1 + 7 files changed, 18 insertions(+), 71 deletions(-) diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index 38be7b6..30e025f 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -3,7 +3,6 @@ package org.springblade.lims.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.mysql.cj.util.StringUtils; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -23,12 +22,9 @@ import org.springblade.lims.goods.service.IGoodsService; import org.springblade.lims.goods.vo.ApplyVO; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; -import org.springblade.system.cache.DictBizCache; -import org.springblade.system.enums.DictBizEnum; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -168,6 +164,7 @@ public class ApplyController extends BladeController { // 消息通知 if (userList != null) { for (User user : userList) { + // id硬编码 if ("1542095624162525185".equals(user.getRoleId())) { apply.setApproveUserId(user.getId()); apply.setApproveUser(user.getName()); @@ -176,6 +173,7 @@ public class ApplyController extends BladeController { } } } + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "申领出库", "你有新的申领单待出库,请及时处理", 1, 5, "1533753689484058625", "/capital/shenlingList"); } else { @@ -183,6 +181,7 @@ public class ApplyController extends BladeController { // 消息通知 if (userList != null) { for (User user : userList) { + // id硬编码 if ("1542095624162525185".equals(user.getRoleId())) { messageClient.event(SysTypeEnum.INFORM.getValue(), "申领审核", "你有新的申领单待审核,请及时处理", 1, 5, user.getId().toString(), "/capital/shenlingList"); @@ -248,6 +247,7 @@ public class ApplyController extends BladeController { // 通过 if (apply.getStatus() == 1) { // 消息通知 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "申领出库", "你有新的申领单待出库,请及时处理", 1, 5, "1533753689484058625", "/capital/shenlingList"); } @@ -376,44 +376,7 @@ public class ApplyController extends BladeController { */ @PostMapping("/return") public void reture(@RequestBody Apply apply) { - boolean isComplete = true; - List applyDetails = apply.getApplyDetails(); - if (applyDetails != null && applyDetails.size() > 0) { - for (ApplyDetail detail : applyDetails) { - // 库存入库 - Goods goods = goodsService.getById(detail.getProductId()); - goods.setNum(goods.getNum() + detail.getReturnNum()); - goodsService.updateById(goods); - - //批次数量回填（批次数量入库） - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProductStoreDetial::getGoodsId, detail.getProductId()) - .eq(ProductStoreDetial::getPNum, detail.getBatchNum()); - ProductStoreDetial productStoreDetail = productStoreDetialService.getOne(wrapper); - productStoreDetail.setNum(productStoreDetail.getNum() + detail.getReturnNum()); - productStoreDetialService.updateById(productStoreDetail); - - if (detail.getIsReturn() != 1) { - ApplyDetail byId = applyDetailService.getById(detail.getId()); - if (byId != null) { - Integer total = byId.getReturnNum() + detail.getReturnNum(); - if (detail.getOutNum().equals(total)) { - detail.setIsReturn(1); - } - detail.setReturnNum(total); - } - } - } - for (ApplyDetail detail : applyDetails) { - if (detail.getIsReturn() == 0) { - isComplete = false; - break; - } - } - } - apply.setStatus(isComplete ? 4 : 3); - applyService.updateById(apply); - applyDetailService.updateBatchById(applyDetails); + applyService.reture(apply); } /** @@ -428,7 +391,6 @@ public class ApplyController extends BladeController { // 申领详情 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ApplyDetail::getApplyId, apply.getId()); -// wrapper.isNotNull(ApplyDetail::getReturnTime); List applyDetails = applyDetailService.list(wrapper); if (applyDetails != null && applyDetails.size() > 0) { for (ApplyDetail detail : applyDetails) { @@ -442,7 +404,7 @@ public class ApplyController extends BladeController { } /** - * 8.查看详情 + * 9.查看详情 */ @GetMapping("/applyInfo") public R applyInfo(Apply apply) { @@ -464,42 +426,19 @@ public class ApplyController extends BladeController { } /** - * 9.更改申领单或申领物品信息 + * 10.更改申领单或申领物品信息 */ @PostMapping("/updateApplyOrDetails") - @Transactional(rollbackFor = Exception.class) public boolean updateApplyOrDetails(@RequestBody Apply apply) { -// List applyDetails = apply.getApplyDetails(); -// if (applyDetails != null && applyDetails.size() > 0) { -// for (ApplyDetail applyDetail : applyDetails) { -// applyDetail.setOutNum(applyDetail.getNewOutNum()); -// } -// applyDetailService.updateBatchById(applyDetails); -// } -// return applyService.updateById(apply); - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ApplyDetail::getApplyId, apply.getId()); - List details = applyDetailService.list(wrapper); - for (ApplyDetail detail : details) { - if (detail.getReturnTime() != null) { - apply.setStatus(3); - break; - } else { - apply.setStatus(4); - } - } - return applyService.updateById(apply); + return applyService.updateApplyOrDetails(apply); } /** - * 10.出库单打印 + * 11.出库单打印 */ @GetMapping("/print") public void print(String id, HttpServletResponse response) { applyService.print(id, response); - } - } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ContractController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ContractController.java index 088d701..4a93b30 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ContractController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ContractController.java @@ -133,6 +133,7 @@ public class ContractController extends BladeController { && byId.getAssessorId() != null && byId.getAssessorId().split(",").length == byId.getAppointAssessorId().split(",").length) { // 消息通知1 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "新增委托", "您的合同已评审完成,请及时处理", 1, 5, "1542330472226856962","/plugin/workflow/process/contractList"); byId.setStatus(1); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java index 5b597cb..b6e46b4 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java @@ -101,6 +101,7 @@ public class RepairApplicationController extends BladeController { // 确认 if (repairApplication.getStatus() == 1) { // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审核", "您有新的报修申请单待审核,请及时处理", 1, 5, "1555122570980995073","/repair/proposer"); repairApplication.setApplyDeptUser(AuthUtil.getUserId()); @@ -110,6 +111,7 @@ public class RepairApplicationController extends BladeController { // 审核 if (repairApplication.getStatus() == 2) { // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审批", "您有新的报修申请单待审批,请及时处理", 1, 5, "1552118581265973249","/repair/proposer"); repairApplication.setReviewDate(new Date()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RetentionSimpleDestroyLogController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RetentionSimpleDestroyLogController.java index 8bf4a02..486325d 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RetentionSimpleDestroyLogController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RetentionSimpleDestroyLogController.java @@ -71,6 +71,7 @@ public class RetentionSimpleDestroyLogController extends BladeController { public R update(@RequestBody RetentionSimpleDestroyLog retentionSample) { if (retentionSample.getStatus() == 1) { // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "销毁处理", "你有样品销毁申请待处理,请及时查看", 1, 5, "1542096837247541250","/limsConfig/destruction"); } @@ -100,6 +101,7 @@ public class RetentionSimpleDestroyLogController extends BladeController { retentionSample.setManagerSuggertTime(new Date()); retentionSample.setStatus(0); // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "销毁审批", "你有样品销毁申请待审批,请及时处理", 1, 5, "","/limsConfig/destruction"); return R.data(service.save(retentionSample)); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java index 0bad671..2fb539c 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java @@ -73,6 +73,7 @@ public class ScrapApplicationController extends BladeController { // 确认 if (scrapApplication.getStatus() == 1) { // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审核", "您有新的报修申请单待审核,请及时处理", 1, 5, "1555122570980995073","/repair/proposer"); scrapApplication.setApplyDeptUser(AuthUtil.getUserId()); @@ -82,6 +83,7 @@ public class ScrapApplicationController extends BladeController { // 审核 if (scrapApplication.getStatus() == 2) { // 发送提示消息 + // id硬编码 messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审批", "您有新的报修申请单待审批,请及时处理", 1, 5, "1552118581265973249","/repair/proposer"); scrapApplication.setReviewDate(new Date()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 88cacd9..b7fc8dc 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -1638,7 +1638,7 @@ public class EntrustServiceImpl extends BaseServiceImpl String format2 = df.format((collect.get(1) + collect.get(2)) / 4); ExamineDataArrVO examineDataArrVO = new ExamineDataArrVO(); examineDataArrVO.setNum("临界值"); - examineDataArrVO.setValue(format2); + examineDataArrVO.setLog2(format2); examineDataArrVO.setResult(""); list1.add(examineDataArrVO); list1.addAll(voList); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java index 4ae12e5..378ed2a 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java @@ -303,6 +303,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl