三楼线外发分盘料时不对已绑定的料进行解绑

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

 package com.myproject.bean.qisda;
 package com.myproject.bean.qisda;
 
 
+import org.apache.logging.log4j.util.Strings;
+
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
@@ -23,6 +25,11 @@ public class DeviceAlarmMsgBean {
 
 
     private String name;
     private String name;
 
 
+    /**
+     * 设备名称
+     */
+    private String device;
+
     private String msgKey;
     private String msgKey;
 
 
     private String msgValue;
     private String msgValue;
@@ -93,4 +100,15 @@ public class DeviceAlarmMsgBean {
     public boolean isInfoMsg(){
     public boolean isInfoMsg(){
         return type == 1;
         return type == 1;
     }
     }
+
+    public String getDevice() {
+        if(Strings.isBlank(device)){
+            return name;
+        }
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
 }
 }

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

@@ -340,25 +340,27 @@ public class QisdaApiController extends BaseController {
                 int realBindQty = cutOutItem.getRealLockQty() + outSendQty;
                 int realBindQty = cutOutItem.getRealLockQty() + outSendQty;
 
 
                 if(cutOutItem.isCutMaterial()){
                 if(cutOutItem.isCutMaterial()){
-                    OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(soseq);
-                    cutOutInfo = outInfoCache.addEventItem(cutOutInfo,"线外发料,解绑站位["+slotserial+"]");
-                    soseqCache.addTotalOutInfo(cutOutInfo);
-
-                    //分盘料线外发料,全部分盘料进行解绑
-                    List<StoragePos> bindPosList = storagePosDao.findBindList(soseq, Integer.valueOf(slotserial));
-                    for (StoragePos storagePos : bindPosList) {
-                        Barcode barcode = storagePos.getBarcode();
-                        boolean hasTask = taskService.excludePosIds().contains(storagePos.getId());
-                        if(hasTask){
-                            log.info(barcode.getBarcode() + "["+storagePos.getPosName()+"]已有任务,不解绑");
-                        }else{
-                            log.info(reelid+"["+pn+"]线外发料,解除["+barcode.getBarcode()+"]的工单so=["+barcode.getAppendInfo().getSo()+"]soseq=["+barcode.getAppendInfo().getSoseq()+"]的站位["+slotserial+"]绑定");
-                            storagePosDao.unbindReel(storagePos);
-                        }
+                    if(DataCache.isProductionFor(DataCache.CUSTOMER.QISDA4D)){
+                        //四楼线外发分盘料对已绑定的分盘料解绑,三楼不解绑
+                        OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(soseq);
+                        cutOutInfo = outInfoCache.addEventItem(cutOutInfo,"线外发料,解绑站位["+slotserial+"]");
+                        soseqCache.addTotalOutInfo(cutOutInfo);
 
 
-                    }
-                    realBindQty = cutOutItem.getRealLockQty() + cutOutItem.getQty();
+                        //分盘料线外发料,全部分盘料进行解绑
+                        List<StoragePos> bindPosList = storagePosDao.findBindList(soseq, Integer.valueOf(slotserial));
+                        for (StoragePos storagePos : bindPosList) {
+                            Barcode barcode = storagePos.getBarcode();
+                            boolean hasTask = taskService.excludePosIds().contains(storagePos.getId());
+                            if(hasTask){
+                                log.info(barcode.getBarcode() + "["+storagePos.getPosName()+"]已有任务,不解绑");
+                            }else{
+                                log.info(reelid+"["+pn+"]线外发料,解除["+barcode.getBarcode()+"]的工单so=["+barcode.getAppendInfo().getSo()+"]soseq=["+barcode.getAppendInfo().getSoseq()+"]的站位["+slotserial+"]绑定");
+                                storagePosDao.unbindReel(storagePos);
+                            }
 
 
+                        }
+                        realBindQty = cutOutItem.getRealLockQty() + cutOutItem.getQty();
+                    }
                 }
                 }
                 //更新发料数量,更新真实绑定数量
                 //更新发料数量,更新真实绑定数量
                 soseqCache.addToTotalSendQty(cutOutItem,outSendQty);
                 soseqCache.addToTotalSendQty(cutOutItem,outSendQty);

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

@@ -15,6 +15,23 @@
             <li class="timeline-blue">
             <li class="timeline-blue">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2021</span>
                     <span class="date">2021</span>
+                    <span class="time">10-13</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2021101310</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>三楼线外发分盘料时不对已绑定的料进行解绑</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+            <li class="timeline-blue">
+                <div class="timeline-time">
+                    <span class="date">2021</span>
                     <span class="time">09-09</span>
                     <span class="time">09-09</span>
                 </div>
                 </div>
                 <div class="timeline-icon">
                 <div class="timeline-icon">

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