编辑

app/admin/controller/shop/ShopDelivery.php

@@ -18,7 +18,8 @@ class ShopDelivery extends Backend
     {
         parent::_initialize();
         $this->model = new ShopDeliveryModel();
-            $this->relationField=['customer','user'];
+        $this->assign('platformList', site_config('addonsd.platform_list'));
+        $this->relationField=['customer','user','shops', 'variety', 'specs'];
     }
 
 }

app/admin/controller/user/StockLog.php

@@ -7,6 +7,7 @@ use app\common\controller\Backend;
 use app\admin\traits\Actions;
 use think\annotation\route\Group;
 use think\annotation\route\Route;
+use app\common\model\StockConfig;
 use app\common\model\StockLog as StockLogModel;
 
 #[Group("user/stock_log")]
@@ -22,6 +23,9 @@ class StockLog extends Backend
     {
         parent::_initialize();
         $this->model = new StockLogModel();
+        $this->assign('typeList', StockConfig::getTypeList());
+        $this->relationField=['stockconfig'];
+
     }
 
     //查看

app/admin/view/shop/shop_delivery/index.html

@@ -28,10 +28,10 @@
                 {field: 'id',title: __('ID'),width:80,sortable: true},
                 {field: 'user.nickname', title: __('录入人'),operate: 'LIKE'},
                 {field: 'customer.name',title: __('客户'),operate:'LIKE'},
-                {field: 'shop_id',title: __('店铺'),operate:'LIKE'},
+                {field: 'shops.name',title: __('店铺'),operate:'LIKE'},
                 {field: 'plat_id',title: __('平台'),operate: false, searchList: Yunqi.data.platformList},
-                {field: 'variety_id', title: __('品种'),operate: false},
-                {field: 'spec_id', title: __('规格'),operate: false},
+                {field: 'variety.title', title: __('品种'),operate: false},
+                {field: 'specs.title', title: __('规格'),operate: false},
                 {field: 'num', title: __('数量'),operate: false},
                 {field: 'weigh', title: __('重量'),operate: false},
                 {field: 'total_price', title: __('总价'),operate: false},

app/admin/view/user/stock_log/index.html

@@ -33,7 +33,7 @@ export default{
             }},
             {field:"id",title:"ID",operate:false},
             {field:"user_id",title:"用户"},
-            {field:"type_id",title:"类型"},
+            {field: 'type_id',title: __('类型'),operate: false, searchList: Yunqi.data.typeList},
             {field:"type",title:"类型",width: 80,formatter:function (data) {
                     let tag=Yunqi.formatter.tag;
                     if (data == 1) {
@@ -45,7 +45,7 @@ export default{
                     }
                     return tag;
             }},
-            {field:"variety_id",title:"物品/品种",operate:false},
+            {field:"stockconfig.title",title:"物品/品种",operate:false},
             {field:"change",title:"变更数量"},
             {field:"after",title:"当前库存"},
             {field:"remark",title:"备注",operate:false},

app/api/service/SpecService.php

@@ -82,18 +82,18 @@ class SpecService{
             //修改库存
             $specs = ProductConfig::where('id', $delivery->spec_id)->field('weight,box_id')->find();
             if(!$specs)  throw new \Exception('参数有误！');
-
+         
             //根据品种扣除库存
             $weight = bcmul((string)$specs->weight, $data['num'], 2); //总重
-
+           
             //扣除品种
             StockDetail::setStockConfigNum($delivery->variety_id, bcsub($delivery->weigh, $weight, 2), StockConfig::VarietyName);
 
             //根据规格扣除包装箱
             StockDetail::setStockConfigNum($specs->box_id, bcsub((string)$delivery->num, $data['num'], 2), StockConfig::PackingBox);
-
+               
             //修改数量
-            $price  = bcmul($delivery->total_price, (string)$delivery->num, 2); //单价
+            $price  = bcdiv($delivery->total_price, (string)$delivery->num, 2); //单价
             $delivery->weigh = $weight; //总重
             $delivery->num   = $data['num'];
             $delivery->total_price = bcmul($price, $data['num'], 2);

app/common/model/ShopDelivery.php

@@ -24,7 +24,7 @@ class ShopDelivery Extends Model
         $data->save();
     }
 
-
+    //id,name
     public function user()
     {
         return $this->hasOne(User::class,'id','user_id')->field('id,nickname');
@@ -47,7 +47,7 @@ class ShopDelivery Extends Model
     
     public function variety()
     {
-        return $this->hasOne(Customer::class,'id','variety_id')->field('id,name');
+        return $this->hasOne(StockConfig::class,'id','variety_id')->field('id,name');
     }
 
 
@@ -55,9 +55,9 @@ class ShopDelivery Extends Model
     
     public function specs()
     {
-        return $this->hasOne(Customer::class,'id','spec_id')->field('id,name');
+        return $this->hasOne(ProductConfig::class,'id','spec_id')->field('id,name');
     }
 
-    
+ 
     
 }

app/common/model/StockConfig.php

@@ -17,6 +17,13 @@ class StockConfig extends BaseModel
       const StatusNormal  = 1;
       const StatusDisable = 0;
 
+      public static function getTypeList(){
+            return [
+                  self::VarietyName =>'品种名称',
+                  self::PackingBox  =>'包装箱',
+                  self::Material    =>'耗材',
+            ];
+      }
 
       public function stockdetail()
       {

app/common/model/StockLog.php

@@ -17,4 +17,10 @@ class StockLog Extends Model
         'updatetime'     =>  'timestamp:Y-m-d H:i',
     ];
 
+
+    public function stockconfig()
+    {
+        return $this->hasOne(StockConfig::class,'id','variety_id')->field('id,title');
+    }
+    
 }