mainId

app-ghs/controllers/StatController.php

@@ -32,7 +32,9 @@ class StatController extends BaseController
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
-            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
+            $start = date("Y-m-d H:i:s", strtotime($period['startTime']));
+            $end = date("Y-m-d H:i:s", strtotime($period['endTime']));
+            $where['addTime'] = ['between', [$start, $end]];
         }
         $wastageList = StockWastageOrderItemClass::getAllByCondition($where, null, '*', null, true);
         $stat = [];

biz-ghs/order/classes/StockWastageOrderClass.php

@@ -84,7 +84,10 @@ class StockWastageOrderClass extends BaseClass
         }
         //写入详情表
         $batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
-        StockWastageOrderItemClass::batchAddOrderItem($batchData);
+        foreach ($batchData as $currentItem) {
+            $currentItem['mainId'] = $mainId;
+            StockWastageOrderItemClass::add($currentItem);
+        }
         $orderData = self::getOrderDetail($orderSn, $mainId);
         $orderData['shopId'] = $data['shopId'];
         $orderData['relateName'] = $data['shopAdminName'] ?? '';

console/controllers/WastController.php

@@ -21,6 +21,7 @@ class WastController extends Controller
                 $orderSn = $item->orderSn ?? '';
                 $addTime = $item->addTime ?? '';
                 $totalNum = 0;
+                $mainId = $item->mainId ?? 0;
                 $productList = StockWastageOrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
                 if (!empty($productList)) {
                     foreach ($productList as $product) {
@@ -35,6 +36,7 @@ class WastController extends Controller
                         $name = $arr['itemName'] ?? '';
                         $cover = $arr['itemCover'] ?? '';
                         $product->name = $name;
+                        $product->mainId = $mainId;
                         $product->cover = $cover;
                         $product->addTime = $addTime;
                         $product->save();