更新

biz-ghs/order/classes/PurchaseOrderItemClass.php

@@ -18,7 +18,7 @@ class PurchaseOrderItemClass extends BaseClass
 
     public static function getOrderItemDetail($orderSn)
     {
-        return self::getAllByCondition(['orderSn'=>$orderSn],null,'*');
+        return self::getAllByCondition(['orderSn' => $orderSn], null, '*');
     }
 
     //导出excel ssh 20241127
@@ -100,20 +100,21 @@ class PurchaseOrderItemClass extends BaseClass
         $objPHPExcel->getActiveSheet()->setCellValue('C1', '数量');
         $objPHPExcel->getActiveSheet()->setCellValue('D1', '单价');
         $objPHPExcel->getActiveSheet()->setCellValue('E1', '总价');
-        $objPHPExcel->getActiveSheet()->setCellValue('F1', '备注');
-        $objPHPExcel->getActiveSheet()->setCellValue('G1', '预留1');
-        $objPHPExcel->getActiveSheet()->setCellValue('H1', '预留2');
-        $objPHPExcel->getActiveSheet()->setCellValue('I1', '预留3');
+        $objPHPExcel->getActiveSheet()->setCellValue('F1', '预留1');
+        $objPHPExcel->getActiveSheet()->setCellValue('G1', '预留2');
+        $objPHPExcel->getActiveSheet()->setCellValue('H1', '预留3');
+        $objPHPExcel->getActiveSheet()->setCellValue('I1', '预留4');
 
         $baseRow = 2;
         foreach ($orderList as $key => $order) {
             $i = $baseRow + $key;
             $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, $order['productId']);
             $objPHPExcel->getActiveSheet()->setCellValue('B' . $i, $order['name']);
-            $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $order['xhNum']);
-            $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $order['xhUnitPrice']);
-            $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $order['xhPrice']);
-            $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, $order['remark']);
+            $itemNum = floatval($order['itemNum']);
+            $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $itemNum);
+            $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $order['bigPrice']);
+            $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $order['totalPrice']);
+            $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, '');
             $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, '');
             $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, '');
             $objPHPExcel->getActiveSheet()->setCellValue('I' . $i, '');