|
|
@@ -214,11 +214,9 @@ public function getWorkOrdersByMonth()
|
|
|
->alias('g')
|
|
|
->Join([$productSub => 'p'], 'g.订单编号 = p.订单编号')
|
|
|
->Join([$stockSub => 's'], 'g.订单编号 = s.order_id')
|
|
|
- ->where([
|
|
|
- ['g.落货日期', '>=', $start],
|
|
|
- ['g.落货日期', '<', $end],
|
|
|
- ['g.Mod_rq', 'null'],
|
|
|
- ])
|
|
|
+ ->where('g.落货日期', '>=', $start)
|
|
|
+ ->where('g.落货日期', '<', $end)
|
|
|
+ ->whereNull('g.Mod_rq')
|
|
|
->field([
|
|
|
'g.Uniqid',
|
|
|
'g.订单编号',
|