opt:空载具入库下发时判断当前叠盘数量是否超过9托

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);

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)) {