fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java
@@ -37,6 +37,8 @@ private String type; private String auditStatus; private Double weight;// 重量信息 private Double taskNum = 0.0; fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -1,6 +1,7 @@ package com.fzzy.igds.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.constant.InoutConstant; import com.fzzy.igds.data.*; @@ -90,6 +91,9 @@ } if (StringUtils.isNotBlank(param.getDeptId())) { queryWrapper.eq("dept_id", param.getDeptId()); } if (StringUtils.isNotBlank(param.getAuditStatus())) { queryWrapper.eq("audit_status", param.getAuditStatus()); } if (StringUtils.isNotBlank(param.getCompleteStatus())) { queryWrapper.eq("complete_status", param.getCompleteStatus()); @@ -219,6 +223,18 @@ } /** * 更新审核状态 * @param id * @param status */ public void updateNoticeInStatus(String id, String status) { UpdateWrapper<InoutNoticeIn> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id).set("audit_status", status); noticeInMapper.update(null, updateWrapper); } /** * - 删除数据 * * @param data @@ -269,6 +285,9 @@ } if (StringUtils.isNotBlank(param.getDeptId())) { queryWrapper.eq("dept_id", param.getDeptId()); } if (StringUtils.isNotBlank(param.getAuditStatus())) { queryWrapper.eq("audit_status", param.getAuditStatus()); } if (StringUtils.isNotBlank(param.getCompleteStatus())) { queryWrapper.eq("complete_status", param.getCompleteStatus()); @@ -349,6 +368,18 @@ } /** * 更新审核状态 * @param id * @param status */ public void updateNoticeOutStatus(String id, String status) { UpdateWrapper<InoutNoticeOut> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id).set("audit_status", status); noticeOutMapper.update(null, updateWrapper); } /** * 删除数据 * * @param data fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -5,6 +5,7 @@ import com.fzzy.igds.constant.Constant; import com.fzzy.igds.mapper.InoutNoticeInMapper; import com.fzzy.igds.mapper.InoutNoticeOutMapper; import com.fzzy.igds.service.InoutNoticeService; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import com.fzzy.work.data.WorkNode; @@ -34,6 +35,8 @@ public class WorkOrderService { @Resource private WorkOrderMapper workOrderMapper; @Resource private InoutNoticeService noticeService; @Resource private InoutNoticeInMapper noticeInMapper; @Resource @@ -249,12 +252,12 @@ //更新入库通知单状态 if (work.getBizType().equals(WorkBizType.TYPE_10.getCode())) { noticeInMapper.auditComplete(work.getBusinessId(), work.getStatus()); noticeService.updateNoticeInStatus(work.getBusinessId(), work.getStatus()); } //更新入库通知单状态 //更新出库通知单状态 if (work.getBizType().equals(WorkBizType.TYPE_20.getCode())) { noticeOutMapper.auditComplete(work.getBusinessId(), work.getStatus()); noticeService.updateNoticeOutStatus(work.getBusinessId(), work.getStatus()); } } fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -13,6 +13,7 @@ import com.fzzy.igds.domain.InoutNoticeIn; import com.fzzy.igds.domain.InoutNoticeOut; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.work.data.WorkStatus; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -261,6 +262,7 @@ NoticeParam noticeParam = new NoticeParam(); noticeParam.setCompanyId(ContextUtil.getCompanyId()); noticeParam.setDeptId(ContextUtil.subDeptId(null)); noticeParam.setAuditStatus(WorkStatus.STATUS_50.getCode()); noticeParam.setCompleteStatus(Constant.COMPLETE_STATUS_NONE); String key = (String)param.get("key"); if (StringUtils.isNotEmpty(key)) {