|
@@ -212,8 +212,8 @@ public function getWorkOrdersByMonth()
|
|
|
|
|
|
|
|
$list = \think\Db::table('工单_基本资料')
|
|
$list = \think\Db::table('工单_基本资料')
|
|
|
->alias('g')
|
|
->alias('g')
|
|
|
- ->leftJoin([$productSub => 'p'], 'g.订单编号 = p.订单编号')
|
|
|
|
|
- ->leftJoin([$stockSub => 's'], 'g.订单编号 = s.order_id')
|
|
|
|
|
|
|
+ ->Join([$productSub => 'p'], 'g.订单编号 = p.订单编号')
|
|
|
|
|
+ ->Join([$stockSub => 's'], 'g.订单编号 = s.order_id')
|
|
|
->where([
|
|
->where([
|
|
|
['g.落货日期', '>=', $start],
|
|
['g.落货日期', '>=', $start],
|
|
|
['g.落货日期', '<', $end],
|
|
['g.落货日期', '<', $end],
|
