From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 717f0d3..3f45655 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,6 +5,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.NoticeDto;
@@ -13,7 +14,10 @@
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.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
@@ -73,6 +77,18 @@
}
/**
+ * inoutNoticePR#getNoticeInOne
+ *
+ * @param businessId
+ * @return
+ */
+ @DataProvider
+ public InoutNoticeIn getNoticeInOne(String businessId) {
+ InoutNoticeIn notice = inoutNoticeService.getNoticeInOne(businessId);
+ return notice;
+ }
+
+ /**
* inoutNoticePR#pageQueryIn 鑾峰彇鍏ュ簱閫氱煡鍗�
*
* @param param
@@ -103,6 +119,7 @@
* inoutNoticePR#delDataIn
*/
@Expose
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public String delDataIn(InoutNoticeIn data) {
InoutNoticeIn inoutNoticeIn = new InoutNoticeIn();
BeanUtils.copyProperties(data, inoutNoticeIn);
@@ -153,6 +170,19 @@
}
/**
+ * inoutNoticePR#getNoticeOutOne
+ *
+ * @param businessId
+ * @return
+ */
+ @DataProvider
+ public InoutNoticeOut getNoticeOutOne(String businessId) {
+ InoutNoticeOut notice = inoutNoticeService.getNoticeOutOne(businessId);
+ return notice;
+ }
+
+
+ /**
* inoutNoticePR#pageQueryOut 鑾峰彇鍑哄簱閫氱煡鍗�
* @param page
* @param param
@@ -185,7 +215,8 @@
* inoutNoticePR#delDataOut
*/
@Expose
- public String delDataOut(InoutNoticeOut data) {
+ @Log(title = "閫氱煡鍗曠鐞�", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
+ public String delDataOut(InoutNoticeOut data) {
InoutNoticeOut inoutNoticeOut = new InoutNoticeOut();
BeanUtils.copyProperties(data, inoutNoticeOut);
return inoutNoticeService.delDataOut(inoutNoticeOut);
@@ -236,6 +267,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)) {
--
Gitblit v1.9.3