From ff58bd6f018df0f760c8a262576a06105b902f4f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 12:42:20 +0800
Subject: [PATCH] 质检添加保存接口 质检添加新建接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 42 +++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 19 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 12 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 30 +++++
rsf-server/src/main/java/com/vincent/rsf/server/system/enums/LocStsType.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java | 20 ++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 74 ++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 47 +++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 9 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java | 6 +
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java | 26 ++--
12 files changed, 268 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java
index 7d80e4b..80a8ae0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java
@@ -8,21 +8,23 @@
* @create 2025/3/29 17:02
*/
public enum TaskType {
- TASK_TYPE_EMPITY_IN(10L, "绌烘澘鍏ュ簱"),
- TASK_TYPE_LOC_MOVE(11L, "搴撴牸绉昏浇"),
- TASK_TYPE_PICK_IN(53L, "鎷ｆ枡鍐嶅叆搴�"),
- TASK_TYPE_MERGE_IN(54L, "骞舵澘鍐嶅叆搴�"),
- TASK_TYPE_CHECK_IN(57L, "鐩樼偣鍐嶅叆搴�"),
- TASK_TYPE_OUT(101L, "鍑哄簱"),
- TASK_TYPE_PICK_AGAIN_IN(103L, "鎷ｆ枡鍏ュ簱"),
- TASK_TYPE_MERGE_OUT(104L, "骞舵澘鍑哄簱"),
- TASK_TYPE_CHECK_OUT(107L, "鐩樼偣鍑哄簱"),
- TASK_TYPE_EMPITY_OUT(110L, "绌烘澘鍑哄簱"),
+
+ TASK_TYPE_IN(1, "鍏ュ簱"),
+ TASK_TYPE_EMPITY_IN(10, "绌烘澘鍏ュ簱"),
+ TASK_TYPE_LOC_MOVE(11, "搴撴牸绉昏浇"),
+ TASK_TYPE_PICK_IN(53, "鎷ｆ枡鍐嶅叆搴�"),
+ TASK_TYPE_MERGE_IN(54, "骞舵澘鍐嶅叆搴�"),
+ TASK_TYPE_CHECK_IN(57, "鐩樼偣鍐嶅叆搴�"),
+ TASK_TYPE_OUT(101, "鍑哄簱"),
+ TASK_TYPE_PICK_AGAIN_IN(103, "鎷ｆ枡鍏ュ簱"),
+ TASK_TYPE_MERGE_OUT(104, "骞舵澘鍑哄簱"),
+ TASK_TYPE_CHECK_OUT(107, "鐩樼偣鍑哄簱"),
+ TASK_TYPE_EMPITY_OUT(110, "绌烘澘鍑哄簱"),
;
- public Long type;
+ public Integer type;
public String desc;
- TaskType(Long type, String desc) {
+ TaskType(Integer type, String desc) {
this.type = type;
this.desc = desc;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index 6b9d1d0..f1a1117 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.service.QlyInspectService;
@@ -58,6 +59,24 @@
return R.ok(qlyInspectService.listByAsn(map));
}
+ @GetMapping("/qlyInspect/asn/list")
+ @ApiOperation("鑾峰彇寰呰川妫�鍗�")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+ public R getUnInspect() {
+ return R.ok(qlyInspectService.getUnInspect());
+ }
+
+ @PostMapping("/qlyInspect/reports")
+ @ApiOperation("閫夋嫨璐ㄦ鍗曟嵁")
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ public R selectedOrder(IsptOrderParam param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return qlyInspectService.saveSelected(param);
+ }
+
+
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
public R list(@RequestBody Map<String, Object> map) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java
new file mode 100644
index 0000000..c3a6ea5
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java
@@ -0,0 +1,20 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import jdk.jpackage.internal.Log;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "IsptOrderParam", description = "璐ㄦ鍗曞弬鏁�")
+public class IsptOrderParam implements Serializable {
+
+ @ApiModelProperty("鏀惰揣鍗旾D")
+ List<Long> ids;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index 95c8d3b..7cd2470 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -4,18 +4,26 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Data
@Accessors(chain = true)
@@ -37,9 +45,14 @@
@ApiModelProperty(value= "缂栫爜")
private String code;
+ @ApiModelProperty("鍗曟嵁ID")
+ private Long asnId;
- @ApiModelProperty("閫氱煡鍗曟槑缁咺D")
- private Long asnItemId;
+ @ApiModelProperty("鍗曟嵁缂栫爜")
+ private String asnCode;
+
+ @ApiModelProperty("璐ㄦ鐘舵��")
+ private String isptStatus;
/**
* 涓氬姟绫诲瀷
@@ -158,6 +171,19 @@
// null // 澶囨敞
// );
+
+ public String getIsptStatus$() {
+ if (null == this.isptStatus) {return null;}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
+ .eq(DictData::getValue, this.isptStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index 9b75cc9..d677b37 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,6 +19,7 @@
import java.io.Serializable;
@Data
+@Accessors(chain = true)
@TableName("man_qly_ispt_item")
public class QlyIsptItem implements Serializable {
@@ -34,6 +37,9 @@
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long ispectId;
+
+ @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+ private Long asnItemId;
/**
* 缂栧彿
@@ -101,6 +107,9 @@
@ApiModelProperty(value= "鍥剧墖璺緞")
private String picPath;
+ @ApiModelProperty("璐ㄦ缁撹")
+ private String isptResult;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 6fe7559..9667352 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -72,6 +72,18 @@
private String targLoc;
/**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty("婧愮珯鐐�")
+ private String orgSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty("鐩爣绔欑偣")
+ private String targSite;
+
+ /**
* 鎵樼洏鐮�
*/
@ApiModelProperty(value= "鎵樼洏鐮�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
index 0b644c2..5535166 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
+import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
@@ -14,4 +16,8 @@
List<AsnOrderItem> listByAsn(Map<String, Object> map);
R allSave(QlyInspectAndItem params);
+
+ List<AsnOrder> getUnInspect();
+
+ R saveSelected(IsptOrderParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
index 73eeacb..1348ba0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
@@ -16,13 +17,17 @@
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Service("qlyInspectService")
public class QlyInspectServiceImpl extends ServiceImpl<QlyInspectMapper, QlyInspect> implements QlyInspectService {
@@ -65,7 +70,7 @@
if (Objects.isNull(inspect.getWkType())) {
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_WK_TYPE, inspect);
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_CODE, inspect);
inspect.setCode(code);
if (!this.saveOrUpdate(inspect)) {
throw new CoolException("璐ㄦ鍗曚繚瀛樺け璐ワ紒锛�");
@@ -87,4 +92,71 @@
}
return R.ok("淇濆瓨鎴愬姛锛侊紒");
}
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇鏈川妫�鍗曟嵁
+ * @param
+ * @return
+ * @time 2025/3/31 10:12
+ */
+
+ @Override
+ public List<AsnOrder> getUnInspect() {
+ List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getStatus, 1).eq(AsnOrder::getNtyStatus, 0));
+ return asnOrders;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveSelected(IsptOrderParam param) {
+ if (Objects.isNull(param.getIds()) || param.getIds().isEmpty()) {
+ throw new CoolException("鍗曟嵁ID涓嶈兘涓虹┖锛侊紒");
+ }
+ List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()).eq(AsnOrder::getNtyStatus, 1));
+ if (asnOrders.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, param.getIds()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ Map<Long, List<AsnOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
+ List<QlyInspect> qlyInspects = new ArrayList<>();
+ for (AsnOrder asnOrder : asnOrders) {
+ QlyInspect inspect = new QlyInspect();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("绛栫暐閿欒锛氳妫�鏌ョ瓥鐣ャ��" + SerialRuleCode.SYS_INSPECT_CODE + "銆嶆槸鍚﹁缃纭紒锛�");
+ }
+ inspect.setCode(ruleCode).setWkType(asnOrder.getWkType()).setAsnId(asnOrder.getId()).setCode(asnOrder.getCode());
+ /**鑾峰彇鍗曟嵁鏄庣粏*/
+ List<AsnOrderItem> asnOrderItems = listMap.get(asnOrder.getId());
+ if (Objects.isNull(asnOrderItems) || asnOrderItems.isEmpty()) {
+ continue;
+ }
+ double rcptQty = asnOrderItems.stream().mapToDouble(AsnOrderItem::getQty).sum();
+ double anfme = asnOrderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ inspect.setRcptQty(rcptQty).setDlyQty(anfme);
+ if (!this.save(inspect)) {
+ throw new CoolException("鍗曟嵁" + asnOrder.getCode() + "淇濆瓨澶辫触锛侊紒");
+ }
+ List<QlyIsptItem> items = new ArrayList<>();
+ for (AsnOrderItem orderItem : asnOrderItems) {
+ QlyIsptItem isptItem = new QlyIsptItem();
+ BeanUtils.copyProperties(orderItem, isptItem);
+ isptItem.setAsnItemId(orderItem.getId())
+ .setRcptQty(orderItem.getQty())
+ .setDlyQty(orderItem.getAnfme());
+ items.add(isptItem);
+ }
+ if (!qlyIsptItemService.saveBatch(items)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ if (!this.saveBatch(qlyInspects)) {
+ throw new CoolException("璐ㄦ鍗曚繚瀛樺け璐ワ紒锛�");
+ }
+ return R.ok("淇濆瓨鎴愬姛锛侊紒");
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index cbe445e..d3ef48a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -1,22 +1,27 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
-import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
-import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -53,10 +58,37 @@
if (waitPakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪");
}
- Task task = new Task();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
- task.setTaskCode(ruleCode).setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue());
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
+ }
+
+ List<Task> tasks = new ArrayList<>();
+ List<TaskItem> taskItems = new ArrayList<>();
+ waitPakins.forEach(pakin -> {
+ Task task = new Task();
+ task.setTaskCode(ruleCode)
+ .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
+ .setTaskStatus(TaskType.TASK_TYPE_IN.type.shortValue())
+ .setTargLoc(LocManageUtil.getTargetLoc())
+ .setBarcode(pakin.getBarcode())
+ .setTargSite(LocManageUtil.getTargetSite());
+ tasks.add(task);
+ });
+
+ if (!this.saveBatch(tasks)) {
+ throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+ }
+
+ //TODO 淇濆瓨浠诲姟妗ｆ槑缁�
+ waitPakinItems.forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+
+ taskItems.add(taskItem);
+ });
return null;
}
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
new file mode 100644
index 0000000..60fec73
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -0,0 +1,47 @@
+package com.vincent.rsf.server.manager.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.system.enums.LocStsType;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
+
+public class LocManageUtil {
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇鐩爣搴撲綅, 鍖呭惈搴撲綅鑾峰彇绛栫暐
+ * @param
+ * @return
+ * @time 2025/3/31 08:50
+ */
+ public static String getTargetLoc() {
+ //TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
+ LocService locService = SpringUtils.getBean(LocService.class);
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type), false);
+
+ return Objects.isNull(loc) ? loc.getCode() : null;
+ }
+
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇鐩爣绔欑偣
+ * @param
+ * @return
+ * @time 2025/3/31 09:49
+ */
+ public static String getTargetSite() {
+ //TODO 绔欑偣绛栫暐鍚庣画鎺掓湡
+ DeviceSiteService deviceSite = SpringUtils.getBean(DeviceSiteService.class);
+ DeviceSite loc = deviceSite.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getStatus, 1), false);
+ return Objects.isNull(loc) ? loc.getSite() : null;
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
index 47ca82d..cb7bab2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -32,7 +32,7 @@
/**
* 璐ㄦ鍗曚笟鍔＄被鍨�
*/
- public final static String SYS_INSPECT_WK_TYPE = "sys_inspect_wk_type";
+ public final static String SYS_INSPECT_CODE = "sys_inspect_code";
/**
* 鐗╂枡缂栫爜鐢熸垚瑙勫垯
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/enums/LocStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/enums/LocStsType.java
index 946ad6d..2427b9e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/enums/LocStsType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/enums/LocStsType.java
@@ -17,9 +17,9 @@
LOC_STS_TYPE_R("R", "鍑哄簱棰勭害"),
;
- private String type;
+ public String type;
- private String desc;
+ public String desc;
LocStsType(String type, String desc) {
this.type = type;
--
Gitblit v1.9.1