From 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 18:48:11 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/inout/InoutManager.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 96 insertions(+), 8 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 3cc9821..fb9d769 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
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RespCodeEnum;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.InoutParam;
+import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.data.PageResponse;
-import com.fzzy.igds.domain.InoutConf;
-import com.fzzy.igds.domain.InoutRecord;
-import com.fzzy.igds.domain.InoutSysConf;
+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.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
@@ -19,10 +21,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* @Description 鍑哄叆搴撲笟鍔″鐞�
@@ -39,6 +38,10 @@
private InoutConfService inoutConfService;
@Resource
private InoutRecordService inoutRecordService;
+ @Resource
+ private DicAreaService dicAreaService;
+ @Resource
+ private InoutNoticeService inoutNoticeService;
/**
* 鏍规嵁鐢ㄦ埛璇锋眰淇℃伅锛屾牴鎹綋鍓嶅鎴风數鑴慖P锛岃幏鍙栧嚭鍏ュ簱绉伴噸涓婃閫夋嫨鐨勫湴纾�
@@ -251,7 +254,7 @@
//鍖栭獙浜哄強鏃堕棿
data.setCheckUser(user.getUserName());
data.setCheckTime(new Date());
- data.setCheckStatus(Constant.STATUS_PASS);
+ data.setCheckStatus(Constant.STATUS_CHECK);
int num = inoutRecordService.updateInoutRecord(data);
@@ -412,6 +415,31 @@
}
/**
+ * 鍒嗛〉鏌ヨ鏁版嵁
+ * @param param
+ * @return
+ */
+ public PageResponse<List<InoutRecord>> listWeightData(InoutParam param) {
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ param.setDeptId(ContextUtil.subDeptId(null));
+ }
+
+ //璁剧疆绉伴噸娴佺▼鏍囪
+ param.setWeightTag("WEIGHT");
+
+ List<InoutRecord> inoutRecords = inoutRecordService.listInout(param);
+
+ if (null == inoutRecords || inoutRecords.isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(), "鑾峰彇鍒版暟鎹俊鎭负绌�");
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, inoutRecords);
+ }
+
+ /**
* 鏌ヨ鏁版嵁
* @param param
* @return
@@ -428,4 +456,64 @@
}
return new PageResponse<>(RespCodeEnum.CODE_0000, result);
}
+
+ /**
+ * 鍒嗛〉鑾峰彇鍖哄垝淇℃伅
+ * @param param
+ * @return
+ */
+ public PageResponse<Page<DicArea>> pageDicArea(IgdsBaseParam param) {
+
+ Page<DicArea> corePage = new Page<>(param.getPage(), param.getLimit());
+
+ dicAreaService.listPageData(corePage, param.getKey());
+
+ if (null == corePage.getRecords() || corePage.getRecords().isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(), "鑾峰彇鍒版暟鎹俊鎭负绌�");
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, corePage);
+ }
+
+ /**
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<List<InoutNoticeIn>> listNoticeIn(NoticeParam param) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ if (org.apache.commons.lang3.StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(user.getCompanyId());
+ }
+ param.setDeptId(ContextUtil.subDeptId(user));
+
+ List<InoutNoticeIn> list = inoutNoticeService.getNoticeIn(param.getCompanyId(), param.getDeptId(),Constant.COMPLETE_STATUS_NONE);
+
+ if (null == list || list.isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏌ヨ缁撴灉涓虹┖锛�");
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, list);
+ }
+
+ /**
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<List<InoutNoticeOut>> listNoticeOut(NoticeParam param) {
+ SysUser user = ContextUtil.getLoginUser();
+ if (org.apache.commons.lang3.StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(user.getCompanyId());
+ }
+ param.setDeptId(ContextUtil.subDeptId(user));
+
+ List<InoutNoticeOut> list = inoutNoticeService.getNoticeOut(param.getCompanyId(), param.getDeptId(),Constant.COMPLETE_STATUS_NONE);
+
+ if (null == list || list.isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏌ヨ缁撴灉涓虹┖锛�");
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, list);
+ }
}
--
Gitblit v1.9.3