1

app/Model/PurchaseOrder.php

@@ -20,10 +20,17 @@ class PurchaseOrder extends UseScopeBaseModel
         self::STATE_ZERO => '未确认',
         self::STATE_ONE => '待确认',
         self::STATE_TWO => '已审核',
-        self::STATE_Three => '已发货',
+        self::STATE_Three => '待入库',
         self::STATE_Four => '已入库',
     ];
 
+    const invoice_state_zero = 0;//未发货
+    const invoice_state_one = 1;//待发货
+    public static $invoice_name = [
+        self::invoice_state_zero => '未发货',
+        self::invoice_state_one => '待发货',
+    ];
+
     const Order_type_one = 1;//总社采购
     const Order_type_two = 2;//分社外采
     const Order_type_three = 3;//分社要货 不要合同

app/Service/PurchaseOrderService.php

@@ -342,7 +342,7 @@ class PurchaseOrderService extends Service
      */
     public function getList($data,$user){
         $model = PurchaseOrder::Clear($user,$data);
-        $model = $model->where('del_time',0)->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','discount_fee','other_fee','total','storehouse_id')
+        $model = $model->where('del_time',0)->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','discount_fee','other_fee','total','storehouse_id','invoice_state')
             ->orderby('id', 'desc');
         
         if(! empty($data['purchase_id'])) $model->where('id', $data['purchase_id']);
@@ -474,9 +474,12 @@ class PurchaseOrderService extends Service
             //发货信息 分社向总社采购
 //            $invoice_state = "未发货";
 //            if(! empty($invoice_map[$value['order_number']])) $invoice_state = implode(',',$invoice_map[$value['order_number']]);
-//            $data['data'][$key]['state_message'] = "订单状态:" . $data['data'][$key]['state_title'] . "\n"."是否发货:" . $invoice_state;
-
-            $data['data'][$key]['state_message'] = $data['data'][$key]['state_title'];
+            if(in_array($value['order_type'], [PurchaseOrder::Order_type_three,PurchaseOrder::Order_type_four])){
+                $invoice_state = PurchaseOrder::$invoice_name[$value['invoice_state']] ?? "";
+                $data['data'][$key]['state_message'] = "订单状态:" . $data['data'][$key]['state_title'] . "\n"."是否发货:" . $invoice_state;
+            }else{
+                $data['data'][$key]['state_message'] = "订单状态:" . $data['data'][$key]['state_title'];
+            }
 
             //用于计算--------
             //已收（审核后）