fix: 修复原框架问题

This commit is contained in:
2025-07-21 08:50:28 +08:00
parent 1c910ca154
commit bdd0fe292c
7 changed files with 3073 additions and 58 deletions

View File

@@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -319,6 +319,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
/** /**
* 出库分配 * 出库分配
*
* @param param根据库区需要物料及数量,单据,批次分配具体货位 * @param param根据库区需要物料及数量,单据,批次分配具体货位
* @return 返回结果为仓位--对应--货物组盘物料信息及出库冻结数量 * @return 返回结果为仓位--对应--货物组盘物料信息及出库冻结数量
* 当前分配不会自动锁定货位及冻结出库数量,分配完成后需要手动锁定货位并冻结出库数量 * 当前分配不会自动锁定货位及冻结出库数量,分配完成后需要手动锁定货位并冻结出库数量
@@ -349,6 +350,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
/** /**
* 入库分配 * 入库分配
*
* @param param根据库区需要物料及数量,单据,批次分配具体货位;按托进行分配:默认一托一个货位 * @param param根据库区需要物料及数量,单据,批次分配具体货位;按托进行分配:默认一托一个货位
* @return 返回结果为分配的具体仓位 * @return 返回结果为分配的具体仓位
* 当前分配不会自动锁定货位,分配完成后需要手动锁定货位 * 当前分配不会自动锁定货位,分配完成后需要手动锁定货位

View File

@@ -9,13 +9,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import java.util.List; import java.util.List;
/* /**
* @author ZZQ * @author ZZQ
* @Date 2024/4/6 16:13 * @Date 2024/4/6 16:13
*/ */
public abstract class Decisioner<T,P> implements InitializingBean { public abstract class Decisioner<T,P> implements InitializingBean {
//每个策略的配置信息 /**
* 每个策略的配置信息
*/
public StStrategyConfig strategyConfig; public StStrategyConfig strategyConfig;
@Autowired @Autowired
private IStStrategyConfigService iStStrategyConfigService; private IStStrategyConfigService iStStrategyConfigService;

View File

@@ -1,6 +1,5 @@
package org.nl.wms.decision_manage.service.strategyConfig.decisioner.impl.base; package org.nl.wms.decision_manage.service.strategyConfig.decisioner.impl.base;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.nl.common.exception.BadRequestException; import org.nl.common.exception.BadRequestException;
@@ -15,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.ArrayList;
import java.util.stream.Collectors; import java.util.List;
/* /**
* @author ZZQ * @author ZZQ
* @Date 2024/4/6 16:18 * @Date 2024/4/6 16:18
* 先进先出策略 * 先进先出策略

View File

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/* /**
* @author GBX * @author GBX
* @Date 2025/2/1 16:18 * @Date 2025/2/1 16:18
* 相同巷道,自下而上分配,左右相邻 * 相同巷道,自下而上分配,左右相邻

View File

@@ -379,9 +379,9 @@ public class PdaIosInServiceImpl implements PdaIosInService {
sendTask(whereJson); sendTask(whereJson);
//更新组盘表状态 //更新组盘表状态
mdPbGroupplateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<GroupPlate>() mdPbGroupplateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<GroupPlate>()
.set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")) .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
.eq(GroupPlate::getStoragevehicle_code, whereJson.getString("storagevehicle_code")) .eq(GroupPlate::getStoragevehicle_code, whereJson.getString("storagevehicle_code"))
.eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))); .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")));
} else { } else {
//空载具入库 //空载具入库
whereJson.put("qty", 1); whereJson.put("qty", 1);

View File

@@ -40,7 +40,7 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/api/bigScreenScreen") @RequestMapping("/mobile/auth")
public class MobileAuthorizationController { public class MobileAuthorizationController {
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
@@ -51,7 +51,7 @@ public class MobileAuthorizationController {
@SaIgnore @SaIgnore
//("手持登陆验证") //("手持登陆验证")
public ResponseEntity<Object> handLogin(@RequestBody Map<String, String> whereJson) { public ResponseEntity<Object> handLogin(@RequestBody Map<String, String> whereJson) {
SysUser userInfo = userService.getOne(new QueryWrapper<SysUser>().eq("username", whereJson.get("user"))); SysUser userInfo = userService.getOne(new QueryWrapper<SysUser>().eq("username", whereJson.get("username")));
if (userInfo == null || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(RsaUtils.decryptByPrivateKey(RsaUtils.KEY, whereJson.get("password")), "salt"))) { // 这里需要密码加密 if (userInfo == null || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(RsaUtils.decryptByPrivateKey(RsaUtils.KEY, whereJson.get("password")), "salt"))) { // 这里需要密码加密
throw new BadRequestException("账号或密码错误"); throw new BadRequestException("账号或密码错误");
} }

File diff suppressed because one or more lines are too long