Merge branch 'master' into yang-package

app/OracleDOCASNHeader.php

@@ -29,6 +29,6 @@ class OracleDOCASNHeader extends Model
     public function asnDetails()
     {
         return $this->hasMany(OracleDOCASNDetail::class,'asnno','asnno')
-            ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','receivedqty','expectedqty','addtime','edittime');
+            ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','receivedqty','receivedqty_each','expectedqty','addtime','edittime');
     }
 }

app/Services/HandInStorageService.php

@@ -618,11 +618,10 @@ sql;
                 $asnDetail['customerid'] == $info['customerid'] &&
                 $asnDetail['sku'] == $info['sku'] ){
                 $receiveAsn = $asnDetail;
-                break;
             }
         }
 
-        if (!$receiveAsn) return true;
+        if (!$receiveAsn) return false;
 
         $receivedQty = (int)($receiveAsn['receivedqty']??$receiveAsn['receivedqty_each']);  // 已收货数量
         $amount = (int) $info['amount'];                    // 当前收货数量