From fbc22dcbef9887f87247b04e878a6107787854bc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 26 一月 2026 15:16:02 +0800
Subject: [PATCH] 调整数量检测协议
---
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
index 895c2ec..b22225d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
@@ -4,6 +4,7 @@
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
+import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
@@ -23,10 +24,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description
@@ -361,6 +359,7 @@
request.setDeptId(conf.getDeptId());
request.setSn(conf.getSn());
request.setLength(conf.getLength());
+ request.setExeUser(ContextUtil.getLoginUserName());
request.setBatchId(conf.getDepotId() + "_" + DateFormatUtils.format(new Date(), "yyyyMMddHHmm"));
@@ -403,4 +402,42 @@
return remoteQuantityService.checkStop(request);
}
+
+
+ /**
+ * 鑾峰彇娌圭綈娌规儏鍙婃恫浣嶄俊鎭�
+ *
+ * @param deptId
+ * @return
+ */
+ public List<Quantity> getHeightList(String deptId) {
+
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(null);
+ }
+ //鑾峰彇鎵�鏈夌瓛浠撳強娴呭渾浠�
+ List<Depot> depotList = commonManager.listAllDepot(deptId, DepotType.TYPE_02.getCode() + "," + DepotType.TYPE_04.getCode());
+ if (null == depotList || depotList.isEmpty()) {
+ return null;
+ }
+
+ List<Quantity> list = new ArrayList<>();
+ List<Quantity> quantityList;
+ Quantity quantity;
+ for (Depot depot : depotList) {
+
+ quantityList = quantityService.getQuantityList(depot.getId(), 1);
+ if (null == quantityList || quantityList.isEmpty()) {
+ quantity = new Quantity();
+ quantity.setDepotId(depot.getId());
+ }else {
+ quantity = quantityList.get(0);
+ }
+ quantity.setDepotData(depot);
+
+ list.add(quantity);
+ }
+
+ return list;
+ }
}
--
Gitblit v1.9.3