Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java

@@ -61,9 +61,16 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
                     .remark(json.getString("remark"))
                     .build();
 
-            // 如果是二期转库任务则下发托盘
+            // 如果是二期转库任务则下发托盘 && 下发路由方案 大托盘托盘号开头A是大B是小
             if (json.getString("task_type").equals("010709")) {
                 dto.setVehicle_code(json.getString("vehicle_code2"));
+
+                if (json.getString("vehicle_code2").contains("A")) {
+                    dto.setRoute_plan_code("two");
+                } else {
+                    dto.setRoute_plan_code("normal");
+                }
+
             }
 
             resultList.add(dto);