ad

app/cxinv/model/FinancialManager.php

@@ -169,13 +169,13 @@ class FinancialManager extends Base{
             if($product->is_combind==1){
                 $rednum=$data['balance_num'];
                 if($product->ProductsCombind->isEmpty()) throw new \Exception('组合商品未找到明细');
-                $product->ProductsCombind->each(function ($item) use ($rednum, &$productID) {
+                $product->ProductsCombind->each(function ($item) use ($rednum, &$productID,$data) {
                     ProductStock::AddStock($item->child_id, $rednum * $item->child_num);
-                    $productID[] = ['product_id' => $item->child_id, 'type'=>1,'num' => $rednum * $item->child_num];
+                    $productID[] = ['product_id' => $item->child_id, 'type'=>1,'num' => $rednum * $item->child_num,'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
                 });
             }else{
                 ProductStock::AddStock($product->id,$data['balance_num']);
-                $productID[]=["product_id"=>$product->id,"type"=>1,"num"=>$data['balance_num']];
+                $productID[]=["product_id"=>$product->id,"type"=>1,"num"=>$data['balance_num'],'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
             }
             $data['balance_num']="0";
             $data['status']=2;
@@ -234,12 +234,14 @@ class FinancialManager extends Base{
             if($product->is_combind==1 ){
                 if($product->ProductsCombind->isEmpty()) throw new \Exception('组合商品未找到明细');
                 $productID=ProductsCombind::CombindSubStock($product->id,$rednum);
-                array_map(function ($item){
+                array_map(function (&$item) use ($mainData){
                     ProductStock::OutStock($item['product_id'], $item['num']);
+                    $item['apply_id']=$mainData['apply_id'];
+                    $item['apply_name']=$mainData['apply_name'];
                 },$productID);
             }else{
                 ProductStock::OutStock($product->id, $rednum);
-                $productID[] = ['product_id' => $product->id, 'type'=>2,'num' => $rednum];
+                $productID[] = ['product_id' => $product->id, 'type'=>2,'num' => $rednum,'apply_id'=>$mainData['apply_id'], 'apply_name'=>$mainData['apply_name']];
             }
            // $mainData['manager_status']=$mainData['balance_num']=='0'?1:2;
         } else {
@@ -397,13 +399,15 @@ class FinancialManager extends Base{
                     $kt=["product_id"=>$product->id,"type"=>1,'num'=>bcsub($item['num'],$product->residue_stock,8),"subunit_price"=>$product->subunit_price,"unit_price"=>$product->unit_price];
                 }
                 ProductStock::OutStock($product->id,$item['num'],2);
-                $productID[]=["product_id"=>$product->id,'num'=>$item['num'],'type'=>2];
+                $productID[]=["product_id"=>$product->id,'num'=>$item['num'],'type'=>2,'apply_id'=>$data['cl_uid'],'apply_name'=>$data['cl_uname']];
                 $data['balance_num']=bcsub($data['balance_num'],$item['num'],8);
             }else{
                 $productID=ProductsCombind::CombindSubStock($product->id,$item['num'],2);
                 if($product->combind_stock<$item['num']) $kt =['product_id'=>$product->id,'type'=>1,'num'=>bcsub($item['num'],$product->combind_stock,8),'subunit_price'=>$product->subunit_price,'unit_price'=>$product->unit_price];
-                array_map(function ($item)use(&$kt){
+                array_map(function (&$item)use(&$kt,$data){
                     ProductStock::OutStock($item['product_id'], $item['num'],2);
+                    $item['apply_id']=$data['cl_uid'];
+                    $item['apply_name']=$data['cl_uname'];
                 },$productID);
                 $data['balance_num']=bcsub($data['balance_num'],$item['num'],8);
             }

app/cxinv/model/FinancialTz.php

@@ -7,19 +7,6 @@ use think\model\concern\SoftDelete;
 class FinancialTz extends Base
 {
     use SoftDelete;
-//`id` int(11) NOT NULL AUTO_INCREMENT,
-//`ktCode` varchar(255) NOT NULL COMMENT '计提编号',
-//`manager_id` bigint(20) NOT NULL COMMENT '出库id',
-//`status` tinyint(3) NOT NULL COMMENT '状态',
-//`num` decimal(20,8) NOT NULL COMMENT '数量',
-//`out_fee` decimal(20,8) NOT NULL COMMENT '出口金额',
-//`check_fee` decimal(20,8) NOT NULL COMMENT '调整金额',
-//`is_checkOrder` tinyint(3) NOT NULL COMMENT '是否调整单',
-//`apply_id` int(11) NOT NULL COMMENT '创建人',
-//`apply_name` varchar(255) NOT NULL,
-//`create_time` datetime NOT NULL,
-//`update_time` datetime NOT NULL,
-//`delete_time` datetime DEFAULT NULL,
     protected $schema = [
         'id'  =>'bigint',//
         'ktCode'  =>'varchar',//计提编号

app/cxinv/model/ManagerProduct.php

@@ -12,6 +12,8 @@ class ManagerProduct extends Base{
         'product_id'=>'int',//关联商品id
         'type'=>'int', // 类型 1 增加 2减少
         'num'=>'decimal',//关联数量
+        'apply_id'=>'int',//申请id
+        'apply_name'=>'string',//申请人
         'create_time'=>'datetime',//时间
     ];
     protected $createTime='create_time';