维护good_log表的good_log_code字段

app/admin/controller/Allot.php

@@ -551,8 +551,9 @@ class Allot extends BaseController
                             Db::rollback();
                             return error_show(1002,"发货更新失败");
                         }
-                        $good_data[]=["stock_id"=>$stock['id'],"type"=>1,'stock'=>$value['allot_num'],"stock_name"=>"intra_stock"];
-                        $good_data[]=  ["stock_id"=>$stock['id'],"type"=>2,'stock'=>$value['allot_num'],"stock_name"=>"wait_out_stock"];
+                        //商品变动日志表，good_log_code字段存储调拨单号
+                        $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 1, 'stock' => $value['allot_num'], "stock_name" => "intra_stock"];
+                        $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 2, 'stock' => $value['allot_num'], "stock_name" => "wait_out_stock"];
                     }
                 GoodLog::LogAdd($this->post['token'],$good_data,'allotsend');
                 $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>3,"order_type"=>'DBD'];
@@ -637,7 +638,8 @@ class Allot extends BaseController
                     Db::rollback();
                     return error_show(1002,"数据更新失败");
                 }
-                $good_data[]=["stock_id"=>$stock['id'],"type"=>2,'stock'=>$n['allot_num'],"stock_name"=>"intra_stock"];
+                //商品变动日志表，good_log_code字段存储调拨单号
+                $good_data[]=['good_log_code'=>$allot_code,"stock_id"=>$stock['id'],"type"=>2,'stock'=>$n['allot_num'],"stock_name"=>"intra_stock"];
                 $instock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
                 if($instock==false){
                    $instock =[];
@@ -661,7 +663,8 @@ class Allot extends BaseController
                     Db::rollback();
                     return error_show(1003, "入库验货更新失败");
                 }
-                $good_data[]=["stock_id"=>isset($instock['id'])?$instock['id']: Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$n['allot_num'],"stock_name"=>"wait_in_stock"];
+                //商品变动日志表，good_log_code字段存储调拨单号
+                $good_data[]=['good_log_code'=>$allot_code,"stock_id"=>isset($instock['id'])?$instock['id']: Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$n['allot_num'],"stock_name"=>"wait_in_stock"];
             }
             GoodLog::LogAdd($this->post['token'],$good_data,'allotin');
             $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>4,"order_type"=>'DBD'];
@@ -741,8 +744,9 @@ public function vesio(){
                     Db::rollback();
                     return error_show(1004, "验货更新失败");
                 }
-                $good_data[]=["stock_id"=> $stock['id'],"type"=>2,'stock'=>$p['stock_num'],"stock_name"=>"wait_in_stock"];
-                $good_data[]=["stock_id"=> $stock['id'],"type"=>1,'stock'=>$p['stock_num'],"stock_name"=>"usable_stock"];
+                //商品变动日志表，good_log_code字段存储调拨单号
+                $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 2, 'stock' => $p['stock_num'], "stock_name" => "wait_in_stock"];
+                $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 1, 'stock' => $p['stock_num'], "stock_name" => "usable_stock"];
             }
             GoodLog::LogAdd($this->post['token'],$good_data,'allotincheck');
             $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>5,"order_type"=>'DBD'];

app/admin/controller/Good.php

@@ -282,7 +282,8 @@ class Good extends Base
         $good['updatetime'] = date("Y-m-d H:i:s");
         $up= Db::name("good_stock")->save($good);
         if($up){
-            $data=["stock_id"=>$good['id'],"type"=>1,'stock'=>$warn_stock,"stock_name"=>"warn_stock"];
+            //商品变动日志表，good_log_code字段存储仓库编码
+            $data = ['good_log_code' => $wsm_code, "stock_id" => $good['id'], "type" => 1, 'stock' => $warn_stock, "stock_name" => "warn_stock"];
             GoodLog::LogAdd($this->post['token'],$data,'setwarn');
 
             return app_show(0,"预警库存更新成功");

app/admin/controller/Purchin.php

@@ -290,8 +290,8 @@ class Purchin extends BaseController
                     $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
-                    $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,
-                        'stock'=>$send_num,"stock_name"=>"usable_stock"];
+                    //商品变动日志表，good_log_code字段存储采购单单号
+                    $good_data[]=['good_log_code'=>$cgdNo,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
                     if($upd){
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
                         ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good  );
@@ -549,8 +549,8 @@ class Purchin extends BaseController
                     $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
-                    $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,
-                    'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                    //商品变动日志表，good_log_code字段存储入库单编号
+                    $good_data[] = ['good_log_code' => $incode, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $info['wsm_num'], "stock_name" => "usable_stock"];
                     if($upd){
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
                         ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good  );

app/admin/controller/Resign.php

@@ -810,8 +810,9 @@ class Resign extends BaseController
                         $good['wait_in_stock']+=$info['good_num'];
                         $good['updatetime'] = date("Y-m-d H:i:s");
                         $upd=  Db::name("good_stock")->save($good);
-                        $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,
-                            'stock'=>$info['good_num'],"stock_name"=>"wait_in_stock"];
+
+                    //商品变动日志表，good_log_code字段存储采购单号
+                    $good_data[] = ['good_log_code' => $cgdCode, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $info['good_num'], "stock_name" => "wait_in_stock"];
                         if($upd) {
                             GoodLog::LogAdd($this->post['token'], $good_data, 'RKD');
                             ActionLog::logAdd($this->post['token'], $order, "RKD", 1, $good);

app/admin/controller/Sale.php

@@ -2180,8 +2180,9 @@ class Sale extends Base
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
                     }
-                    $good_data[]=  ["stock_id"=>$str['id'],"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
-                    $good_data[]=  ["stock_id"=>$str['id'],"type"=>1,'stock'=>$send_num,"stock_name"=>"intra_stock"];
+                    //商品变动日志表，good_log_code字段存储采购单号
+                    $good_data[] = ['good_log_code' => $outCode, "stock_id" => $str['id'], "type" => 2, 'stock' => $send_num, "stock_name" => "wait_out_stock"];
+                    $good_data[] = ['good_log_code' => $outCode, "stock_id" => $str['id'], "type" => 1, 'stock' => $send_num, "stock_name" => "intra_stock"];
                     GoodLog::LogAdd($this->post['token'],$good_data,$der['order_type'] != 1?"ZXQRD":"XSQRD");
                 }
 
@@ -2268,8 +2269,10 @@ class Sale extends Base
                         $dr);
                     $order=["order_type"=>$dr['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$dr['orderCode'],"order_id"=>$dr['id'],"order_status"=>$dr['status']];
                     ProcessOrder::AddProcess($this->post['token'],$order);
-                    $good_data[]=  ["stock_id"=>$stoc['id'],"type"=>1,'stock'=>$codeinfo['send_num'],"stock_name"=>"wait_out_stock"];
-                    $good_data[]=  ["stock_id"=>$stoc['id'],"type"=>2,'stock'=>$codeinfo['send_num'],"stock_name"=>"usable_stock"];
+
+                    //商品变动日志表，good_log_code字段存储销售订单编号
+                    $good_data[] = ['good_log_code' => $outCode, "stock_id" => $stoc['id'], "type" => 1, 'stock' => $codeinfo['send_num'], "stock_name" => "wait_out_stock"];
+                    $good_data[] = ['good_log_code' => $outCode, "stock_id" => $stoc['id'], "type" => 2, 'stock' => $codeinfo['send_num'], "stock_name" => "usable_stock"];
                     GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
                 }
                 if ($status == 3) {
@@ -2285,7 +2288,9 @@ class Sale extends Base
                     $var['intra_stock'] -= $codeinfo['send_num'];
                     $var['updatetime'] = date("Y-m-d H:i:s");
                     $stre = Db::name('good_stock')->save($var);
-                    $good_data[]=  ["stock_id"=>$var['id'],"type"=>2,'stock'=>$codeinfo['send_num'],"stock_name"=>"intra_stock"];
+
+                    //商品变动日志表，good_log_code字段存储销售订单编号
+                    $good_data[] = ['good_log_code' => $outCode, "stock_id" => $var['id'], "type" => 2, 'stock' => $codeinfo['send_num'], "stock_name" => "intra_stock"];
                     GoodLog::LogAdd($this->post['token'],$good_data,$codeinfo['order_type'] == 2?"ZXCKD":"CKD");
                     if ($stre == false) {
                         Db::rollback();

app/admin/controller/Salezx.php

@@ -507,9 +507,12 @@ class Salezx extends \app\BaseController
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
                     }
-                $good_data[]=["stock_id"=>$str['id'],"type"=>1,'stock'=>$der['send_num'],"stock_name"=>"intra_stock"];
-                $good_data[]=  ["stock_id"=>$str['id'],"type"=>2,'stock'=>$der['send_num'],"stock_name"=>"wait_out_stock"];
-                GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
+
+                //商品变动日志表，good_log_code字段存储销售订单编号
+                $good_data[] = ['good_log_code' => $outCode, "stock_id" => $str['id'], "type" => 1, 'stock' => $der['send_num'], "stock_name" => "intra_stock"];
+                $good_data[] = ['good_log_code' => $outCode, "stock_id" => $str['id'], "type" => 2, 'stock' => $der['send_num'], "stock_name" => "wait_out_stock"];
+                GoodLog::LogAdd($this->post['token'], $good_data, 'CKD');
+
                 Db::commit();
                 return error_show(0,"创建成功");
             }else{