root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:组盘管理，fix:异常入库

Browse Source
This commit is contained in:
zhangzq
2024-08-18 13:03:24 +08:00
parent 805ca71c08
commit 7635b5100c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
View File

@@ -63,7 +63,7 @@ public class GroupDickInStorageTask extends AbstractTask {
} }
MdGruopDick mst = iMdGruopDickService MdGruopDick mst = iMdGruopDickService
.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code) .getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code)
.le("status", StatusEnum.FORM_STATUS.code("完成"))); .lt("status", StatusEnum.FORM_STATUS.code("完成")));
if (mst == null){ if (mst == null){
throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在"); throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
} }

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -257,7 +257,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
String task_code = task.getTask_code(); String task_code = task.getTask_code();
MdPbVehicleMater vehicleCode = iMdPbVehicleMaterService MdPbVehicleMater vehicleCode = iMdPbVehicleMaterService
.getOne(new QueryWrapper<MdPbVehicleMater>() .getOne(new QueryWrapper<MdPbVehicleMater>()
.eq("vehicle_code", task.getVehicle_code())); .eq("vehicle_code", task.getVehicle_code())
.eq("is_delete",false));
//查询分配规则 //查询分配规则
Map map = SpringContextHolder.getBean(DecisionHandler.class) Map map = SpringContextHolder.getBean(DecisionHandler.class)
.dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code()))); .dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code())));

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java
View File

@@ -221,7 +221,7 @@ public class PickingService {
dick.setSource_form_id(data.getId()); dick.setSource_form_id(data.getId());
dick.setCreate_name(SecurityUtils.getCurrentNickName()); dick.setCreate_name(SecurityUtils.getCurrentNickName());
dick.setCreate_time(DateUtil.now()); dick.setCreate_time(DateUtil.now());
dick.setStatus(StatusEnum.FORM_STATUS.code("完成")); dick.setStatus(StatusEnum.FORM_STATUS.code("执行中"));
dick.setCode(CodeUtil.getNewCode("md_group_dick")); dick.setCode(CodeUtil.getNewCode("md_group_dick"));
dick.setId(IdUtil.getStringId()); dick.setId(IdUtil.getStringId());
MdPbVehicleMater mater = new MdPbVehicleMater(); MdPbVehicleMater mater = new MdPbVehicleMater();