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

rev:取消任务

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-29 19:23:23 +08:00
parent 8330f8d482
commit 4c87d68f92
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -122,7 +122,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
String task_id = row.getString("task_id"); String task_id = row.getString("task_id");
TaskDto taskDto = taskService.findById(task_id); TaskDto taskDto = taskService.findById(task_id);
String processing_class = taskDto.getHandle_class(); String processing_class = taskDto.getHandle_class();
String status = acsStatus2Mes(row); String status = row.getString("status");
// 任务处理类 // 任务处理类
try { try {
AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class)); AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
View File

@@ -66,7 +66,7 @@ public class SpeEmpTask extends AbstractAcsTask {
public SpeEmpTask() { public SpeEmpTask() {
SpeHandles.put(AcsTaskEnum.TASK_CACHELINE_OUT.name() ,new Cache2Spe()); SpeHandles.put(AcsTaskEnum.TASK_CACHELINE_OUT.getDesc() ,new Cache2Spe());
} }
@Override @Override
@@ -140,7 +140,7 @@ public class SpeEmpTask extends AbstractAcsTask {
JSONObject task = new JSONObject(); JSONObject task = new JSONObject();
参数封装:{ 参数封装:{
task.put("task_id", task_id); task.put("task_id", task_id);
task.put("task_name", AcsTaskEnum.TASK_CACHELINE_OUT.name()); task.put("task_name", AcsTaskEnum.TASK_CACHELINE_OUT.getDesc());
task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
task.put("task_type", form.getString("type")); task.put("task_type", form.getString("type"));
task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode()); task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode());

29
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
View File

@@ -66,9 +66,9 @@ public class SpeFullTask extends AbstractAcsTask {
public SpeFullTask() { public SpeFullTask() {
SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_MAC.name() ,new Spe2Spe()); SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_MAC.getDesc() ,new Spe2Spe());
SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_CACHE.name() ,new Spe2Cache()); SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_CACHE.getDesc() ,new Spe2Cache());
SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_WASH.name() ,new Spe2Wash()); SpeHandles.put(AcsTaskEnum.TASK_PRODUCT_WASH.getDesc() ,new Spe2Wash());
} }
@Override @Override
@@ -166,32 +166,23 @@ public class SpeFullTask extends AbstractAcsTask {
.set("update_name","acs") .set("update_name","acs")
.set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id()));
Map<String, String> extParam = (Map)param.get("ext_param"); Map<String, String> extParam = (Map)param.get("ext_param");
//取货完成/放货完成暂不处理箱子
if (extParam.get("put_finish") != null){ if (extParam.get("put_finish") != null){
pointService.update(new UpdateWrapper<SchBasePoint>() log.info("放货完成:{},vechile_code:{}",task.getTask_id(),task.getVehicle_code2());
.set("vehicle_code",task.getVehicle_code2())
.eq("point_code",task.getPoint_code3()));
}
if (extParam.get("take_finish") != null){
pointService.update(new UpdateWrapper<SchBasePoint>()
.set("vehicle_code","")
.eq("point_code",task.getPoint_code3()));
pointService.update(new UpdateWrapper<SchBasePoint>()
.set("vehicle_code",task.getVehicle_code2())
.eq("point_code",task.getPoint_code1()));
}
// if (extParam.get("put_finish") != null){
// pointService.update(new UpdateWrapper<SchBasePoint>() // pointService.update(new UpdateWrapper<SchBasePoint>()
// .set("vehicle_code",task.getVehicle_code2()) // .set("vehicle_code",task.getVehicle_code2())
// .eq("point_code",task.getPoint_code3())); // .eq("point_code",task.getPoint_code3()));
// } }
// if (extParam.get("take_finish") != null){ if (extParam.get("take_finish") != null){
log.info("取货完成:{},vechile_code:{}",task.getTask_id(),task.getVehicle_code2());
// pointService.update(new UpdateWrapper<SchBasePoint>() // pointService.update(new UpdateWrapper<SchBasePoint>()
// .set("vehicle_code","") // .set("vehicle_code","")
// .eq("point_code",task.getPoint_code3())); // .eq("point_code",task.getPoint_code3()));
// pointService.update(new UpdateWrapper<SchBasePoint>() // pointService.update(new UpdateWrapper<SchBasePoint>()
// .set("vehicle_code",task.getVehicle_code2()) // .set("vehicle_code",task.getVehicle_code2())
// .eq("point_code",task.getPoint_code1())); // .eq("point_code",task.getPoint_code1()));
// } }
break; break;
case STATUS_FINISH: case STATUS_FINISH:
taskService.update(new UpdateWrapper<SchBaseTask>() taskService.update(new UpdateWrapper<SchBaseTask>()

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
JSONArray finish = new JSONArray(); JSONArray finish = new JSONArray();
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
res.put("task_id", task_id); res.put("task_id", task_id);
res.put("status", StatusEnum.TASK_FINISH.getCode()); res.put("status", AcsTaskEnum.STATUS_FINISH.getCode());
res.put("finished_type", AcsTaskEnum.MANUAL_TASK_FINISHED_TYPE.getCode()); // 手动完成 res.put("finished_type", AcsTaskEnum.MANUAL_TASK_FINISHED_TYPE.getCode()); // 手动完成
finish.add(res); finish.add(res);
acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(finish)); acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(finish));
@@ -66,7 +66,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
JSONArray cancel = new JSONArray(); JSONArray cancel = new JSONArray();
JSONObject res2 = new JSONObject(); JSONObject res2 = new JSONObject();
res2.put("task_id", task_id); res2.put("task_id", task_id);
res2.put("status", StatusEnum.TASK_CANNEL.getCode()); res2.put("status", AcsTaskEnum.STATUS_CANNEL.getCode());
cancel.add(res2); cancel.add(res2);
acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(cancel)); acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(cancel));
break; break;