|
@@ -498,8 +498,8 @@ class FyySqlServerService extends Service
|
|
$model = $this->db->table('DispatchList as a')
|
|
$model = $this->db->table('DispatchList as a')
|
|
->leftJoin('DispatchLists as b','b.DLID','a.DLID')
|
|
->leftJoin('DispatchLists as b','b.DLID','a.DLID')
|
|
->leftJoin('Inventory as c','c.cInvCode','b.cInvCode')
|
|
->leftJoin('Inventory as c','c.cInvCode','b.cInvCode')
|
|
- ->whereNotNull('a.cVerifier')
|
|
|
|
- ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity');
|
|
|
|
|
|
+ ->whereNotNull('a.cVerifier');
|
|
|
|
+// ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity');
|
|
|
|
|
|
//检索条件
|
|
//检索条件
|
|
if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
|
|
if(! empty($data['time'][0]) && ! empty($data['time'][1])) {
|