Fixed: 绑定分盘料时, 如果料盘已有其他工单绑定信息,绑定数量出错问题修复

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

@@ -256,7 +256,8 @@ public class QisdaBindService {
                         lockQty = outItem.getQty();
                         lockQty = outItem.getQty();
                     }else {
                     }else {
                         //母盘正好用完或全部用完也达不到需求量,此母盘绑定slot后,继续寻找其他盘进行绑定
                         //母盘正好用完或全部用完也达不到需求量,此母盘绑定slot后,继续寻找其他盘进行绑定
-                        lockQty = lockQty + barcode.getAmount();
+                        //reelRemainNum为0表示正好用完满足需求, reelRemainNum为负值时,表示需求还未满足
+                        lockQty = outItem.getQty() + reelRemainNum;
                     }
                     }
                     log.info("\t分盘料["+barcode.getBarcode()+"]绑定到So=["+outItem.getSo()+"]hSerial=["+outItem.getSourceName()+"]数量:" + lockQty +"/" + outItem.getQty());
                     log.info("\t分盘料["+barcode.getBarcode()+"]绑定到So=["+outItem.getSo()+"]hSerial=["+outItem.getSourceName()+"]数量:" + lockQty +"/" + outItem.getQty());
                     if(!barcode.hasCutInfo()){
                     if(!barcode.hasCutInfo()){
@@ -266,6 +267,7 @@ public class QisdaBindService {
                         outItem.setRealLockQty(realLockQty);
                         outItem.setRealLockQty(realLockQty);
 
 
                     }else{
                     }else{
+
                         AppendInfo appendInfo = barcode.getAppendInfo();
                         AppendInfo appendInfo = barcode.getAppendInfo();
                         appendInfo.setSlotIndex(outItem.getSlotlocation());
                         appendInfo.setSlotIndex(outItem.getSlotlocation());
                         appendInfo.setSo(outItem.getSo());
                         appendInfo.setSo(outItem.getSo());

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-green">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">09-25</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023092517</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>Fixed: 绑定分盘料时, 如果料盘已有其他工单绑定信息,绑定数量出错问题修复</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: V2023083110</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023092517</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>