From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index cfe719f..a03f396 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -1,7 +1,6 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fzzy.igds.constant.AuditStatus;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.InoutConstant;
import com.fzzy.igds.data.*;
@@ -10,6 +9,7 @@
import com.fzzy.igds.mapper.InoutNoticeOutMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.work.data.WorkBizType;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.service.BizWorkService;
import com.ruoyi.common.utils.StringUtils;
@@ -143,7 +143,7 @@
//鑾峰彇璐ㄦ娂鍚堝悓鏁版嵁
PledgeContract pledge = this.getPledgeByDepotId(data);
if (null != pledge && pledge.getStatus().equals(Constant.YN_N)) {
- return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｅ帇鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
+ return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｆ娂鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
}
}
@@ -177,15 +177,14 @@
data.setUpdateTime(new Date());
data.setCreateBy(ContextUtil.getLoginUserName());
data.setCreateTime(new Date());
- data.setAuditStatus(AuditStatus.STATUS_10.getCode());
+ data.setAuditStatus(WorkStatus.STATUS_10.getCode());
data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
//鎵ц娴佺▼
WorkOrderConf conf = workService.getConfByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
//娴佺▼涓嶅惎鐢�
if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
- data.setAuditStatus(AuditStatus.STATUS_20.getCode());
- //data.setAuditDate(data.getCreateTime());
+ data.setAuditStatus(WorkStatus.STATUS_50.getCode());
} else {
BaseResp resp = workService.startByNoticeIn(data, conf);
log.info("---------鍚姩宸ュ崟娴佺▼------{}", resp);
@@ -198,9 +197,9 @@
/**
- * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘�
+ * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶�
* @param data 褰撳墠鏁版嵁
- * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘嬶紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鍘�
+ * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶硷紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鎶�
*/
private PledgeContract getPledgeByDepotId(InoutNoticeIn data) {
IgdsBaseParam param = new IgdsBaseParam();
@@ -288,7 +287,6 @@
* @return
*/
public InoutNoticeOut getNoticeOutOne(String id) {
-
QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id", id);
return noticeOutMapper.selectOne(queryWrapper);
@@ -317,13 +315,13 @@
*/
@Transactional(rollbackFor = Exception.class)
public BaseResp saveOrUpdateOut(InoutNoticeOut data) {
- //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｅ帇寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
+ //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｆ娂寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
if (InoutConstant.NOTICE_IN_TYPE_10.equals(data.getType())) {
- //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｆ娂锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
//鑾峰彇璐ㄦ娂鍚堝悓鏁版嵁
PledgeContract pledge = this.getPledgeByDepotIdOut(data);
if (null != pledge && pledge.getStatus().equals(Constant.YN_N)) {
- return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｅ帇鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
+ return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｆ娂鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
}
}
//濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负鐩戠閫氱煡鍗�
@@ -367,15 +365,14 @@
data.setUpdateTime(new Date());
data.setCreateBy(ContextUtil.getLoginUserName());
data.setCreateTime(new Date());
- data.setAuditStatus(AuditStatus.STATUS_10.getCode());
+ data.setAuditStatus(WorkStatus.STATUS_10.getCode());
data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
//鎵ц娴佺▼
- WorkOrderConf conf = workService.getConfByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
+ WorkOrderConf conf = workService.getConfByDeptId(data.getDeptId(), WorkBizType.TYPE_20);
//娴佺▼涓嶅惎鐢�
if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
- data.setAuditStatus(AuditStatus.STATUS_20.getCode());
- data.setAuditDate(data.getCreateTime());
+ data.setAuditStatus(WorkStatus.STATUS_50.getCode());
} else {
BaseResp resp = workService.startByNoticeOut(data, conf);
log.info("---------鍚姩宸ュ崟娴佺▼------{}", resp);
@@ -387,9 +384,9 @@
}
/**
- * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘�
+ * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶�
* @param data 褰撳墠鏁版嵁
- * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘嬶紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鍘�
+ * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶硷紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鎶�
*/
private PledgeContract getPledgeByDepotIdOut(InoutNoticeOut data) {
IgdsBaseParam param = new IgdsBaseParam();
--
Gitblit v1.9.3