采购

app-hd/controllers/PxApplyController.php

@@ -44,7 +44,7 @@ class PxApplyController extends BaseController
     //新学员 学员管理 ssh 2021.3.17
     public function actionList()
     {
-        $where = ['shopId' => $this->shopId];
+        $where = ['shopId' => $this->shopId, 'status' => PxApplyClass::STATUS_CONFIRM];
         $respond = PxApplyClass::getApplyList($where);
         util::success($respond);
     }

biz-hd/px/classes/PxApplyClass.php

@@ -18,7 +18,9 @@ class PxApplyClass extends BaseClass
 
     public static $baseFile = '\bizHd\px\models\PxApply';
 
+    //待付款
     const  STATUS_UN_CONFIRM = 1;
+    //已付款
     const  STATUS_CONFIRM = 2;
 
     //培训报名 ssh 2021.3.17

sql.sql

@@ -2404,3 +2404,6 @@ ALTER TABLE xhCustom ADD UNIQUE INDEX custom(`shopId`,`userId`);
 ALTER TABLE `xhPurchaseItem`
 ADD COLUMN `ghsProductId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '供货商的productId' AFTER `itemInfo`;
 
+------shish 20210509
+ALTER TABLE xhPurchaseClear MODIFY `purchaseIds` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '结算的采购单id，json串';
+ALTER TABLE xhPurchaseClear ADD saleIds  VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '结算的销售单id，json串' AFTER `purchaseIds`;