From a0fbe68411a67a18cdf772f0ce0e73f232988b24 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 23 Dec 2024 09:45:05 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=AF=E7=A9=BA=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/AgvWaitUtil.java | 2 ++ .../java/org/nl/acs/device/wql/task_inst.xls | Bin 159232 -> 159232 bytes .../wms/service/impl/WmsToAcsServiceImpl.java | 2 ++ .../org/nl/acs/task/service/dto/TaskDto.java | 5 +++++ acs2/nladmin-ui/src/views/acs/task/index.vue | 15 +++++++++++++++ .../wms/ext/mes/service/MesToWmsService.java | 2 ++ .../nl/wms/sch/task_manage/AcsTaskDto.java | 5 +++++ .../task_manage/task/tasks/fj/KABDMTask.java | 2 ++ .../task_manage/task/tasks/fj/KDMABTask.java | 3 ++- .../task_manage/task/tasks/fj/MABCTask.java | 3 ++- .../task_manage/task/tasks/fj/MABDMTask.java | 3 ++- .../task/tasks/fj/MABGPTHJTask.java | 3 ++- .../task_manage/task/tasks/fj/MBZCPTask.java | 3 ++- .../task_manage/task/tasks/fj/MCDTask.java | 3 ++- .../task_manage/task/tasks/fj/MDDMTask.java | 3 ++- .../task_manage/task/tasks/fj/MDMCPTask.java | 3 ++- .../task/tasks/fj/MGPTHJABTask.java | 3 ++- .../task/tasks/fj/MGPTHJCPTask.java | 3 ++- .../task/tasks/fj/PUBLICLPQTask.java | 3 ++- .../task/tasks/fj/PUBMOVETask.java | 3 ++- 20 files changed, 57 insertions(+), 12 deletions(-) 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 3ae121441605775bde199628614baa25d2eca6d2..6ee0e993814b34be62698a76a98bccee320c5789 100644 GIT binary patch delta 8673 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 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; }