|
|
@@ -11,17 +11,19 @@ use common\components\orderSn;
|
|
|
use common\components\util;
|
|
|
use common\services\xhItemService;
|
|
|
use Yii;
|
|
|
+
|
|
|
+//采购单 lqh 2021.1.20
|
|
|
class PurchaseOrderClass extends BaseClass
|
|
|
{
|
|
|
- public static $baseFile = '\bizGhs\order\models\PurchaseOrder';
|
|
|
|
|
|
+ public static $baseFile = '\bizGhs\order\models\PurchaseOrder';
|
|
|
|
|
|
const PURCHASE_ORDER_STATUS_WAIT = 1; //待确认
|
|
|
const PURCHASE_ORDER_STATUS_UN_SEND = 2; //待配送
|
|
|
const PURCHASE_ORDER_STATUS_SENDING = 3; //配送中
|
|
|
const PURCHASE_ORDER_STATUS_COMPLETE = 4; //已完成
|
|
|
|
|
|
-
|
|
|
+ //添加采购单 lqh 2021.1.19
|
|
|
public static function addOrder($data)
|
|
|
{
|
|
|
|
|
|
@@ -126,17 +128,16 @@ class PurchaseOrderClass extends BaseClass
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+ //采购单列表 lqh 2021.1.19
|
|
|
public static function getOrderList($where)
|
|
|
{
|
|
|
$data = self::getList('*', $where, 'addTime DESC');
|
|
|
- $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
|
|
|
- if (empty($list)) {
|
|
|
- return $data;
|
|
|
- }
|
|
|
+ $list = $data['list'] ?? [];
|
|
|
$data['list'] = self::groupOrder($list);
|
|
|
return $data;
|
|
|
}
|
|
|
|
|
|
+ //整合采购单员工、供货商信息 lqh 2021.1.19
|
|
|
public static function groupOrder($list){
|
|
|
if(empty($list)){
|
|
|
return $list;
|
|
|
@@ -159,7 +160,7 @@ class PurchaseOrderClass extends BaseClass
|
|
|
return $list;
|
|
|
}
|
|
|
|
|
|
- //增加供应商信息
|
|
|
+ //增加供应商信息 lqh 2021.1.19
|
|
|
public static function groupSupplierInfo($list){
|
|
|
foreach ($list as $k=>$v){
|
|
|
$supplierId = $v['supplierId'];
|