|
@@ -110,7 +110,7 @@ class ProductController extends BaseController
|
|
|
}
|
|
}
|
|
|
$p = new printUtil($printLabelSn);
|
|
$p = new printUtil($printLabelSn);
|
|
|
$unit = $info->ratio . $info->smallUnit . '/' . $info->bigUnit;
|
|
$unit = $info->ratio . $info->smallUnit . '/' . $info->bigUnit;
|
|
|
- if(isset($info->ratioType) && $info->ratioType == 1){
|
|
|
|
|
|
|
+ if (isset($info->ratioType) && $info->ratioType == 1) {
|
|
|
$unit = '若干' . $info->smallUnit . '/' . $info->bigUnit;
|
|
$unit = '若干' . $info->smallUnit . '/' . $info->bigUnit;
|
|
|
}
|
|
}
|
|
|
$p->times = $num;
|
|
$p->times = $num;
|
|
@@ -232,7 +232,12 @@ class ProductController extends BaseController
|
|
|
$itemInfoData = ProductClass::kdItemGroup($itemInfoData, $level);
|
|
$itemInfoData = ProductClass::kdItemGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'itemList') {
|
|
} elseif ($requestType == 'itemList') {
|
|
|
//花材列表
|
|
//花材列表
|
|
|
- $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,stock,actualSold,stockWarning,status,presell,frontHide';
|
|
|
|
|
|
|
+ if (in_array($this->mainId, [52, 1459, 2126, 2128])) {
|
|
|
|
|
+ //惠雅鲜花的不列出frontHide字段,因为他花材太多很慢了
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,stock,actualSold,stockWarning,status,presell';
|
|
|
|
|
+ } else {
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,stock,actualSold,stockWarning,status,presell,frontHide';
|
|
|
|
|
+ }
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
$itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
|
|
$itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'outList') {
|
|
} elseif ($requestType == 'outList') {
|