From 9c385c685686a667a5d835d858f88ee718c036bf Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 17 八月 2024 11:20:39 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java | 26 ++++++++++++++++++++++++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 26 +++++++++++++++++++-------
zy-asrs-admin/src/config.js | 6 +++---
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-admin/src/config.js b/zy-asrs-admin/src/config.js
index 791414c..2426770 100644
--- a/zy-asrs-admin/src/config.js
+++ b/zy-asrs-admin/src/config.js
@@ -4,13 +4,13 @@
url: 'http://127.0.0.1:8081/wms',
token: '',
user: null,
- locale: 'zhCN', // 榛樿璇█
+ locale: 'zh_CN', // 榛樿璇█
currentHost: null,
localeList: {//璇█鍒楄〃
- 'zhCN': {
+ 'zh_CN': {
desc: '绠�浣撲腑鏂�'
},
- 'enUS': {
+ 'en_US': {
desc: 'English'
}
},
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index e015d14..1c1748b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
-import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
-import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
-import com.zy.asrs.wms.asrs.entity.enums.ShelvesRuleDetlType;
+import com.zy.asrs.wms.asrs.entity.enums.*;
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.utils.LocUtils;
@@ -50,6 +48,8 @@
private ShelvesRuleService shelvesRuleService;
@Autowired
private LanewayRuleService lanewayRuleService;
+ @Autowired
+ private CircleRuleService circleRuleService;
@Override
public String generateTaskNo(Long taskType) {
@@ -83,6 +83,12 @@
}
}
+ Integer currentLev = null;
+ if (shelvesRule.getRuleType().equals(ShelvesRuleType.HIGH.id)) {
+ //浼樺厛绔嬩綋灞�
+ currentLev = circleRuleService.getCurrentValueByFlag(CircleRuleType.LEV.flag);
+ }
+
List<ShelvesRuleDetl> ruleDetls = shelvesRule.getRuleDetl$();
if(ruleDetls.isEmpty()) {
throw new CoolException("鏈厤缃笂鏋惰鍒欐槑缁�");
@@ -101,7 +107,7 @@
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.SUGGEST.id)) {
//鑾峰彇鎺ㄨ崘搴撲綅
- List<Loc> suggestLoc = locUtils.getSuggestEmptyLoc(taskType, locTypeHeight, laneRowList);
+ List<Loc> suggestLoc = locUtils.getSuggestEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
//鑾峰彇搴撲綅
if (!suggestLoc.isEmpty()) {
defaultLoc = locUtils.filterLoc(taskType, suggestLoc);
@@ -113,7 +119,7 @@
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
//浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
- List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList);
+ List<Loc> globalLoc = locUtils.getGlobalEmptyLoc(taskType, locTypeHeight, laneRowList, currentLev);
//鑾峰彇搴撲綅
if (!globalLoc.isEmpty()) {
defaultLoc = locUtils.filterAllLoc(globalLoc);
@@ -163,6 +169,12 @@
}
}
+ Integer currentLev = null;
+ if (shelvesRule.getRuleType().equals(ShelvesRuleType.HIGH.id)) {
+ //浼樺厛绔嬩綋灞�
+ currentLev = circleRuleService.getCurrentValueByFlag(CircleRuleType.LEV.flag);
+ }
+
List<ShelvesRuleDetl> ruleDetls = shelvesRule.getRuleDetl$();
if(ruleDetls.isEmpty()) {
throw new CoolException("鏈厤缃笂鏋惰鍒欐槑缁�");
@@ -181,7 +193,7 @@
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.SUGGEST.id)) {
//鑾峰彇鎺ㄨ崘搴撲綅
- List<Loc> suggestLoc = locUtils.getSuggestLoc(taskType, mat.getId(), detl.getBatch(), locTypeHeight, laneRowList);
+ List<Loc> suggestLoc = locUtils.getSuggestLoc(taskType, mat.getId(), detl.getBatch(), locTypeHeight, laneRowList, currentLev);
//鑾峰彇搴撲綅
if (!suggestLoc.isEmpty()) {
defaultLoc = locUtils.filterLoc(taskType, suggestLoc);
@@ -193,7 +205,7 @@
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.COMPLETE.id)) {
//浠庡叏灞�搴撲綅涓幏鍙�(瀹屾暣宸烽亾)
- List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList);
+ List<Loc> globalLoc = locUtils.getGlobalLoc(taskType, locTypeHeight, laneRowList, currentLev);
//鑾峰彇搴撲綅
if (!globalLoc.isEmpty()) {
defaultLoc = locUtils.filterAllLoc(globalLoc);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
index 86e014d..ef764f3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/result/LoginResult.java
@@ -1,24 +1,46 @@
package com.zy.asrs.wms.system.controller.result;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.wms.system.entity.User;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
/**
* Created by vincent on 1/30/2024
*/
@Data
@NoArgsConstructor
-@AllArgsConstructor
public class LoginResult implements Serializable {
private static final long serialVersionUID = 1L;
private String accessToken;
- private User user;
+ private Map<String, Object> user;
+ public LoginResult(String accessToken, User user) {
+ this.accessToken = accessToken;
+
+ HashMap<String, Object> userMap = new HashMap<>();
+ userMap.put("username", user.getUsername());
+ userMap.put("nickname", user.getNickname());
+ userMap.put("avatar", user.getAvatar());
+ userMap.put("code", user.getCode());
+ userMap.put("sex", user.getSex());
+ userMap.put("phone", user.getPhone());
+ userMap.put("email", user.getEmail());
+ userMap.put("emailVerified", user.getEmailVerified());
+ userMap.put("deptId", user.getDeptId());
+ userMap.put("realName", user.getRealName());
+ userMap.put("hostId", user.getHostId());
+ userMap.put("status", user.getStatus());
+ userMap.put("memo", user.getMemo());
+ this.user = userMap;
+ }
}
--
Gitblit v1.9.1