Browse Source

staffName

shish 4 years ago
parent
commit
3e1cbcdcde

+ 2 - 0
app-ghs/controllers/ProductController.php

@@ -514,6 +514,7 @@ class ProductController extends BaseController
         }
         }
         $cost = bcsub($price, $addPrice, 2);
         $cost = bcsub($price, $addPrice, 2);
         $post['cost'] = $cost;
         $post['cost'] = $cost;
+        $post['staffName'] = $shopAdmin->name ?? '';
         ProductClass::addProduct($post, $this->shop);
         ProductClass::addProduct($post, $this->shop);
         util::complete('添加成功');
         util::complete('添加成功');
     }
     }
@@ -552,6 +553,7 @@ class ProductController extends BaseController
         $post['sjId'] = $this->sjId;
         $post['sjId'] = $this->sjId;
         $post['adminId'] = $this->adminId;
         $post['adminId'] = $this->adminId;
         $post['mainId'] = $this->mainId;
         $post['mainId'] = $this->mainId;
+        $post['staffName'] = $shopAdmin->name ?? '';
 
 
         $price = $post['price'] ?? 0;
         $price = $post['price'] ?? 0;
         $addPrice = $post['addPrice'] ?? 0;
         $addPrice = $post['addPrice'] ?? 0;

+ 2 - 1
biz-ghs/product/classes/ProductClass.php

@@ -1152,7 +1152,7 @@ class ProductClass extends BaseClass
                 $pdOrderData['adminId'] = $data['adminId'];
                 $pdOrderData['adminId'] = $data['adminId'];
                 $pdOrderData['smallNum'] = 0;
                 $pdOrderData['smallNum'] = 0;
                 $pdOrderData['price'] = $data['price'];
                 $pdOrderData['price'] = $data['price'];
-                $pdOrderData['remark'] = '添加花材时初始库存';
+                $pdOrderData['remark'] = '初始库存';
                 CheckOrderClass::add($pdOrderData);
                 CheckOrderClass::add($pdOrderData);
 
 
                 $pdOrderItemData = [];
                 $pdOrderItemData = [];
@@ -1194,6 +1194,7 @@ class ProductClass extends BaseClass
                 $record['itemNum'] = $stock;//盈亏数
                 $record['itemNum'] = $stock;//盈亏数
                 $record['oldStock'] = 0;
                 $record['oldStock'] = 0;
                 $record['newStock'] = $stock; //新库存直接等于盘点的数量
                 $record['newStock'] = $stock; //新库存直接等于盘点的数量
+                $record['relateName'] = $data['staffName'] ?? '';
                 StockRecordClass::addCheckOrderRecord($record);
                 StockRecordClass::addCheckOrderRecord($record);
             }
             }