Merge branch 'master' into dev

app-ghs/controllers/PurchaseController.php

@@ -3,10 +3,8 @@
 namespace ghs\controllers;
 
 use biz\ghs\classes\GhsClass;
-use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\order\services\PurchaseOrderService;
-use bizGhs\product\classes\ProductClass;
 use bizHd\purchase\classes\PurchaseClass;
 use common\components\dateUtil;
 use common\components\util;
@@ -43,30 +41,7 @@ class PurchaseController extends BaseController
         util::success(['salt' => $salt]);
     }
 
-    // 批发商开单限购花材信息
-    public function actionLimitBuyInfo()
-    {
-        $post = Yii::$app->request->post();
-        $customId = $post['customId'] ?? 0;
-        $list = $post['list'] ?? [];
-        if (empty($customId)) {
-            util::fail('缺少客户');
-        }
-        if (empty($list) || !is_array($list)) {
-            util::fail('请选择花材');
-        }
-
-        $custom = CustomClass::getCustom($customId);
-        if (empty($custom)) {
-            util::fail('没有找到客户');
-        }
-        CustomClass::valid($custom, $this->shopId);
-
-        $respond = ProductClass::getLimitBuyInfoByList($list, $customId);
-        util::success($respond);
-    }
-
-    //待结款明细 ssh 2021.1.26
+    // 采购挂账明细：searchTime 筛账单时间 entryTime，sendSearchTime 筛发货时间 sendTime
     public function actionDebtList()
     {
         $get = Yii::$app->request->get();
@@ -79,6 +54,7 @@ class PurchaseController extends BaseController
         if ($confirm > -1) {
             $where['confirm'] = $confirm;
         }
+        // 账单时间：采购入库单按入库日 entryTime（没有销售单那种 payTime）
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';
@@ -86,6 +62,14 @@ class PurchaseController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['entryTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
+        // 发货时间：按 sendTime，可与账单时间同时生效
+        $sendSearchTime = $get['sendSearchTime'] ?? '';
+        if (!empty($sendSearchTime)) {
+            $sendStartTime = $get['sendStartTime'] ?? '';
+            $sendEndTime = $get['sendEndTime'] ?? '';
+            $sendPeriod = dateUtil::formatTime($sendSearchTime, $sendStartTime, $sendEndTime);
+            $where['sendTime'] = ['between', [$sendPeriod['startTime'], $sendPeriod['endTime']]];
+        }
         if (!empty($shortOrderSn)) {
             $where['orderSn'] = ['like', $shortOrderSn];
         }
@@ -138,4 +122,4 @@ class PurchaseController extends BaseController
         util::complete('确认成功');
     }
 
-}
+}

app-ghs/controllers/PurchaseOrderController.php

@@ -683,7 +683,7 @@ class PurchaseOrderController extends BaseController
         }
     }
 
-    //订单列表
+    // 采购入库单列表：searchTime 筛账单时间 entryTime，sendSearchTime 筛发货时间 sendTime
     public function actionList()
     {
         $where = [];
@@ -718,6 +718,7 @@ class PurchaseOrderController extends BaseController
                 $where['ghsName'] = ['like', $search];
             }
         }
+        // 账单时间：采购入库单按入库日 entryTime（没有销售单那种 payTime）
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';
@@ -725,6 +726,14 @@ class PurchaseOrderController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['entryTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
+        // 发货时间：按 sendTime，可与账单时间同时生效
+        $sendSearchTime = $get['sendSearchTime'] ?? '';
+        if (!empty($sendSearchTime)) {
+            $sendStartTime = $get['sendStartTime'] ?? '';
+            $sendEndTime = $get['sendEndTime'] ?? '';
+            $sendPeriod = dateUtil::formatTime($sendSearchTime, $sendStartTime, $sendEndTime);
+            $where['sendTime'] = ['between', [$sendPeriod['startTime'], $sendPeriod['endTime']]];
+        }
         $cgStaffId = $get['cgStaffId'] ?? 0;
         if (!empty($cgStaffId)) {
             $where['cgStaffId'] = $cgStaffId;

biz-ghs/order/services/PurchaseOrderService.php

@@ -11,7 +11,7 @@ class PurchaseOrderService extends BaseService
 
     public static $baseFile = '\bizGhs\order\classes\PurchaseOrderClass';
 
-    //所有的欠款采购单 ssh 2021.1.26
+    // 采购挂账列表：按发货时间排，同一批发货的单挨在一起；空 sendTime 沉到底
     public static function getDebtList($where)
     {
         $get = Yii::$app->request->get();
@@ -20,7 +20,7 @@ class PurchaseOrderService extends BaseService
             ? (int)$get['pageSize'] : 100;
         $page = max(1, (int)($get['page'] ?? 1));
         Yii::$app->request->setQueryParams(array_merge($get, ['page' => $page, 'pageSize' => $pageSize]));
-        $result = PurchaseOrderClass::getList('*', $where, 'addTime DESC');
+        $result = PurchaseOrderClass::getList('*', $where, 'sendTime DESC, addTime DESC');
         $result['debtNum'] = $result['totalNum'] ?? 0;
         $list = $result['list'] ?? [];
         if (!empty($list)) {