From ac3cfc47a08ce8e9e99ecc43fdbada396a714def Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:26:17 +0800
Subject: [PATCH] 调整出入库配置2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index 2091463..927c320 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -5,12 +5,15 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -36,7 +39,9 @@
*/
@DataProvider
public Map<String, Object> getYearQuery(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
+
+ if(null == param) param = new HashMap<>();
+ Map<String, Object> result = new HashMap<>();
//鑾峰彇鍙傛暟涓垎搴撶紪鐮�
String deptId = (String)param.get("deptId");
@@ -58,6 +63,7 @@
InoutNoticeIn data = new InoutNoticeIn();
data.setId(ContextUtil.generateOrderId("RK"));
data.setName("鍏ュ簱閫氱煡鍗�");
+ data.setType("20");
data.setCompanyId(user.getCompanyId());
data.setDeptId(ContextUtil.subDeptId(user));
data.setYear(DateFormatUtils.format(new Date(), "yyyy"));
@@ -208,4 +214,55 @@
return "fail";
}
+
+ /**
+ * inoutNoticePR#queryNoticeByKey 鏍规嵁鍙傛暟鏌ヨ鍑哄叆搴撻�氱煡鍗曪紝鐢ㄤ簬鎵嬪姩琛ュ崟鏃讹紝閫夋嫨閫氱煡鍗�
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public List<NoticeDto> queryNoticeByKey(Map<String, Object> param) {
+ if (param == null) {
+ return null;
+ }
+ String type = (String)param.get("type");
+ if (StringUtils.isEmpty(type)) {
+ return null;
+ }
+ List<NoticeDto> list = new ArrayList<>();
+ NoticeDto dto;
+
+ NoticeParam noticeParam = new NoticeParam();
+ noticeParam.setCompanyId(ContextUtil.getCompanyId());
+ noticeParam.setDeptId(ContextUtil.subDeptId(null));
+ noticeParam.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ String key = (String)param.get("key");
+ if (StringUtils.isNotEmpty(key)) {
+ noticeParam.setKey(key);
+ }
+
+ if (Constant.TYPE_IN.equals(type)) {
+ List<InoutNoticeIn> listIn = inoutNoticeService.getNoticeIn(noticeParam);
+ if (null != listIn && listIn.size() > 0) {
+ for (InoutNoticeIn inoutNoticeIn : listIn) {
+ dto = new NoticeDto();
+ BeanUtils.copyProperties(inoutNoticeIn, dto);
+ list.add(dto);
+ }
+ }
+ }
+ if (Constant.TYPE_OUT.equals(type)) {
+ List<InoutNoticeOut> listOut = inoutNoticeService.getNoticeOut(noticeParam);
+ if (null != listOut && listOut.size() > 0) {
+ for (InoutNoticeOut inoutNoticeOut : listOut) {
+ dto = new NoticeDto();
+ BeanUtils.copyProperties(inoutNoticeOut, dto);
+ list.add(dto);
+ }
+ }
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.3