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

手持原材料出库：申请任务时更新任务的载具信息，并同步更新工单状态

Browse Source
This commit is contained in:
zds
2024-08-19 15:20:28 +08:00
parent d95ba4fa5c
commit a6e6227728
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -21,6 +21,7 @@ import org.nl.wms.sch.task_manage.enums.TaskDirectionEnum;
import org.nl.wms.sch.task_manage.enums.WorkOrderStatusEnum; import org.nl.wms.sch.task_manage.enums.WorkOrderStatusEnum;
import org.nl.wms.sch.task_manage.task.AcsUtil; import org.nl.wms.sch.task_manage.task.AcsUtil;
import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.workorder.service.IWorkorderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -44,7 +45,7 @@ public abstract class AbstractTask {
@Autowired @Autowired
private ISchBasePointService pointService; private ISchBasePointService pointService;
@Autowired @Autowired
private IPdmBdWorkorderService workorderService; private IWorkorderService workorderService;
@Autowired @Autowired
private IMdBaseMaterialService materialService; private IMdBaseMaterialService materialService;
@@ -189,6 +190,16 @@ public abstract class AbstractTask {
.eq(SchBasePoint::getPoint_code, apply_point_code)); .eq(SchBasePoint::getPoint_code, apply_point_code));
// 判断是否校验工单 // 判断是否校验工单
if (taskConfig.getIs_check_workorder()) { if (taskConfig.getIs_check_workorder()) {
//如果点位上没货
if(ObjectUtil.isNotEmpty(pointObj.getVehicle_code2())) {
throw new BadRequestException("点位:" + apply_point_code+ "上无托盘信息!");
}
//设置载具信息
param.put("vehicle_code2",pointObj.getVehicle_code2());
param.put("vehicle_code",pointObj.getVehicle_code());
//更新对应载具工单状态为已生成任务，不可在工单页面取消
//pdm_bd_workorder_two任务生成时，status改为2
workorderService.update(pointObj.getVehicle_code2(),"2");
// 校验工单 // 校验工单
// 根据对接位的父点位编码(设备)找到工单设备 // 根据对接位的父点位编码(设备)找到工单设备
/*SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>() /*SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()

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

@@ -319,7 +319,7 @@ public class YCLCKTask extends AbstractTask {
taskObj.setRemark("任务取消"); taskObj.setRemark("任务取消");
taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setTask_status(TaskStatus.CANCELED.getCode());
String vehicleCode2 = taskObj.getVehicle_code2(); String vehicleCode2 = taskObj.getVehicle_code2();
//pdm_bd_workorder_two任务完成时，status改为3 //pdm_bd_workorder_two任务取消时，status改为1
if(ObjectUtil.isNotEmpty(vehicleCode2)){ if(ObjectUtil.isNotEmpty(vehicleCode2)){
workorderService.update(vehicleCode2,"1"); workorderService.update(vehicleCode2,"1");
} }