diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java index d9a0bb1..a4d9f1d 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java @@ -142,6 +142,8 @@ public class AgvWaitUtil { param.put("deviceCode",deviceCode); // 判断是否需要空托盘 param.put("isBarcode", ObjectUtil.isEmpty(taskDto.getIs_vehicle()) ? "0" : taskDto.getIs_vehicle()); + // 将运输的类型告诉输送线 + param.put("isEmpBarcode", ObjectUtil.isEmpty(taskDto.getIs_empvehicle()) ? "0" : taskDto.getIs_empvehicle()); JSONObject data = new JSONObject(); data.put("DATA", param); diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/acs2/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls index 3ae1214..6ee0e99 100644 Binary files a/acs2/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls and b/acs2/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls differ diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index eec3e08..f49ad6f 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -78,6 +78,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String remark = task.getRemark(); String params = task.getParams(); String is_vehicle = task.getIs_vehicle(); + String is_empvehicle = task.getIs_empvehicle(); // 双工RGV任务 后工位任务 String start_point_code2 = task.getStart_device_code2(); String next_point_code2 = task.getNext_device_code2(); @@ -225,6 +226,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("vehicle_type", vehicle_type); jo.put("remark", remark); jo.put("is_vehicle", is_vehicle); + jo.put("is_empvehicle", is_empvehicle); jo.put("params", params); jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); jo.put("direction", direction); diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs2/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java index 5718592..c51dd7e 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java @@ -287,4 +287,9 @@ public class TaskDto implements Serializable { * 是否需要载具 */ private String is_vehicle; + + /** + * 是否空托盘 + */ + private String is_empvehicle; } diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index 2cefa2d..e6000c6 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -246,6 +246,21 @@ /> + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java index c508736..f75bedc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java @@ -19,6 +19,8 @@ public interface MesToWmsService { * PlacedLocation: 放料库位 * Priority: 优先级 * MsgTime: 下发时间 + * IsPanCode: 是否需要载具号 + * CarryIsEmptyTuoPan: 运载物品是否是空托盘 * } * ] * } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java index bc47ff4..643e18e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java @@ -125,6 +125,11 @@ public class AcsTaskDto { */ private String Is_vehicle; + /** + * 是否空托盘 + */ + private String is_empvehicle; + /** * 扩展属性 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java index 022152d..cf20964 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java @@ -48,6 +48,7 @@ public class KABDMTask extends AbstractTask { task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setCreate_id(SecurityUtils.getCurrentUserId()); @@ -70,6 +71,7 @@ public class KABDMTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setTask_type("1"); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java index 68e5a4a..6d84558 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java @@ -50,6 +50,7 @@ public class KDMABTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class KDMABTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java index ca8eb7a..46da656 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java @@ -50,6 +50,7 @@ public class MABCTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MABCTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java index 1dea0a0..6b2b1dd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java @@ -50,6 +50,7 @@ public class MABDMTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MABDMTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java index 5069bb5..dbb059b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java @@ -50,6 +50,7 @@ public class MABGPTHJTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MABGPTHJTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java index f05c74b..e836d8a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java @@ -50,6 +50,7 @@ public class MBZCPTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MBZCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java index 710a072..8144832 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java @@ -50,6 +50,7 @@ public class MCDTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MCDTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java index f30e3bd..57891b8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java @@ -50,6 +50,7 @@ public class MDDMTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MDDMTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java index ef32ea9..38d4729 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java @@ -50,6 +50,7 @@ public class MDMCPTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MDMCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java index c0f1295..652749a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java @@ -50,6 +50,7 @@ public class MGPTHJABTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MGPTHJABTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java index 437c24d..a9a5669 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java @@ -50,6 +50,7 @@ public class MGPTHJCPTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class MGPTHJCPTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java index 59d013b..de6b005 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBLICLPQTask.java @@ -50,6 +50,7 @@ public class PUBLICLPQTask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class PUBLICLPQTask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java index 816e486..77f2598 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/PUBMOVETask.java @@ -50,6 +50,7 @@ public class PUBMOVETask extends AbstractTask { task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setIs_vehicle(json.getString("IsPanCode")); + task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); task.setCreate_id(SecurityUtils.getCurrentUserId()); task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setCreate_time(DateUtil.now()); @@ -70,7 +71,7 @@ public class PUBMOVETask extends AbstractTask { acsTaskDto.setPriority(taskDao.getPriority()); acsTaskDto.setIs_vehicle(taskDao.getIs_vehicle()); acsTaskDto.setTask_type("1"); - + acsTaskDto.setIs_empvehicle(taskDao.getExt_group_data()); return acsTaskDto; }