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

opt:任务组优化

Browse Source
This commit is contained in:
zhengxuming
2025-10-11 09:25:33 +08:00
parent fa521105ba
commit 75f4a13cfa
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -344,8 +344,11 @@ public class PdaIosInServiceImpl implements PdaIosInService {
PageQuery pageQuery = new PageQuery();
IPage<SectattrDto> sectList = iSectattrService.queryAll(new HashMap(), pageQuery);
List<SelectItemVo> selectList = new ArrayList<>();
sectList.getRecords().forEach(r ->
selectList.add(SelectItemVo.builder().text(r.getStor_name() + "-" + r.getSect_name()).value(r.getSect_id()).build())
sectList.getRecords().forEach(r -> {
if (StringUtils.isNotBlank(r.getStor_name()) && !r.getStor_name().contains("料桶")) {
selectList.add(SelectItemVo.builder().text(r.getStor_name() + "-" + r.getSect_name()).value(r.getSect_id()).build());
}
}
);
return PdaResponse.requestParamOk(selectList);
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
View File

@@ -74,6 +74,7 @@ public class VehicleInTask extends AbstractTask {
@Override
public String create(JSONObject json) {
String taskGroupId = IdUtil.getStringId();
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
if(json.containsKey("task_code")){
@@ -86,6 +87,7 @@ public class VehicleInTask extends AbstractTask {
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));
task.setVehicle_code(json.getString("vehicle_code"));
task.setTask_group_id(taskGroupId);
task.setCreate_mode(json.getString("create_mode"));
task.setRequest_param(json.toString());
task.setPriority(json.getString("Priority"));

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java
View File

@@ -798,18 +798,18 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
if (ObjectUtil.isEmpty(groupPlate)) {
throw new BadRequestException("托盘[" + whereJson.get("vehicle_code") + "]状态为组盘的信息不存在！");
}
String taskGroupId = IdUtil.getStringId();
JSONObject task = new JSONObject();
task.put("config_code", IOSConstant.IN_BILL_TASK);
task.put("group_id", groupPlate.getGroup_id());
task.put("priority", whereJson.get("priority"));
task.put("task_group_seq", whereJson.get("task_group_seq"));
task.put("task_group_id", whereJson.get("task_group_id"));
task.put("task_group_id", taskGroupId);
task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
task.put("point_code1", ioStorInvDis.getStruct_code());
task.put("point_code2", whereJson.get("point_code2"));
task.put("point_code3", whereJson.get("point_code3"));
task.put("point_code4", ioStorInvDis.getStruct_code());
task.put("form_data_code", whereJson.get("form_data_code"));
//第一个载具为计算得到的，第二个载具为起始点载具
@@ -824,16 +824,16 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
if (ObjectUtil.isEmpty(groupPlate)) {
throw new BadRequestException("托盘[" + ioStorInvDis.getStoragevehicle_code() + "]的信息不存在！");
}
String taskGroupId = IdUtil.getStringId();
JSONObject task = new JSONObject();
task.put("config_code", IOSConstant.BACK_IN_TASK);
task.put("group_id", groupPlate.getGroup_id());
task.put("priority", whereJson.get("priority"));
task.put("task_group_seq", whereJson.get("task_group_seq"));
task.put("task_group_id", whereJson.get("task_group_id"));
task.put("task_group_id", taskGroupId);
task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
task.put("point_code1", whereJson.get("point_code"));
task.put("point_code2", ioStorInvDis.getStruct_code());
task.put("form_data_code", whereJson.get("form_data_code"));
//第一个载具为计算得到的，第二个载具为起始点载具