包装仓的分盘料和紧急料放到同一个架子上

包装仓料架虚拟RFID不重复

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

@@ -263,6 +263,11 @@ public class InquiryShelfBean {
     }
     }
 
 
     /**
     /**
+     * 包装料架累计inex
+     */
+    private static int A_SHEFL_INDEX = 0;
+
+    /**
      * 获取未达最大数量的料架,或者添加一个新的料架
      * 获取未达最大数量的料架,或者添加一个新的料架
      * @param shelfType
      * @param shelfType
      * @return
      * @return
@@ -292,6 +297,11 @@ public class InquiryShelfBean {
         ShelfInfo newShelf = null;
         ShelfInfo newShelf = null;
         if(StorageConstants.SHEFL_TYPE.isAShelf(shelfType)){
         if(StorageConstants.SHEFL_TYPE.isAShelf(shelfType)){
             newShelf = ShelfInfo.newAShelf();
             newShelf = ShelfInfo.newAShelf();
+            A_SHEFL_INDEX = A_SHEFL_INDEX + 1;
+            if(A_SHEFL_INDEX >= Integer.MAX_VALUE - 1){
+                A_SHEFL_INDEX = 0;
+            }
+            rfidIndex = A_SHEFL_INDEX;
         }else if(StorageConstants.SHEFL_TYPE.isBShelf(shelfType)){
         }else if(StorageConstants.SHEFL_TYPE.isBShelf(shelfType)){
             newShelf = ShelfInfo.newBShelf();
             newShelf = ShelfInfo.newBShelf();
         }if(StorageConstants.SHEFL_TYPE.isCShelf(shelfType)){
         }if(StorageConstants.SHEFL_TYPE.isCShelf(shelfType)){
@@ -332,6 +342,10 @@ public class InquiryShelfBean {
         }else if(task.isCutReel()){
         }else if(task.isCutReel()){
             //分盘料放在同一个料串或包装料架上,需求单号使用2
             //分盘料放在同一个料串或包装料架上,需求单号使用2
             hSerial = CUT_SHELF_MAP_KEY;
             hSerial = CUT_SHELF_MAP_KEY;
+            if(task.isPackageReel()){
+                //包装料的分盘料也放在紧急料的料串上
+                hSerial = InquiryShelfBean.URGENT_SHELF_MAP_KEY;
+            }
         }
         }
 
 
         ShelfInfo emptyShelfInfo = getOrAddShelfInfo(hSerial,shelfType,outItem.gethSerial());
         ShelfInfo emptyShelfInfo = getOrAddShelfInfo(hSerial,shelfType,outItem.gethSerial());

myproject/src/main/java/com/myproject/bean/update/DataLog.java

@@ -592,6 +592,10 @@ public class DataLog extends BaseMongoBean /*implements Comparable<DataLog>*/ {
         }else if(isCutReel()){
         }else if(isCutReel()){
             //分盘料放在同一个料串或包装料架上,需求单号使用2
             //分盘料放在同一个料串或包装料架上,需求单号使用2
             shelfMapKey = InquiryShelfBean.CUT_SHELF_MAP_KEY;
             shelfMapKey = InquiryShelfBean.CUT_SHELF_MAP_KEY;
+            if(isPackageReel()){
+                //包装料的分盘料也放在紧急料的料串上
+                shelfMapKey = InquiryShelfBean.URGENT_SHELF_MAP_KEY;
+            }
         }else if(isLessSendReel()){
         }else if(isLessSendReel()){
             //shelfMapKey = "3";
             //shelfMapKey = "3";
         }
         }

myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp

@@ -315,9 +315,9 @@
                 });
                 });
             }
             }
 
 
-            jQuery(".alarmItem").pulsate({
-                color: "#bf1c56"
-            });
+            // jQuery(".alarmItem").pulsate({
+            //     color: "#bf1c56"
+            // });
 
 
         </script>
         </script>
     </c:set>
     </c:set>
\ No newline at end of file

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -12,6 +12,24 @@
 <div class="row">
 <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
         <ul class="timeline">
         <ul class="timeline">
+            <li class="timeline-green">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">07-13</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023071310</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>包装仓的分盘料和紧急料放到同一个架子上</li>
+                            <li>包装仓料架虚拟RFID不重复</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-blue">
             <li class="timeline-blue">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2023</span>
                     <span class="date">2023</span>

myproject/src/main/webapp/decorators/metro.jsp

@@ -239,7 +239,7 @@
   <div class="page-footer-inner">
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: V2023070413</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023071310</span>
   <div class="scroll-to-top">
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
     <i class="icon-arrow-up"></i>
   </div>
   </div>