shish 4 anni fa
parent
commit
2a67310298

+ 3 - 0
app-hd/controllers/GoodsController.php

@@ -28,6 +28,9 @@ class GoodsController extends BaseController
             $post['mainId'] = $this->mainId ?? 0;
             $post['sjId'] = $this->sjId ?? 0;
             $post['shopId'] = $this->shopId ?? 0;
+            $staff = $this->shopAdmin ?? [];
+            $staffName = $staff->name ?? '';
+            $post['staffName'] = $staffName;
             GoodsClass::cgPlant($post);
             $transaction->commit();
             util::complete();

+ 2 - 0
biz-hd/goods/classes/GoodsClass.php

@@ -83,6 +83,7 @@ class GoodsClass extends BaseClass
         $mainId = $data['mainId'] ?? 0;
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
+        $relateName = $data['staffName'] ?? '';
 
         $goodsPrice = 0;
         $totalNum = 0;
@@ -105,6 +106,7 @@ class GoodsClass extends BaseClass
                 'mainId' => $mainId,
                 'shopId' => $shopId,
                 'sjId' => $sjId,
+                'relateName' => $relateName,
             ];
             PlantCgItemClass::addData($item);
             $goodsPrice = bcadd($totalPrice, $goodsPrice, 2);

+ 2 - 0
biz-hd/goods/classes/PlantCgItemClass.php

@@ -18,6 +18,7 @@ class PlantCgItemClass extends BaseClass
         $orderSn = $data['orderSn'] ?? '';
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
+        $relateName = $data['relateName'] ?? '';
         //增加库存
         $respond = GoodsClass::addStock($goodsId, $mainId, $num);
         //增加库存记录
@@ -28,6 +29,7 @@ class PlantCgItemClass extends BaseClass
         $params['orderSn'] = $orderSn;
         $params['goodsId'] = $goodsId;
         $params['goodsNum'] = $num;
+        $params['relateName'] = $relateName;
         $params['oldStock'] = $respond['oldStock'] ?? 0;
         $params['newStock'] = $respond['newStock'] ?? 0;
         GoodsStockRecordClass::addMakeGoods($params);

+ 1 - 0
sql.txt

@@ -849,5 +849,6 @@ RENAME TABLE `xhGoodsCgSn` TO `xhPlantCgSn`;
 ALTER TABLE xhPlantCg ADD `num` INT NOT NULL DEFAULT 0 COMMENT '本次采购的总数量' AFTER `kindNum`;
 
 ALTER TABLE xhGoods MODIFY `content` TEXT COMMENT '正文内容';
+ALTER TABLE xhGoodsStockRecord ADD `relateName` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '关联人' AFTER `goodsNum`;
 
 ====预订单 ssh 20220402