获取库位接口增加料盘尺寸信息返回

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

@@ -279,9 +279,9 @@ public class InquiryShelfBean {
                             return shelfInfo;
                             return shelfInfo;
                         }else{
                         }else{
                             //不是包装仓的分盘料或紧急料,使用同一个料架;包装料架按需求单号进行区分
                             //不是包装仓的分盘料或紧急料,使用同一个料架;包装料架按需求单号进行区分
-                            if(!shelfInfo.isAShelf()){
+                            //if(!shelfInfo.isAShelf()){
                                 return shelfInfo;
                                 return shelfInfo;
-                            }
+                            //}
                         }
                         }
                     }
                     }
                 }
                 }

myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java

@@ -639,6 +639,9 @@ public class StorageDataController extends BaseController {
                                         resultMap.put("pos",dataLog.getPosName());
                                         resultMap.put("pos",dataLog.getPosName());
                                         resultMap.put("barcode",barcode.getBarcode());
                                         resultMap.put("barcode",barcode.getBarcode());
                                         resultMap.put("cid",dataLog.getCid());
                                         resultMap.put("cid",dataLog.getCid());
+
+                                        resultMap.put("plateW",dataLog.getW());
+                                        resultMap.put("plateH",dataLog.getH());
                                         return resultMap;
                                         return resultMap;
                                     }
                                     }
 
 
@@ -735,6 +738,8 @@ public class StorageDataController extends BaseController {
                             resultMap.put("pos",reelLocInfo.getLockPosName());
                             resultMap.put("pos",reelLocInfo.getLockPosName());
                             resultMap.put("barcode",reelLocInfo.getBarcode());
                             resultMap.put("barcode",reelLocInfo.getBarcode());
                             resultMap.put("cid",reelLocInfo.getCid());
                             resultMap.put("cid",reelLocInfo.getCid());
+                            resultMap.put("plateW",barcode.getPlateSize());
+                            resultMap.put("plateH",barcode.getHeight());
                         }
                         }
 
 
                     }else{
                     }else{

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

@@ -12,7 +12,23 @@
 <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-blue">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">06-01</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023060115</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>获取库位接口增加料盘尺寸信息返回</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

@@ -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: V2023041415</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023060115</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>