花材列表

app-ghs/controllers/ProductController.php

@@ -189,37 +189,37 @@ class ProductController extends BaseController
             $itemInfoData = ProductClass::changePriceGroup($itemInfoData, $level);
         } elseif ($requestType == 'kd') {
             //开单的花材列表
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,stock,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio';
+            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::kdItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'itemList') {
             //花材列表
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,stock,actualSold,stockWarning,status,presell';
+            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,discountPrice,stock,actualSold,stockWarning,status,presell';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
         } elseif ($requestType == 'check') {
             //盘点花材列表
-            $field = 'id,py,cover,name,itemId,classId,variety,price,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
+            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::checkItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'break') {
             //报损花材
-            $field = 'id,py,cover,name,itemId,classId,variety,price,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
+            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::breakItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'stockOut') {
             //出库花材
-            $field = 'id,py,cover,name,itemId,classId,variety,price,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
+            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::stockOutGroup($itemInfoData, $level);
         } elseif ($requestType == 'cg') {
             //采购花材
-            $field = 'id,py,cover,name,itemId,classId,variety,price,stock,presell,ratioType,smallUnit,bigUnit,ratio';
+            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,presell,ratioType,smallUnit,bigUnit,ratio';
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::cgItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'warning') {
             //库存预警
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,stock,presell,stockWarning';
+            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,discountPrice,stock,presell,stockWarning';
             $itemInfoData = Product::find()->where("mainId={$this->mainId}")
                 ->andWhere('`stock`<`stockWarning`')
                 ->andWhere("delStatus=0")