|
|
@@ -148,7 +148,7 @@ class TestController extends Controller
|
|
|
$sql = <<<sql
|
|
|
SELECT DATE_FORMAT(order_packages.created_at,'%Y-%m-%d') date,
|
|
|
SUM(CASE WHEN order_packages.weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
|
|
|
-COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id WHERE orders.wms_status != '订单取消'
|
|
|
+COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id WHERE orders.wms_status != '订单取消'
|
|
|
AND order_packages.created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
|
|
|
sql;
|
|
|
$result = DB::selectOne(DB::raw($sql));
|
|
|
@@ -1541,7 +1541,7 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
|
|
|
{
|
|
|
$oracleDOCOrderHeaderService = new OracleDOCOrderHeaderService();
|
|
|
$orderService = new OrderService();
|
|
|
- $waveNos = ['W210218000155','W210218000154'];
|
|
|
+ $waveNos = ['W210218000152','W210218000153'];
|
|
|
$orderHeaders = OracleDOCOrderHeader::query()
|
|
|
->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
|
|
|
->whereIn('WaveNo',$waveNos)
|
LD