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

rev：新增字段是否是空托盘

Browse Source
This commit is contained in:
liuxy
2024-12-23 09:45:05 +08:00
parent 05e59e9a8f
commit a0fbe68411
20 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java
View File

@@ -19,6 +19,8 @@ public interface MesToWmsService {
* PlacedLocation: 放料库位
* Priority: 优先级
* MsgTime: 下发时间
* IsPanCode: 是否需要载具号
* CarryIsEmptyTuoPan: 运载物品是否是空托盘
* }
* ]
* }

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

@@ -125,6 +125,11 @@ public class AcsTaskDto {
*/
private String Is_vehicle;
/**
* 是否空托盘
*/
private String is_empvehicle;
/**
* 扩展属性
*/

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}