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

app/admin/controller/After.php

@@ -189,25 +189,26 @@ class After extends \app\BaseController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function  info(){
-        $bkcode = isset($this->post['returnCode']) && $this->post['returnCode']!="" ? trim($this->post['returnCode']):"";
-        if($bkcode==""){
-          return error_show(1005,"参数returnCode 不能为空");
+    public function  info()
+    {
+        $bkcode = isset($this->post['returnCode']) && $this->post['returnCode'] != "" ? trim($this->post['returnCode']) : "";
+        if ($bkcode == "") {
+            return error_show(1005, "参数returnCode 不能为空");
         }
-        $info = Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.returnCode=b.returnCode")
+        $info = Db::name("order_return")->alias("a")->leftJoin("order_returninfo b", "a.returnCode=b.returnCode")
             ->field("a.*,b.return_wsm,b.contactor,b.mobile,b.addr,b.addr_code,b.post_code,b.post_company,b.post_fee,b.gys_remark")
-            ->where(['a.returnCode'=>$bkcode])->find();
-        if(empty($info)){
-            return error_show(1005,"未找到售后数据");
-        }
-        $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
-        $info['origin_price']=$orderinfo['origin_price'];
-        $info['order_type']=$orderinfo['order_type'];
-        $info['sale_price']=$orderinfo['sale_price'];
-        $info['total_price']=sprintf("%1\$.2f",$orderinfo['sale_price']*$info['error_num']);
-        if($orderinfo['order_type']==3|| $orderinfo['order_type']==4){
-            $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
-        }else {
+            ->where(['a.returnCode' => $bkcode])->find();
+        if (empty($info)) {
+            return error_show(1005, "未找到售后数据");
+        }
+        $orderinfo = Db::name("sale")->where(["orderCode" => $info["orderCode"]])->find();
+        $info['origin_price'] = $orderinfo['origin_price'];
+        $info['order_type'] = $orderinfo['order_type'];
+        $info['sale_price'] = $orderinfo['sale_price'];
+        $info['total_price'] = sprintf("%1\$.2f", $orderinfo['sale_price'] * $info['error_num']);
+        if ($orderinfo['order_type'] == 3 || $orderinfo['order_type'] == 4) {
+            $goon = Db::name("good_zixun")->where(["spuCode" => $orderinfo['good_code'], "is_del" => 0])->find();
+        } else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
                 ->where(['a.skuCode' => $orderinfo['skuCode']])->find();
         }
@@ -215,36 +216,53 @@ class After extends \app\BaseController
             return error_show(1003, "未找到商品数据");
         }
         $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
-        $info["addr_cn"]=GetAddr($info['addr_code']);
-        $info["addr_code"]=json_decode($info['addr_code'],true);
+        $addcode = '';
+        if ($info['addr_code'] != "") {
+            list($a, $b, $c) = explode(",", $info['addr_code']);
+        $addcode = json_encode(["provice_code" => $a, "city_code" => $b, "area_code" => $c]);
+    }
+        $info["addr_cn"]=GetAddr($addcode);
+      //  $info["addr_code"]=json_decode($addcode,true);
         $out =Db::name("order_out")->where(["outCode"=>$info['outCode']])->find();
         $info['out_num'] = isset($out['send_num'])?$out['send_num']:'';
 //        $customer = Db::name("customer_info")->where(["companyNo"=>$info['customer_code']])->find();
+        $wsmcode=[];
+        if($info['return_wsm']!=''){
+            $wsmcode = Db::name("warehouse_info")
+                ->alias("a")
+                ->leftJoin("supplier b","a.supplierNo=b.code")
+                ->where(["a.wsm_code"=>$info['return_wsm']])
+                ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr,a.companyNo")
+                ->find();
+        }
 
-        $wsmcode = Db::name("warehouse_info")
-            ->alias("a")
-            ->leftJoin("supplier b","a.supplierNo=b.code")
-            ->where(["a.wsm_code"=>$info['return_wsm']])
-            ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr,a.companyNo")
-            ->find();
         $info['wsm_code'] =isset($wsmcode['wsm_code']) ? $wsmcode['wsm_code']:"";
         $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
         $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
         $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+        $customer=[];
+        if(isset($orderinfo['supplierNo'])&&$orderinfo['supplierNo']!=''){
+            $customer = Db::name("business")->field('id,company,companyNo')->where(["companyNo"=>$orderinfo['supplierNo']])->find();
+        }
 
-        $customer = Db::name("business")->field('id,company,companyNo')->where(["companyNo"=>$wsmcode['companyNo']])->find();
         $info['customer_name'] = isset($customer['company']) ?trim($customer['company']):'';
         $info['customer_code'] = isset($customer['companyNo']) ?trim($customer['companyNo']):'';
         $info['can']=$int;
 
         //仓库的联系人、职位、电话、省市区和地址
-        $info['contactor_name'] = $wsmcode['contactor_name'];//联系人
-        $info['position'] = $wsmcode['position'];//职位
-        $info['mobile'] = $wsmcode['mobile'];//电话
-        $info['addrs_code'] = json_decode($wsmcode['addrs_code'], true);//省市区编码
-        $info['addr'] = $wsmcode['addr'];//地址
+       isset($wsmcode['contactor_name'])?  $info['contactor'] =$wsmcode['contactor_name']:'';//联系人
+       isset($wsmcode['mobile'])?  $info['mobile'] =$wsmcode['mobile']:'';//联系人
+       isset($wsmcode['addrs_code'])?  $info['addr_code'] =$wsmcode['addrs_code']:'';//联系人
+       isset($wsmcode['addr'])?  $info['addr'] =$wsmcode['addr']:'';//联系人
+       isset($wsmcode['contactor_name'])?  $info['contactor'] =$wsmcode['contactor_name']:'';//联系人
+//        $info['position'] = $wsmcode['position'];//职位
+//        $info['mobile'] = $wsmcode['mobile'];//电话
+//        $info['addrs_code'] = json_decode($wsmcode['addrs_code'], true);//省市区编码
+//        $info['addr'] = $wsmcode['addr'];//地址
         $info['spuCode'] = $orderinfo['good_code'];//地址
         $info['skuCode'] = $orderinfo['skuCode'];//地址
+        $info['return_tag'] = $info['return_tag']==0?"":$info['return_tag'];//地址
+        $info['is_th'] = $info['is_th']==0?"":$info['is_th'];//地址
 
         return app_show(0,"获取成功",$info);
     }

app/admin/controller/Consult.php

@@ -993,6 +993,8 @@ class Consult extends Base
                 $feed['cat_id']=$cat_id;
                 $feed['sale_price']=$saleprice;
                 $feed['origin_price']=$total_fee;
+                $feed['updatetime']=date("Y-m-d H:i:s");
+
                 $temp['updatetime']=date("Y-m-d H:i:s");
                 $nu = Db::name("project_feedback")->save($feed);
                 if($nu==false){
@@ -1003,14 +1005,17 @@ class Consult extends Base
                     $projectinfo['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($projectinfo);
                     if($up){
-                        $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
-                            ->count();
-                        if($count==0){
-                            $proc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->save
-                            (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-                            if($proc==false){
-                                Db::rollback();
-                                return error_show(1006,"项目反馈失败");
+                        $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->count();
+
+                        if ($count == 0) {
+                            //先查询是否存在status==1的项目，有的话再更新，否则跳过
+                            $project_id = Db::name("project")->where(["projectNo" => $projectinfo['projectNo'], "status" => 1])->value('id', 0);
+                            if ($project_id) {
+                                $proc = Db::name("project")->where(["id" => $project_id])->update(["status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
+                                if ($proc == false) {
+                                    Db::rollback();
+                                    return error_show(1006, "项目反馈失败");
+                                }
                             }
                         }
                     }
@@ -1120,6 +1125,7 @@ class Consult extends Base
         }
     }
 
+    //选择商品
     public function bids_check(){
         $bidNo = isset($this->post['bidNo'])&& $this->post['bidNo']!=""?trim($this->post['bidNo']):"";
         if($bidNo===""){
@@ -1158,6 +1164,7 @@ class Consult extends Base
         }
     }
 
+    //议价审核
     public function bargain_status(){
         $bargainNo = isset($this->post['bargainNo'])&& $this->post['bargainNo']!=""?trim($this->post['bargainNo']):"";
         if($bargainNo===""){
@@ -1367,21 +1374,24 @@ class Consult extends Base
             ("zxNo");
             $where[] = ['zxNo','in',$zxlist];
         }
+        $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
+        if($is_own==1){
+             $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+            if($token==""){
+                return error_show(101,'token不能为空');
+            }
+            $apply_id =GetUserInfo($token);
+            if(empty($apply_id)||$apply_id['code']!=0){
+                return error_show(1002,"申请人数据不存在");
+            }
+            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+            $where[]=['createrid',"=",$rm];
+        }
 
-//        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//        }
-//        $apply_id =GetUserInfo($token);
-//        if(empty($apply_id)||$apply_id['code']!=0){
-//            return error_show(1002,"申请人数据不存在");
-//        }
-//        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-//        $where[]=['createrid',"=",$rm];
         $count = Db::name('consult_bids')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list =Db::name('consult_bids')->where($where)->page($page,$size)->select();
+        $list =Db::name('consult_bids')->where($where)->page($page,$size)->select()->toArray();
         $data=[];
         foreach ($list as $value){
             $catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
@@ -1419,7 +1429,13 @@ class Consult extends Base
             $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
             $value['bargain_status']=$bidinfo['bargain_status'];
-            $data[]=$value;
+
+            //reject驳回原因，status==5表示驳回
+            $value['reject']=[];
+            if ($value['status'] == 5) {
+                $value['reject'] = Db::name('bargain_order')->where(['infoNo' => $infoNo])->whereIn('status', [5, 6])->column('remark');
+            }
+            $data[] = $value;
         }
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);
     }
@@ -1448,14 +1464,19 @@ class Consult extends Base
         if($token==''){
             return error_show(102,"参数token不能为空");
         }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(105,"用户数据不存在");
-//        }
-
-//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $where[] = ["createrid","=",$createrid];
+        $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
+        if($is_own==1){
+            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+            if($token==""){
+                return error_show(101,'token不能为空');
+            }
+            $apply_id =GetUserInfo($token);
+            if(empty($apply_id)||$apply_id['code']!=0){
+                return error_show(1002,"申请人数据不存在");
+            }
+            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+            $where[]=['createrid',"=",$rm];
+        }
         $list =Db::name('consult_bids')->where($where)->select();
         $data=[];
         foreach ($list as $value){

app/admin/controller/Good.php

@@ -119,8 +119,13 @@ class Good extends Base
             ->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)->page
-        ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status")
+        $list = Db::name('good')
+            ->alias("a")
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status,gb.createrid purchase_id,gb.creater purchase")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+            ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
+            ->where($where)
+            ->page($page,$size)
             ->order("b.addtime desc")
             ->select();
         $data=[];
@@ -519,6 +524,8 @@ class Good extends Base
                     $item_good['specinfo'] = $speclist;
                     $item_good['unit'] = $good_unit_s[$item_good['good_unit']]??'';
                     $item_good['brand_name'] = $brands[$item_good['brand_id']]??'';
+                    $item_good['can'] = made($item_good['cat_id'],[]);
+
                 }
 
 

app/admin/controller/Goodup.php

@@ -253,7 +253,7 @@ class Goodup extends Base
         }
         $lead_time = isset($this->post['lead_time'])&&$this->post['lead_time']!==""? intval($this->post['lead_time'])
             :"0";
-        $cgd_gold_price =isset($ths->post['cgd_gold_price'])&&$ths->post['cgd_gold_price']!==""?floatval($ths->post['cgd_gold_price']):"0";
+        $cgd_gold_price =isset($this->post['cgd_gold_price'])&&$this->post['cgd_gold_price']!==""?floatval($this->post['cgd_gold_price']):"0";
 
 
 //        if($lead_time===""){
@@ -299,16 +299,16 @@ class Goodup extends Base
         }
         $nake_price = isset($this->post['nake_price'])&&$this->post['nake_price']!==""? floatval($this->post['nake_price']):"0";
 
-        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
-        if($is_step===""){
-            return error_show(1004,"参数is_step不能为空");
-        }
+//        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
+//        if($is_step===""){
+//            return error_show(1004,"参数is_step不能为空");
+//        }
 
         $speclist = isset($this->post['speclist'])&&!empty($this->post['speclist'])? $this->post['speclist']:"";
         $good_ladder = isset($this->post['good_ladder'])&&!empty($this->post['good_ladder'])? $this->post['good_ladder']:"";
-        if($is_step==1 &&  $good_ladder==""){
-            return error_show(1004,"启用阶梯，阶梯价不能为空");
-        }
+//        if($is_step==1 &&  $good_ladder==""){
+//            return error_show(1004,"启用阶梯，阶梯价不能为空");
+//        }
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){
             return error_show(105,"参数token不能为空");
@@ -375,7 +375,7 @@ class Goodup extends Base
                 "is_diff"=>$is_diff,
                 "config"=>$config,
                 "other_config"=>$other_config,
-                "is_step"=>$is_step,
+                "is_step" => count($good_ladder) > 1 ? 1 : 0,//如果阶梯价个数大于1，说明启用阶梯价
                 "is_online"=>0,
                 "status"=>0,
                 "createrid"=>$createrid,
@@ -426,6 +426,8 @@ class Goodup extends Base
                         }else{
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
+                        $lemp['creater_id'] = $createrid;
+                        $lemp['creater'] = $creater;
                         $lemp['is_del'] = 0;
                         $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
@@ -705,14 +707,14 @@ class Goodup extends Base
             return error_show(1004,"参数market_price不能为空");
         }
         $nake_price = isset($this->post['nake_price'])&&$this->post['nake_price']!==""? floatval($this->post['nake_price']):"";
-        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
-        if($is_step===""){
-            return error_show(1004,"参数is_step不能为空");
-        }
+//        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
+//        if($is_step===""){
+//            return error_show(1004,"参数is_step不能为空");
+//        }
         $good_ladder = isset($this->post['good_ladder'])&&!empty($this->post['good_ladder'])? $this->post['good_ladder']:"";
-        if($is_step==1 &&  $good_ladder==""){
-            return error_show(1004,"启用阶梯，阶梯价不能为空");
-        }
+//        if($is_step==1 &&  $good_ladder==""){
+//            return error_show(1004,"启用阶梯，阶梯价不能为空");
+//        }
         $data=[
             "cert_fee"=>$cert_fee,
             "packing_fee"=>$packing_fee,
@@ -726,7 +728,7 @@ class Goodup extends Base
             "market_price"=>$market_price,
             "nake_price"=>$nake_price,
             "cgd_gold_price"=>$cgd_gold_price,
-            "is_step"=>$is_step,
+            "is_step" => count($good_ladder) > 1 ? 1 : 0,
             "status"=>"2",
             "updatetime"=>date("Y-m-d H:i:s")
         ];
@@ -743,6 +745,9 @@ class Goodup extends Base
                 ChangeLog::logAdd(3,$datas['spuCode'],$jsp,$json,$this->post['token'],$this->post);
                 $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save(["is_online"=>0,"status"=>0,"updatetime"=>date("Y-m-d H:i:s")]);
                 if($good_ladder!=="" && !empty($good_ladder)){
+
+                    $user =GetUserInfo($this->post['token']);
+
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         isset($value["id"])&&$value["id"]!=''?$lemp['id']=$value['id']:"";
@@ -764,6 +769,8 @@ class Goodup extends Base
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
+                        $lemp['createrid'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+                        $lemp['creater'] =isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
                         $count = Db::name("good_nake")->save($lemp);
@@ -1322,6 +1329,8 @@ class Goodup extends Base
                     $tmp['package_fee'] = $value['package_fee'];
                     $tmp['other_fee'] = $value['other_fee'];
                     $tmp['nake_total'] =$value['nake_total'];
+                    $tmp['creater_id']=$createrid;
+                    $tmp['creater']=$creater;
                     $tmp['is_del']=$value['is_del'];
                     $tmp['addtime']=date("Y-m-d H:i:s");
                     $tmp['updatetime']=date("Y-m-d H:i:s");
@@ -1550,14 +1559,14 @@ class Goodup extends Base
         }
         $nake_price = isset($this->post['nake_price'])&&$this->post['nake_price']!==""? floatval($this->post['nake_price']):"0";
 
-        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
-        if($is_step===""){
-            return error_show(1004,"参数is_step不能为空");
-        }
+//        $is_step = isset($this->post['is_step'])&&$this->post['is_step']!==""? intval($this->post['is_step']):"";
+//        if($is_step===""){
+//            return error_show(1004,"参数is_step不能为空");
+//        }
         $good_ladder = isset($this->post['good_ladder'])&&!empty($this->post['good_ladder'])? $this->post['good_ladder']:"";
-        if($is_step==1 &&  $good_ladder==""){
-            return error_show(1004,"启用阶梯，阶梯价不能为空");
-        }
+//        if($is_step==1 &&  $good_ladder==""){
+//            return error_show(1004,"启用阶梯，阶梯价不能为空");
+//        }
         $speclist = isset($this->post['speclist'])&&!empty($this->post['speclist'])? $this->post['speclist']:"";
         Db::startTrans();
         try {
@@ -1608,7 +1617,7 @@ class Goodup extends Base
                 "market_price"=>$market_price,
                 "nake_price"=>$nake_price,
                 "cgd_gold_price"=>$cgd_gold_price,
-                "is_step"=>$is_step,
+                "is_step" => count($good_ladder) > 1 ? 1 : 0,
                 "status"=>"0",
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
@@ -1638,6 +1647,9 @@ class Goodup extends Base
                     }
                 }
                 if($good_ladder!=="" && !empty($good_ladder)){
+
+                    $user =GetUserInfo($this->post['token']);//获取用户信息，下面更新成本表的创建人
+
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         isset($value["id"])&&$value["id"]!=''?$lemp['id']=$value['id']:"";
@@ -1659,6 +1671,8 @@ class Goodup extends Base
                         }else{
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
+                        $lemp['creater_id'] = isset($user["data"]['id']) ? $user["data"]['id'] : 0;
+                        $lemp['creater'] = isset($user["data"]['nickname']) ? $user["data"]['nickname'] : "";
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");

app/admin/controller/Purchin.php

@@ -783,11 +783,13 @@ class Purchin extends BaseController
                     Db::rollback();
                     return error_show(1002,"验货审核失败");
                 }
+
+                $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
+                $process = ["order_code" => $info['wsm_in_code'], "order_id" => $res, "order_status" => 0, "order_type" => 'RKTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
             }
-            $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
-            $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$res,"order_status"=>0,"order_type"=>'RKTHD'];
-            ProcessOrder::AddProcess($this->post['token'],$process);
+
             Db::commit();
             return app_show(0,"验货审核完成");
         }

app/admin/controller/Sale.php

@@ -587,7 +587,7 @@ class Sale extends Base
                         }
 
                         //维护商品所在仓库的库存 --- start
-                        $temp = Db::name('wsm_good_stock')
+                        $temp = Db::name('good_stock')
                             ->field('id,usable_stock,wait_out_stock')
                             ->where(['spuCode' => $val['spuCode'], 'wsm_code' => $cgdinfo['wsm_code']])
                             ->find();
@@ -601,7 +601,7 @@ class Sale extends Base
                             return error_show(1004, '库存不足');
                         }
 
-                        $up =Db::name('wsm_good_stock')
+                        $up =Db::name('good_stock')
                             ->where('id', $temp['id'])
                             ->update([
                                 'usable_stock' => $temp['usable_stock'] - $ornum,
@@ -614,7 +614,6 @@ class Sale extends Base
                         }
                         //维护商品所在仓库的库存 --- end
 
-
                         if($num==0){
                             break;
                         }
@@ -672,6 +671,9 @@ class Sale extends Base
         if($sendtype==""){
             return error_show(1003,"参数sendtype不能为空");
         }
+
+        $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']):"";
+
         $orderCode = makeNo("QR");
         $spuCode = $zxinfo['spuCode'];
         $skuCode = "";
@@ -746,7 +748,7 @@ class Sale extends Base
                 "zxNo"=>$bidNo,
                 "platform_order"=>"",
                 "platform_id"=>0,
-                "remark"=>"",
+                "remark"=>$remark,
                 "arrive_time"=>$arrtime,
                 "is_stock"=>0,
                 "is_activity"=>0,
@@ -1907,7 +1909,7 @@ class Sale extends Base
                         "cgdNo" => $cgd,
                         "bkcode" => $dio['orderCode'],
                         "wsm_code" => $wsm['wsm_code'],
-                        "cgder_id" => "0",
+                        "cgder_id" => Db::name('depart_user')->where('nickname',$zxinfo['saler'])->value('uid')??0,//重名以及多个账号的话…………
                         "cgder" => $zxinfo['saler'],
                         "good_code" => "GD-" . $zxinfo['cpNo'],
                         "good_name" => $zxinfo['cpName'],