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

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);

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);

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

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -246,6 +246,21 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否是空载具">
+            <el-select
+              v-model="form.is_empvehicle"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dict.is_yes_not"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="优先级">
             <el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
           </el-form-item>

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: 运载物品是否是空托盘
      *           }
      *      ]
      * }

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;
+
     /**
      * 扩展属性
      */

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

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

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

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

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

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

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

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

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

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

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

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

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