Browse Source

入库订单

shish 2 years ago
parent
commit
c9ba4e8dcb
1 changed files with 40 additions and 57 deletions
  1. 40 57
      biz-ghs/order/classes/PurchaseOrderClass.php

+ 40 - 57
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -472,8 +472,8 @@ class PurchaseOrderClass extends BaseClass
             'capitalType' => $capitalType,
             'amount' => $currentPrice,
             'balance' => $ghs->debtAmount,
-            'staffId'=>$cg->shopAdminId,
-            'staffName'=>$cg->shopAdminName,
+            'staffId' => $cg->shopAdminId,
+            'staffName' => $cg->shopAdminName,
             'io' => 1,
             'event' => '新增采购 ' . $orderSn,
             'sjId' => $sjId,
@@ -1313,6 +1313,11 @@ class PurchaseOrderClass extends BaseClass
         }
         foreach ($orderList as $key => $orderInfo) {
             $orderSn = $orderInfo['orderSn'] ?? '';
+            $status = $orderInfo['status'] ?? 0;
+            if ($status != 4) {
+                unset($orderList[$key]);
+                continue;
+            }
             $itemList = $orderItemList[$orderSn] ?? [];
             $orderList[$key]['itemList'] = $itemList;
         }
@@ -1433,67 +1438,45 @@ class PurchaseOrderClass extends BaseClass
         foreach ($orderList as $key => $orderData) {
             $currentList = $orderData['itemList'] ?? [];
             if (!empty($currentList)) {
-                array_unshift($currentList, ['id' => -1]);
                 foreach ($currentList as $k => $orderInfo) {
                     $i = $baseRow + $x;
                     $x++;
-                    if ($orderInfo['id'] == -1) {
-                        $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, $orderData['orderSn']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('B' . $i, $orderData['addTime']);
-                        if ($orderData['status'] == 4) {
-                            $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $orderData['entryTime']);
-                        } else {
-                            $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, '');
-                        }
-                        $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $orderData['orderPrice']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $orderData['tkPrice']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, $orderData['actPrice']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $orderData['ghsName']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $orderData['shopAdminName']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $orderData['cgStaffName']);
-                        $map = [1 => '待确认', 2 => '待发货', 3 => '待入库', 4 => '已入库', 5 => '已取消'];
-                        $statusName = isset($orderData['status']) && isset($map[$orderData['status']]) ? $map[$orderData['status']] : '未知';
-                        $objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $statusName);
-                        $objPHPExcel->getActiveSheet()->setCellValue('K' . $i, $orderData['printNum'] ?? 0);
-                        $debtName = '';
-                        if ($orderData['debt'] == 1) {
-                            $debtName = '未结清';
-                        }
-                        if ($orderData['debt'] == 2) {
-                            $debtName = '已结清';
-                        }
-                        $objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $debtName);
-                        $objPHPExcel->getActiveSheet()->setCellValue('M' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('N' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('O' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('P' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('Q' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('R' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('S' . $i, '');
+
+                    $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, $orderData['orderSn']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('B' . $i, $orderData['addTime']);
+                    if ($orderData['status'] == 4) {
+                        $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $orderData['entryTime']);
                     } else {
-                        $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('B' . $i, '');
                         $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('I' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('J' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('K' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('L' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('M' . $i, '');
-                        $objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('O' . $i, $orderInfo['name']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('P' . $i, $orderInfo['bigPrice']);
-                        $remainNum = bcsub($orderInfo['itemNum'], $orderInfo['refundNum']);
-                        $price = bcmul($remainNum, $orderInfo['bigPrice'], 2);
-                        $price = floatval($price);
-                        $objPHPExcel->getActiveSheet()->setCellValue('Q' . $i, $remainNum);
-                        $objPHPExcel->getActiveSheet()->setCellValue('R' . $i, $orderInfo['refundNum']);
-                        $objPHPExcel->getActiveSheet()->setCellValue('S' . $i, $price);
                     }
+                    $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $orderData['orderPrice']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $orderData['tkPrice']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, $orderData['actPrice']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $orderData['ghsName']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $orderData['shopAdminName']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $orderData['cgStaffName']);
+                    $map = [1 => '待确认', 2 => '待发货', 3 => '待入库', 4 => '已入库', 5 => '已取消'];
+                    $statusName = isset($orderData['status']) && isset($map[$orderData['status']]) ? $map[$orderData['status']] : '未知';
+                    $objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $statusName);
+                    $objPHPExcel->getActiveSheet()->setCellValue('K' . $i, $orderData['printNum'] ?? 0);
+                    $debtName = '';
+                    if ($orderData['debt'] == 1) {
+                        $debtName = '未结清';
+                    }
+                    if ($orderData['debt'] == 2) {
+                        $debtName = '已结清';
+                    }
+                    $objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $debtName);
+                    $objPHPExcel->getActiveSheet()->setCellValue('M' . $i, '');
+                    $objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('O' . $i, $orderInfo['name']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('P' . $i, $orderInfo['bigPrice']);
+                    $remainNum = bcsub($orderInfo['itemNum'], $orderInfo['refundNum']);
+                    $price = bcmul($remainNum, $orderInfo['bigPrice'], 2);
+                    $price = floatval($price);
+                    $objPHPExcel->getActiveSheet()->setCellValue('Q' . $i, $remainNum);
+                    $objPHPExcel->getActiveSheet()->setCellValue('R' . $i, $orderInfo['refundNum']);
+                    $objPHPExcel->getActiveSheet()->setCellValue('S' . $i, $price);
 
                     //居左
                     $objPHPExcel->getActiveSheet()->getStyle('A' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);