料仓兼容方式修改: 11,13,15完全兼容改为11,13,15兼容,包装仓完全兼容

myproject/src/main/java/com/myproject/manager/impl/StoragePosManagerImpl.java

@@ -155,12 +155,18 @@ public class StoragePosManagerImpl implements IStoragePosManager {
             c = c.and("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight());
             c = c.and("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight());
         }else if(compatibleType == StorageConstants.COMPATIBLE_TYPE.FULLY_COMPATIBLE){//同厚度兼容
         }else if(compatibleType == StorageConstants.COMPATIBLE_TYPE.FULLY_COMPATIBLE){//同厚度兼容
             //c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//宽度大于等于料盘宽度,高度大于等于料盘高度
             //c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//宽度大于等于料盘宽度,高度大于等于料盘高度
+            if(storage.isPackage()){
+                //包装仓完全兼容
+                c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//除7寸外,完全兼容
+            }else{
                 if(barcode.getPlateSize() != 7){
                 if(barcode.getPlateSize() != 7){
                     c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//除7寸外,完全兼容
                     c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//除7寸外,完全兼容
                 }else{
                 }else{
                     //=7寸使用同尺寸兼容
                     //=7寸使用同尺寸兼容
                     c = c.and("w").is(barcode.getPlateSize()).and("h").gte(barcode.getHeight());
                     c = c.and("w").is(barcode.getPlateSize()).and("h").gte(barcode.getHeight());
                 }
                 }
+            }
+
 
 
         }else if(compatibleType == StorageConstants.COMPATIBLE_TYPE.SIZE_COMPATIBLE){//同尺寸兼容
         }else if(compatibleType == StorageConstants.COMPATIBLE_TYPE.SIZE_COMPATIBLE){//同尺寸兼容
             c = c.and("w").is(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//宽度等于料盘宽度,高度大于等于料盘高度
             c = c.and("w").is(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//宽度等于料盘宽度,高度大于等于料盘高度

myproject/src/main/java/com/myproject/util/StorageConstants.java

@@ -531,7 +531,7 @@ public class StorageConstants {
         /**
         /**
          * 完全兼容
          * 完全兼容
          */
          */
-        FULLY_COMPATIBLE("11,13,15完全兼容"),
+        FULLY_COMPATIBLE("11,13,15兼容,包装仓完全兼容"),
         /**
         /**
          * 同尺寸兼容
          * 同尺寸兼容
          */
          */

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

@@ -12,6 +12,42 @@
 <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">03-21</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023032111</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>料仓兼容方式修改: 11,13,15完全兼容改为11,13,15兼容,包装仓完全兼容</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+
+            <li class="timeline-blue">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">03-17</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023031715</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>接口地址由http://10.85.17.233改为http://10.85.71.25:8080</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+
             <li class="timeline-yellow">
             <li class="timeline-yellow">
                 <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

@@ -215,7 +215,7 @@
       <!-- DOC: Set data-keep-expand="true" to keep the submenues expanded -->
       <!-- DOC: Set data-keep-expand="true" to keep the submenues expanded -->
       <!-- DOC: Set data-auto-speed="200" to adjust the sub menu slide up/down speed -->
       <!-- DOC: Set data-auto-speed="200" to adjust the sub menu slide up/down speed -->
 
 
-      <%@ include file="/common/metroMenu.jsp"%>
+<%--      <%@ include file="/common/metroMenu.jsp"%>--%>
       <!-- END SIDEBAR MENU -->
       <!-- END SIDEBAR MENU -->
     </div>
     </div>
   </div>
   </div>
@@ -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: V2023031714</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023032111</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>