From 3fa179a023306eddb473afafd524259aedad430d Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 26 Nov 2024 13:34:30 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=B8=8B=E5=8F=91=E6=97=B6=E5=88=A4=E6=96=AD=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=8F=A0=E7=9B=98=E6=95=B0=E9=87=8F=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=B6=85=E8=BF=879=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/user/impl/ISysUserServiceImpl.java     |  3 +++
 .../wms/sch/task_manage/task/tasks/KJRKTask.java   | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
index 35bf732..c7ee1a8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -119,6 +119,9 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
         }catch (Exception ex){
             throw new RuntimeException();
         }
+        if (ObjectUtil.isNotEmpty(sysUser.getPassword())) {
+            sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), "salt"));
+        }
         sysUser.setUpdate_time(new Date());
         sysUser.setUpdate_id(SecurityUtils.getCurrentUserId());
         this.updateById(sysUser);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
index bb22c44..e62a139 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
@@ -66,6 +66,20 @@ public class KJRKTask extends AbstractTask {
             Integer now_num = unFinishTasksByTaskConfig.size();
             for (SchBaseTask task : tasks) {
                 if(now_num < tcmn){
+                    SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
+                            .eq(SchBasePoint::getPoint_code, task.getPoint_code1()));
+                    if(task.getPoint_code1().startsWith("DKT")){
+                        Integer max_qty = schBasePoint.getVehicle_max_qty();
+                        //如果是叠盘位，根据当前数量+1为目标地址
+                        int qty = schBasePoint.getVehicle_qty();
+                        //当前叠盘数量大于设置的最大数9，不允许下发空载具入库任务
+                        if(qty > max_qty){
+                            task.setRemark("当前叠盘机空盘数量为:"+qty+"托,已超最大警戒值:["+max_qty+"]托,请人工处理!");
+                            taskService.update(task);
+                            continue;
+                        }
+                    }
+
                     // 找终点
                     SchBasePoint point = findNextPoint();
                     if (ObjectUtil.isEmpty(point)) {