各个订单列表详情 增加状态名称，花材级别

biz-ghs/order/classes/CheckOrderClass.php

@@ -18,7 +18,10 @@ class CheckOrderClass extends BaseClass
     const STATUS_DRAFT = 1; //草稿
     const STATUS_COMPLETE = 2; //完成
 
-
+    public static $statusMap = [
+        self::STATUS_DRAFT => '草稿',
+        self::STATUS_COMPLETE => '已盘点',
+    ];
     //2021.1.22 linqh 操作订单  添加/保存草稿/草稿编辑保存： 区别在添加是立即改库存和记录流水记录，而保存草稿是只保存订单信息
     public static function opOrder($data,$draft=false,$update=false)
     {
@@ -97,6 +100,7 @@ class CheckOrderClass extends BaseClass
         }
         $data['list'] = $list;
         $data['list'] = self::groupAdminList($list);
+        $data['list'] = self::groupStatusName($data['list']);
         return $data;
     }
 
@@ -113,12 +117,16 @@ class CheckOrderClass extends BaseClass
                 $tmp = $info;
                 $tmp['itemCover'] = self::groupImg($info['itemCover']);
                 unset($v['itemInfo']);
+                if(!isset($tmp['rank'])){
+                    $tmp['rank']= 'B';
+                }
                 $tmp = array_merge($tmp,$v);
                 $itemData[] = $tmp;
             }
         }
         $orderData = self::groupAdmin($orderData);
         $orderData['itemInfo'] = $itemData;
+        $orderData['statusName'] = self::getStatusName($orderData['status']);
         return $orderData;
     }
 
@@ -149,6 +157,7 @@ class CheckOrderClass extends BaseClass
             $tmp = [];
             $productId = $v['productId'];
             $itemId = $productData[$productId]['itemId'];
+            $rank = $productData[$productId]['rank']??'B';// 花材级别
             $tmp['orderSn'] = $orderSn;
             $tmp['itemId'] = $itemId;
             $tmp['productId'] = $v['productId'];
@@ -169,6 +178,7 @@ class CheckOrderClass extends BaseClass
                 'smallNumProfitLoss'=>bcsub($v['smallNum'],$stockFormat['smallNum'],2),//小单位的盈亏
                 'itemUnit'=> $unitNum?2:1,//单位
                 'ratio'=>$unitNum,// 比例
+                'rank'=>$rank,// 花材级别
                 'bigUnit'=> xhItemService::getUnitName($itemData[$itemId]['bigUnit']),//大单位名称 扎
                 'smallUnit'=> xhItemService::getUnitName($itemData[$itemId]['smallUnit']),//小单位名称 支
             ];
@@ -178,4 +188,20 @@ class CheckOrderClass extends BaseClass
         return $batchData;
     }
 
+    // 组装状态码 linqh 2021.1.30
+    public static function groupStatusName($list)
+    {
+        foreach ($list as $k => $val) {
+            $status = $val['status'] ?? 0;
+            $list[$k]['statusName'] = self::getStatusName($status);
+        }
+        return $list;
+    }
+
+    // 获取状态码名称
+    public static function getStatusName($status)
+    {
+        return self::$statusMap[$status]??'';
+    }
+
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -203,7 +203,7 @@ class PurchaseOrderClass extends BaseClass
             $tmp = [];
             $productId = $v['productId'];
             $itemId = $productData[$productId]['itemId'];
-            $rank = $productData[$productId]['rank']??'';// 花材级别
+            $rank = $productData[$productId]['rank']??'B';// 花材级别
             $tmp['orderSn'] = $orderSn;
             $tmp['itemId'] = $itemId;
             $tmp['productId'] = $v['productId'];

biz-ghs/order/classes/StockInOrderClass.php

@@ -19,6 +19,10 @@ class StockInOrderClass extends BaseClass
     const ACTION_CONFIRM = 'confirm'; //直接入库
     public static $baseFile = '\bizGhs\order\models\StockInOrder';
 
+    public static $statusMap = [
+        self::STATUS_WAIT => '待入库',
+        self::STATUS_COMPLETE => '已入库',
+    ];
 
     //2021.1.25 linqh 订单列表
     public static function getOrderList($where)
@@ -30,7 +34,7 @@ class StockInOrderClass extends BaseClass
         }
         $data['list'] = $list;
         $data['list'] = self::groupAdminList($list);
-
+        $data['list'] = self::groupStatusName($data['list']);
         return $data;
     }
 
@@ -90,6 +94,7 @@ class StockInOrderClass extends BaseClass
                     'smallNumStock'=> $v['smallNumStock'],//当时库存 小单位数
                     'itemUnit'=> $v['itemUnit'],
                     'ratio'=>$v['ratio'],// 比例
+                    'rank'=>$v['rank']??'B',// 花材级别
                     'bigUnit'=> $v['bigUnit'],
                     'smallUnit'=> $v['smallUnit'],
                 ];
@@ -160,12 +165,16 @@ class StockInOrderClass extends BaseClass
                 $tmp = $info;
                 $tmp['itemCover'] = self::groupImg($info['itemCover']);
                 unset($v['itemInfo']);
+                if(!isset($tmp['rank'])){
+                    $tmp['rank']= 'B';
+                }
                 $tmp = array_merge($tmp,$v);
                 $itemData[] = $tmp;
             }
         }
         $orderData = self::groupAdmin($orderData);
         $orderData['itemInfo'] = $itemData;
+        $orderData['statusName'] = self::getStatusName($orderData['status']);
         return $orderData;
     }
 
@@ -178,4 +187,20 @@ class StockInOrderClass extends BaseClass
         }
         return $orderData;
     }
+
+    // 组装状态码 linqh 2021.1.30
+    public static function groupStatusName($list)
+    {
+        foreach ($list as $k => $val) {
+            $status = $val['status'] ?? 0;
+            $list[$k]['statusName'] = self::getStatusName($status);
+        }
+        return $list;
+    }
+
+    // 获取状态码名称
+    public static function getStatusName($status)
+    {
+        return self::$statusMap[$status]??'';
+    }
 }

biz-ghs/order/classes/StockOutOrderClass.php

@@ -17,12 +17,18 @@ class StockOutOrderClass extends BaseClass
     const STATUS_WAIT = 1; //待出库
     const STATUS_COMPLETE = 2 ; //已出库
     const STATUS_CANCEL = 3; //取消出库
-    const STATUS_BACK = 4; //退回，取消入库
+    const STATUS_BACK = 4; //退回，取消入库 （暂不用）
 
 
     const ACTION_WAIT = 'wait';
     const ACTION_CONFIRM = 'confirm'; //直接入库
 
+    public static $statusMap = [
+        self::STATUS_WAIT => '待出库',
+        self::STATUS_COMPLETE => '已出库',
+        self::STATUS_CANCEL => '取消出库',
+    ];
+
     public static $baseFile = '\bizGhs\order\models\StockOutOrder';
 
     //2021.1.23 linqh 新增出库订单：
@@ -138,6 +144,7 @@ class StockOutOrderClass extends BaseClass
         }
         $data['list'] = $list;
         $data['list'] = self::groupAdminList($list);
+        $data['list'] = self::groupStatusName($data['list']);
 
         return $data;
     }
@@ -154,12 +161,17 @@ class StockOutOrderClass extends BaseClass
                 $tmp = $info;
                 $tmp['itemCover'] = self::groupImg($info['itemCover']);
                 unset($v['itemInfo']);
+                //兼容 旧数据，没有 rank (花材等级 默认给B)
+                if(!isset($tmp['rank'])){
+                    $tmp['rank']= 'B';
+                }
                 $tmp = array_merge($tmp,$v);
                 $itemData[] = $tmp;
             }
         }
         $orderData = self::groupAdmin($orderData);
         $orderData['itemInfo'] = $itemData;
+        $orderData['statusName'] = self::getStatusName($orderData['status']);
         return $orderData;
     }
 
@@ -186,6 +198,7 @@ class StockOutOrderClass extends BaseClass
             $tmp = [];
             $productId = $v['productId'];
             $itemId = $productData[$productId]['itemId'];
+            $rank = $productData[$productId]['rank']??'B';// 花材级别
             $tmp['orderSn'] = $orderSn;
             $tmp['itemId'] = $itemId;
             $tmp['productId'] = $v['productId'];
@@ -203,6 +216,7 @@ class StockOutOrderClass extends BaseClass
                 'smallNumStock'=> $stockFormat['smallNum'],//当时库存 小单位数
                 'itemUnit'=> $unitNum?2:1,//单位数量 2表示有两个单位(e.g 扎和支) 1表是只有一个单位（e.g 扎）
                 'ratio'=>$unitNum,// 比例
+                'rank'=>$rank,// 花材级别
                 'bigUnit'=> xhItemService::getUnitName($itemData[$itemId]['bigUnit']),//大单位名称 扎
                 'smallUnit'=> xhItemService::getUnitName($itemData[$itemId]['smallUnit']),//小单位名称 支
             ];
@@ -212,4 +226,19 @@ class StockOutOrderClass extends BaseClass
         return $batchData;
     }
 
+    // 组装状态码 linqh 2021.1.30
+    public static function groupStatusName($list)
+    {
+        foreach ($list as $k => $val) {
+            $status = $val['status'] ?? 0;
+            $list[$k]['statusName'] = self::getStatusName($status);
+        }
+        return $list;
+    }
+
+    // 获取状态码名称
+    public static function getStatusName($status)
+    {
+        return self::$statusMap[$status]??'';
+    }
 }