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

opt:混托物料组盘修改

Browse Source
This commit is contained in:
gongbaoxiong
2025-03-12 13:36:22 +08:00
parent fa85da9eb3
commit d816474903
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,11 +153,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
handleFinishTask(param, task); handleFinishTask(param, task);
return; return;
} }
MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>() List<MdPbVehicleMater> vehicleMaterList = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
.eq("vehicle_code", task.getVehicle_code()) .eq("vehicle_code", task.getVehicle_code())
.eq("is_delete", false)); .eq("is_delete", false));
if (vehicleMater != null && !StringUtils.isEmpty(vehicleMater.getProc_inst_id())) { if (ObjectUtil.isEmpty(vehicleMaterList)) {
FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null); throw new BadRequestException("任务完成失败，到载具物料信息: " + task.getVehicle_code());
}
if (StringUtils.isNotBlank(vehicleMaterList.get(0).getProc_inst_id())) {
FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null);
BussEventMulticaster.Publish(continueEvent); BussEventMulticaster.Publish(continueEvent);
} else { } else {
handleFinishTask(param, task); handleFinishTask(param, task);

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -312,7 +312,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
vehicleMater.setMaterial_id(materialCode.getMaterial_id()); vehicleMater.setMaterial_id(materialCode.getMaterial_id());
vehicleMater.setId(IdUtil.getStringId()); vehicleMater.setId(IdUtil.getStringId());
vehicleMater.setUnit_id("100438");//个 vehicleMater.setUnit_id("100438");//个
vehicleMater.setStor_code("FStockId"); vehicleMater.setStor_code(vehicle_code.toUpperCase().contains("T")?"FStockPallet":"FStockId");
vehicleMater.setCreate_time(now); vehicleMater.setCreate_time(now);
vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName()); vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
groups.add(dick); groups.add(dick);

0
wms_pro/qd/新建文本文档.txt
View File