流水线在横移上锁定非紧急料架位,当返回码为99时,不放上托盘

需求单出库为0时关闭
执行队列页面显示绑定数量
取消任务时增加PN需求单判断
Http请求增加URLEncode

myproject/src/main/java/com/myproject/bean/qisda/InquiryShelfBean.java

@@ -264,9 +264,17 @@ public class InquiryShelfBean {
         if(hSerial != null){
             Map<String, ShelfInfo> shelfMap = hSerialShelfMap.get(hSerial);
             if(shelfMap != null){
+                List<ShelfInfo> shelfList = new ArrayList<>(shelfMap.values());
+                shelfList.sort(new Comparator<ShelfInfo>() {
+                    @Override
+                    public int compare(ShelfInfo o1, ShelfInfo o2) {
+                        Integer index1 = o1.getRfidIndex();
+                        Integer index2 = o2.getRfidIndex();
+                        return index1.compareTo(index2);
+                    }
+                });
                 ShelfInfo minIndexShelf = null;
-
-                for (ShelfInfo shelf : shelfMap.values()) {
+                for (ShelfInfo shelf : shelfList) {
                     if(shelf.isFull()){
                         //已经放满,查找下一个
                         continue;
@@ -290,9 +298,21 @@ public class InquiryShelfBean {
                         log.error("任务条码["+task.getBarcode()+"]已无料架可放");
                         return null;
                     }else{
-                        lockLoc = minIndexShelf.lockOneEmptyLoc(task);
-                        if (lockLoc != null){
-                            shelfInfo = minIndexShelf;
+                        //这里判断是否有未绑定过的料架
+                        boolean hasEmptyShelf = false;
+                        for (String rfid : rfidList) {
+                            ShelfInfo shelf = findShelfByRealRfid(rfid);
+                            if(shelf == null){
+                                hasEmptyShelf = true;
+                                break;
+                            }
+                        }
+
+                        if(hasEmptyShelf){
+                            lockLoc = minIndexShelf.lockOneEmptyLoc(task);
+                            if (lockLoc != null){
+                                shelfInfo = minIndexShelf;
+                            }
                         }
                     }
                 }