shish 3 年 前
コミット
b2aefe909f
1 ファイル変更2 行追加2 行削除
  1. 2 2
      app-ghs/controllers/ProductController.php

+ 2 - 2
app-ghs/controllers/ProductController.php

@@ -211,13 +211,13 @@ class ProductController extends BaseController
 
 
         if ($warning == 1) {
         if ($warning == 1) {
             //库存预警
             //库存预警
-            $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
+            $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
             $itemInfoData = Product::find()->where("mainId={$this->mainId}")
             $itemInfoData = Product::find()->where("mainId={$this->mainId}")
                 ->andWhere('`stock`<`stockWarning`')
                 ->andWhere('`stock`<`stockWarning`')
                 ->andWhere("delStatus=0")
                 ->andWhere("delStatus=0")
                 ->select($field)->asArray()->all();
                 ->select($field)->asArray()->all();
         } else {
         } else {
-            $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,presellDate,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
+            $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
         }
         }
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);