BUG调整

(cherry picked from commit 362e7fa)

src/com/uas/mes/pda/service/impl/PdaSpmServiceImpl.java

@@ -66,7 +66,7 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
         Object spb_status = spmBarcode.get("SPB_STATUS");
         Double rewarmingTime = (NumberUtil.isEmpty(spmBarcode.get("REWARMINGTIME")) ? 0.0 : Double.valueOf(spmBarcode.get("REWARMINGTIME").toString()));
         if(StringUtil.hasText(spb_status)){
-            if(!spb_status.equals("出库回温")||!spb_status.equals("已搅拌")){
+            if(!spb_status.equals("出库回温")&&!spb_status.equals("已搅拌")){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+"状态为:"+spb_status+",不允许开盖！");
             }else if (rewarmingTime < data){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+",当前已回温: "+rewarmingTime+" 小时,回温时长不足"+data+"小时，不允许开盖！");