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

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

@@ -304,6 +304,7 @@ public class AutoCallAirShaftTask {
         // 访问acs判断有无气涨轴
         JSONArray array = new JSONArray();
         JSONObject device = new JSONObject();
+        device.put("product_area", "B2");
         device.put("device_code", shafttubeivt.getPoint_code());
         array.add(device);
         JSONObject pointStatus = wmsToAcsService.getPointStatus(array);
@@ -442,4 +443,8 @@ public class AutoCallAirShaftTask {
         trussCallAirShaftTask.createTask(param);
     }
 
+    public boolean checkHasTask(SlitterPlanDistinctDto dto) {
+
+    }
+
 }