From db67639449287bcec461916a7dca6003ee5dd03c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 05 十二月 2025 16:27:18 +0800
Subject: [PATCH] 出入库详单及补单页面及逻辑
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java
index 0c8456e..d4bba19 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java
@@ -5,10 +5,7 @@
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
-import com.fzzy.igds.service.DicAreaService;
-import com.fzzy.igds.service.InoutConfService;
-import com.fzzy.igds.service.InoutNoticeService;
-import com.fzzy.igds.service.InoutRecordService;
+import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -35,6 +32,8 @@
private RedisCache redisCache;
@Resource
private InoutConfService inoutConfService;
+ @Resource
+ private FileService fileService;
@Resource
private InoutRecordService inoutRecordService;
@Resource
@@ -228,7 +227,7 @@
}
//闄勪欢澶勭悊
- saveInoutFiles(data.getFiles(), data.getId(), curProgress);
+ fileService.saveInoutFiles(data.getFiles(), data.getId(), curProgress, "INOUT");
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鐧昏鎴愬姛锛�", data);
}
@@ -293,6 +292,11 @@
String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
data.setProgress(nextProgress);
+ if(Constant.PROGRESS_RECORD.equals(nextProgress)){
+ //娴佺▼缁撴潫鏃讹紝璁剧疆瀹屾垚鏃堕棿鍜屽畬鎴愪汉
+ data.setCompleteTime(new Date());
+ data.setCompleteUser(ContextUtil.getLoginUserName());
+ }
//绉伴噸鏁版嵁鏇存柊
int num = inoutRecordService.updateInoutRecord(data);
@@ -301,7 +305,7 @@
}
//闄勪欢澶勭悊
- saveInoutFiles(data.getFiles(), data.getId(), curProgress);
+ fileService.saveInoutFiles(data.getFiles(), data.getId(), curProgress, "INOUT");
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛", data);
}
@@ -335,28 +339,9 @@
}
//闄勪欢澶勭悊
- saveInoutFiles(data.getFiles(), data.getId(), curProgress);
+ fileService.saveInoutFiles(data.getFiles(), data.getId(), curProgress, "INOUT");
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎻愪氦鎴愬姛", data);
- }
-
- /**
- * 寮傛鎵ц闄勪欢淇濆瓨
- * @param files 闄勪欢淇℃伅
- * @param bizId 涓氬姟id
- * @param progress 娴佺▼鑺傜偣
- */
- @Async
- public void saveInoutFiles(List<FileInfo> files, String bizId, String progress) {
-
- if (null == files || files.isEmpty()) {
- return;
- }
-
- //TODO 闄勪欢閫昏緫寰呭鐞�
-
-
-
}
/**
@@ -524,8 +509,8 @@
param.setCompanyId(user.getCompanyId());
}
param.setDeptId(ContextUtil.subDeptId(user));
-
- List<InoutNoticeIn> list = inoutNoticeService.getNoticeIn(param.getCompanyId(), param.getDeptId(), Constant.COMPLETE_STATUS_NONE);
+ param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ List<InoutNoticeIn> list = inoutNoticeService.getNoticeIn(param);
if (null == list || list.isEmpty()) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏌ヨ缁撴灉涓虹┖锛�");
@@ -544,8 +529,8 @@
param.setCompanyId(user.getCompanyId());
}
param.setDeptId(ContextUtil.subDeptId(user));
-
- List<InoutNoticeOut> list = inoutNoticeService.getNoticeOut(param.getCompanyId(), param.getDeptId(), Constant.COMPLETE_STATUS_NONE);
+ param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ List<InoutNoticeOut> list = inoutNoticeService.getNoticeOut(param);
if (null == list || list.isEmpty()) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏌ヨ缁撴灉涓虹┖锛�");
--
Gitblit v1.9.3