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

opt: 手持叫料送料功能

Browse Source
This commit is contained in:
yanps
2024-10-17 17:51:46 +08:00
parent 384c1bc589
commit dd60ee6ab5
4 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
View File

@@ -89,14 +89,42 @@ public class HandheldServiceImpl implements HandheldService {
case "3":
interiorAisle(vehicle, device_code, param);
break;
case "4":
applyDeliveryRacks(vehicle, device_code, param);
break;
default:
break;
}
}
/**
* 空载具送回货架
*
* @param vehicle
* @param device_code
* @param param
*/
private void applyDeliveryRacks(String vehicle, String device_code, JSONObject param) {
MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.selectByVehicleCode(vehicle);
if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具不存在!");
SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(device_code);
if (ObjectUtil.isEmpty(schBasePoint)) throw new BadRequestException("设备点位不存在!");
AbstractTask connectorTask = taskFactory.getTask("RACKTask");
// 准备参数：设备编码
JSONObject jo = new JSONObject();
jo.put("device_code", device_code);
jo.put("config_code", "RACKTask");
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_code", vehicle);
jo.put("vehicle_type", mdBaseVehicle.getVehicle_type());
jo.put("ext_data", param);
connectorTask.apply(jo);
}
/**
* 内部过道送托盘
*
* @param vehicle
* @param device_code
* @param param

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -396,7 +396,8 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
.eq(SchBasePoint::getIs_lock, false)
.eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getPoint_status, pointStatus)
.eq(SchBasePoint::getPoint_type, "1")
.eq(!vehicle_type.equals("G01"),SchBasePoint::getPoint_type, "1")
.eq(vehicle_type.equals("G01"),SchBasePoint::getPoint_type, "0")
.eq(StrUtil.isNotBlank(vehicle_type), SchBasePoint::getCan_vehicle_type, vehicle_type)
.isNull(seq == 2, SchBasePoint::getVehicles)
.isNull(seq == 1, SchBasePoint::getVehicle_code)

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/handheld/RackTask.java
View File

@@ -63,7 +63,11 @@ public class RackTask extends AbstractTask {
for (SchBaseTask task : tasks) {
String vehicle_type = task.getVehicle_type();
SchBasePoint schBasePoint = schBasePointService.selectByGroundPoint(RegionEnum.ZDZWQ.getRegion_code(),
String regionCode = RegionEnum.ZDZWQ.getRegion_code();
if(StrUtil.isNotBlank(vehicle_type) && VehicleTypeEnum.TRAY.getVehicleCode().equals(vehicle_type)){
regionCode = RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code();
}
SchBasePoint schBasePoint = schBasePointService.selectByGroundPoint(regionCode,
GoodsEnum.OUT_OF_STOCK.getValue(),vehicle_type, 1);
if (ObjectUtil.isEmpty(schBasePoint)) {
task.setRemark("未找到所需点位!");

10
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -222,11 +222,11 @@
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-upload"-->
<!-- @click="doOperate(scope.row, 'c')"-->
<!-- >下发</el-button>-->
<el-button
type="text"
icon="el-icon-close"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
<el-button
type="text"
icon="el-icon-success"