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

代码修改

Browse Source
This commit is contained in:
liyongde
2023-01-04 13:42:04 +08:00
parent d1719ba86d
commit 6901090298
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
View File

@@ -93,7 +93,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
taskTab.delete("task_id = '" + task_id + "'"); taskTab.delete("task_id = '" + task_id + "'");
} }
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { if (StrUtil.equals(status, "1")) {
// 更新任务状态为执行中 // 更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
@@ -101,7 +101,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
taskTab.update(jsonTask); taskTab.update(jsonTask);
} }
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { if (StrUtil.equals(status, "2")) {
/* /*
* 更改任务状态为完成 * 更改任务状态为完成
* 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态 * 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态
@@ -189,7 +189,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
PointUpdateUtil.updatePoint(array); PointUpdateUtil.updatePoint(array);
// 找叠盘架是否与对应的载具类型 // 找叠盘架是否与对应的载具类型
JSONObject jsonDpjStart = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0); JSONObject jsonDpjStart = pointTab.query("region_code = '" + RegionTypeEnum.DPJQB.getCode() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDpjStart)) { if (ObjectUtil.isNotEmpty(jsonDpjStart)) {
// 判断叠盘架是否有任务 有就下一个任务 // 判断叠盘架是否有任务 有就下一个任务

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -74,13 +74,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
if (StrUtil.equals(status, "2")) { if (StrUtil.equals(status, "2")) {
//判断状态, //判断状态,
if (StrUtil.equals("2", taskObj.getString("task_status"))) { // if (StrUtil.equals("2", taskObj.getString("task_status"))) {
// 更改任务状态为完成 // // 更改任务状态为完成
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); // taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
taskObj.put("update_time", DateUtil.now()); // taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); // taskTab.update(taskObj);
return; // return;
} // }
// 更改任务状态为完成 // 更改任务状态为完成
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
@@ -171,7 +171,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
JSONObject taskIng = taskIngs.getJSONObject(0); JSONObject taskIng = taskIngs.getJSONObject(0);
if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) { if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) {
JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0); JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0);
if (StrUtil.equals(point2.getString("block_num"), json1.getString("block_num")) if (StrUtil.equals(point2.getString("block_num"), json1.getString( "block_num"))
&& StrUtil.equals(point2.getString("row_num"), json1.getString("row_num"))) { && StrUtil.equals(point2.getString("row_num"), json1.getString("row_num"))) {
taskObj.put("remark", "相应列有AGV在工作,等待执行!"); taskObj.put("remark", "相应列有AGV在工作,等待执行!");
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());