Browse Source

Merge branch 'version1.5' of wugg/phpstock into master-online

wugg 3 năm trước cách đây
mục cha
commit
4ad89e2816
1 tập tin đã thay đổi với 14 bổ sung1 xóa
  1. 14 1
      app/admin/controller/Purchin.php

+ 14 - 1
app/admin/controller/Purchin.php

@@ -202,9 +202,22 @@ class Purchin extends BaseController
                     }
                 }
                 if($status==4){
+                    $cgdinfo['wsend_num']-=$send_num;
+                    $cgdinfo['send_num']+=$send_num;
+                    $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
+                    $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
+                    $cgdinfo['updatetime']=date("Y-m-d H:i:s");
+                    $up=Db::name("purchease_order")->save($cgdinfo);
+                    if($up==false){
+                        Db::rollback();
+                        return error_show(1004,"新建失败");
+                    }
+                    $order = ["order_code"=>$cgdNo,"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
+                    $process=["order_code"=>$cgdNo,"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                     $good = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'],
                         "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
-
                     if(empty($good)) {
                         $good=[
                             "spuCode"=>$cgdinfo['spuCode'],