Merge remote-tracking branch 'origin/fyy' into fyy

app/Service/FyySqlServerService.php

@@ -522,6 +522,7 @@ class FyySqlServerService extends Service
         $message = $this->db->table('DispatchList as a')
             ->leftJoin('DispatchLists as b','b.DLID','a.DLID')
             ->where('a.cSOcode',$order_number)
+            ->whereNotNull('a.cVerifier')
             ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity')
             ->select('a.DLID as id','a.cDefine10 as customer_name','a.cSOCode','a.cDepCode as cdepcode','b.iDLsID as idlsid','b.cWhCode as cwhcode','b.cInvCode as cinvcode','b.cInvName as product_title','b.cFree1 as cfree1','b.cFree2 as cfree2','b.cPosition as cposition','b.cBatch as cbatch','b.iQuantity as iquantity','b.iNum as inum','b.iInvExchRate as iinvexchrate','b.fOutQuantity as out_quantity','b.iUnitPrice as iunitcost','b.iMoney as imoney')
             ->get()->toArray();