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

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java

@@ -55,6 +55,26 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
 
+    @Override
+    public List<AcsTaskDto> addTask(SchBaseTask r) {
+        ArrayList<AcsTaskDto> resultList = new ArrayList<>();
+        AcsTaskDto dto = AcsTaskDto.builder()
+                .ext_task_id(r.getTask_id().toString())
+                .task_code(r.getTask_code())
+                .task_type(r.getAcs_task_type())
+                .start_device_code(r.getPoint_code1())
+                .next_device_code(r.getPoint_code2())
+                .vehicle_code(r.getVehicle_code())
+                .priority(r.getPriority())
+                .remark(r.getRemark())
+                .product_area(r.getProduct_area())
+                .agv_action_type(r.getVehicle_code2())
+                .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务"))
+                .interaction_json(JSON.parseObject(r.getRequest_param()))
+                .build();
+        resultList.add(dto);
+        return resultList;
+    }
 
     @Override
     public List<AcsTaskDto> addTask() {
@@ -188,7 +208,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
         taskService.save(task);
         //如果目标点位没有空位先创建不下发
         if (isSend) {
-            this.immediateNotifyAcs(null);
+            this.immediateTaskNotifyAcs(task);
         }
         return task.getTask_id();
     }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java

@@ -336,7 +336,7 @@ public class MzhcwTask extends AbstractAcsTask {
         taskService.save(task);
         //如果目标点位没有空位先创建不下发
         if (isSend) {
-            this.immediateNotifyAcs(task,"");
+            this.immediateTaskNotifyAcs(task);
         }
         return task.getTask_id();
     }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java

@@ -164,7 +164,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
         taskService.save(task);
         //如果目标点位没有空位先创建不下发
         if (isSend) {
-            this.immediateNotifyAcs(task,"");
+            this.immediateTaskNotifyAcs(task);
         }
         return task.getTask_id();
     }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendShaftToCacheTask.java

@@ -182,7 +182,7 @@ public class SendShaftToCacheTask extends AbstractAcsTask {
     }
 
     @Override
-    public JSONObject immediateNotifyAcs(Object task_id) {
+    public JSONObject immediateNotifyAcs(String task_id) {
         try {
             Thread.sleep(1000);
         } catch (Exception ex) {

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java

@@ -553,7 +553,10 @@ public class FeedingServiceImpl implements FeedingService {
             //查询对应的分切点位是否存在
             JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(cut_jo)) {
-                throw new BadRequestException("请输入或者扫码分切区域的空轴点位！");
+                cut_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code + "'").uniqueResult(0);
+                if (ObjectUtil.isEmpty(cut_jo)) {
+                    throw new BadRequestException("请输入或者扫码分切区域的空轴点位！");
+                }
             }
             if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) {
                 throw new BadRequestException("该点位库存状态不存在空轴！");

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java

@@ -37,23 +37,13 @@ public abstract class AbstractAcsTask {
         return addTask();
     }
 
-    public List<AcsTaskDto> schedule(String taskId) {
-        return addTask(taskId);
-    }
-
-    public List<AcsTaskDto> schedule(SchBaseTask task) {
-        return addTask(task);
-    }
-
     /**
      * 添加任务进行下发
      *
      * @return
      */
     public abstract List<AcsTaskDto> addTask();
-    public List<AcsTaskDto> addTask(String taskId){
+
-        throw new BadRequestException("当前类没有重写addTask(taskId)方法");
-    };
     public List<AcsTaskDto> addTask(SchBaseTask task){
         throw new BadRequestException("当前类没有重写addTask(taskId)方法");
     };
@@ -128,34 +118,28 @@ public abstract class AbstractAcsTask {
     /**
      *
      */
-    public JSONObject immediateNotifyAcs(Object task_id) {
+    public JSONObject immediateNotifyAcs(String task_id) {
         try {
             Thread.sleep(1000);
         }catch (Exception ex){
 
         }
-        List<AcsTaskDto> taskList;
+        List<AcsTaskDto> taskList = this.schedule();
-            if (ObjectUtil.isEmpty(task_id)){
+        if (ObjectUtil.isNotEmpty(taskList)) {
-               taskList = this.schedule();
+            JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
+            if (acsUtil == null){
+                return AcsUtil.notifyAcs("api/wms/task", arr);
             }else {
-               taskList = this.schedule((String) task_id);
+                return acsUtil.notifyAcs3("api/wms/task", arr);
-            }
-            if (ObjectUtil.isNotEmpty(taskList)) {
-                JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
-                if (acsUtil == null){
-                    return AcsUtil.notifyAcs("api/wms/task", arr);
-                }else {
-                    return acsUtil.notifyAcs3("api/wms/task", arr);
-                }
             }
+        }
         return null;
-
     }
-    public JSONObject immediateNotifyAcs(SchBaseTask task,String taskId) {
+    public JSONObject immediateTaskNotifyAcs(SchBaseTask task) {
         if (task==null){
             throw new BadRequestException("任务下发参数不能为空");
         }
-        List<AcsTaskDto> taskList = this.schedule(task);
+        List<AcsTaskDto> taskList = this.addTask(task);
             if (ObjectUtil.isNotEmpty(taskList)) {
                 JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
                 if (acsUtil == null){