Fixed: 从流水线进入料仓验证失败导致物料一直在流水线上空转的问题

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

@@ -221,7 +221,10 @@ public class TaskService implements ITaskService {
             opBarcode = barcodeSave.getBarcode();
             opBarcode = barcodeSave.getBarcode();
             //入库时的RFID
             //入库时的RFID
             String inRFID = statusBean.getInRfid();
             String inRFID = statusBean.getInRfid();
-            verifyBarcodePutIn(Lists.newArrayList(storage),barcodeSave,inRFID);
+            String posName = statusBean.getFromData("inPos");
+            //如果指定库位入库, 那么就不需要再次调用佳世达接口验证
+            boolean towerCheck = !Strings.isNullOrEmpty(posName);
+            verifyBarcodePutIn(Lists.newArrayList(storage),barcodeSave,inRFID,towerCheck);
 
 
             int w = barcodeSave.getPlateSize();
             int w = barcodeSave.getPlateSize();
             int h = barcodeSave.getHeight();
             int h = barcodeSave.getHeight();
@@ -251,7 +254,7 @@ public class TaskService implements ITaskService {
                 log.info(barcodeSave.getBarcode() + " 已有任务,返回任务中的库位:" + executingTask.getPosName());
                 log.info(barcodeSave.getBarcode() + " 已有任务,返回任务中的库位:" + executingTask.getPosName());
                 storagePos = storagePosManager.get(posId);
                 storagePos = storagePosManager.get(posId);
             }else{
             }else{
-                String posName = statusBean.getFromData("inPos");
+
                 if(!Strings.isNullOrEmpty(posName)){
                 if(!Strings.isNullOrEmpty(posName)){
                     log.info(barcodeSave.getBarcode() + "指定入库到" + posName);
                     log.info(barcodeSave.getBarcode() + "指定入库到" + posName);
 
 
@@ -343,10 +346,16 @@ public class TaskService implements ITaskService {
     }
     }
 
 
 
 
+    private Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave, String inRFID) throws ValidateException{
+        boolean towerCheck = false;
+        return verifyBarcodePutIn(storageList,barcodeSave,inRFID,towerCheck);
+    }
+
     /**
     /**
      * 检查二维码是否合法并且可以入库,没问题的话存入到数据库
      * 检查二维码是否合法并且可以入库,没问题的话存入到数据库
+     * towerCheck 表示是否是料仓定时任务验证, 如果是料仓定时任务验证说明在料串上扫码的时候已经验证过,这里就不再到佳世达验证了
      */
      */
-    private Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave, String inRFID) throws ValidateException {
+    private Barcode verifyBarcodePutIn(List<Storage> storageList, Barcode barcodeSave, String inRFID, boolean towerCheck) throws ValidateException {
 
 
         if(barcodeSave == null){
         if(barcodeSave == null){
             throw new ValidateException("条码无效");
             throw new ValidateException("条码无效");
@@ -395,6 +404,13 @@ public class TaskService implements ITaskService {
         }
         }
 
 
         AppendInfo appendInfo = barcodeSave.getAppendInfo();
         AppendInfo appendInfo = barcodeSave.getAppendInfo();
+
+        String oldRfid = appendInfo.getRfid();
+        if(towerCheck && !oldRfid.isEmpty() && oldRfid.equals(inRFID)){
+            //如果保存的RFID与本次验证的RFID是同一个,
+            return barcodeSave;
+        }
+
         String oldDnNo = appendInfo.getDnNo();
         String oldDnNo = appendInfo.getDnNo();
 
 
 //        if(Strings.isNullOrEmpty(oldDnNo)){
 //        if(Strings.isNullOrEmpty(oldDnNo)){

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

@@ -12,6 +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-grey">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">11-28</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023112816</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            Fixed: 从流水线进入料仓验证失败导致物料一直在流水线上空转的问题
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-purple">
             <li class="timeline-purple">
                 <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: V2023111416</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023112816</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>