Merge branch 'master-online' of http://120.46.155.214:3000/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);
     }
@@ -276,6 +294,13 @@ class After extends \app\BaseController
                 return error_show(1005,"参数is_post不能为空");
             }
             $info['is_post']=$post;
+            $return_tag =isset($this->post['return_tag'])&&$this->post['return_tag']!==""? intval($this->post['return_tag']):"";
+            if($return_tag===""){
+                return error_show(1005,"参数return_tag不能为空");
+            }
+            $info['return_tag']=$return_tag;
+            $is_th =isset($this->post['is_th'])&&$this->post['is_th']!==""? intval($this->post['is_th']):"0";
+            $info['is_th']=$is_th;
         }
 //        $status = $info['order_status']==1&&$info['order_type']==1 && $status==1?4:$status;
         Db::startTrans();
@@ -314,10 +339,16 @@ class After extends \app\BaseController
         if($info['status']!=3){
             return error_show(1005,"采购主管未审核无法设置退回仓库");
         }
-        $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code'])
-            :"";
-        if($wsm_code==""){
-            return error_show(1005,"参数wsm_code 不能为空");
+        $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']) :"";
+        if($info['return_tag']==2) {
+            if($wsm_code==""){
+                return error_show(1005,"参数 wsm_code 不能为空");
+            }
+           $warehouse =Db::name("warehouse_info")->where(["wsm_code"=>$wsm_code])->find();
+            if($warehouse==false){
+                return error_show(1005,"仓库数据未找到");
+            }
+            $wareaddr =Db::name("warehouse_addr")->where(["wsm_code"=>$wsm_code,"is_del"=>0,"status"=>1])->find();
         }
         $addrcode=isset($this->post['addr_code'])&&$this->post['addr_code']!=""?$this->post['addr_code']:"";
         if($addrcode==""){
@@ -348,10 +379,46 @@ class After extends \app\BaseController
         try {
             $in=Db::name("order_returninfo")->insert($returninfo);
             if($in){
+                if($info['return_tag']==2 &&$wareaddr==false) {
+                        $addrs =[
+                            "wsm_code"=>$wsm_code,
+                            "wsm_type"=>1,
+                            "wsm_name"=>$contactor,
+                            "wsm_addr"=>$addr,
+                            "addr_code"=>$addrcode,
+                            "wsm_mobile"=>$mobile,
+                            "status"=>'1',
+                            "is_del"=>'0',
+                            "addtime"=>date("Y-m-d H:i:s"),
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                    $wareaddr =Db::name("warehouse_addr")->insert($addrs);
+                    if($wareaddr==false){
+                        Db::rollback();
+                        return app_show(1004,"退货仓库地址录入失败");
+                    }
+                }
+                $old_info_status = $info['status'];
                 $info['status']=4;
                 $info["updatetime"]=date("Y-m-d H:i:s");
                 $up =Db::name("order_return")->save($info);
                 if($up){
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $info['returnCode'],//销售单code
+                        "status" => $old_info_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "SHD", $info['status'], $info);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SHD',
+                        "order_code" => $info['returnCode'],//销售单code
+                        "order_id" => $info['id'],
+                        "order_status" => $info['status']
+                    ]);
+
                     Db::commit();
                     return app_show(0,"退货仓库设置成功");
                 }
@@ -437,7 +504,23 @@ class After extends \app\BaseController
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
-              //  var_dump($contactor);
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $info['returnCode'],//销售单code
+                    "status" => $var,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "SHD", $info['status'], $info);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SHD',
+                    "order_code" => $info['returnCode'],//销售单code
+                    "order_id" => $info['id'],
+                    "order_status" => $info['status']
+                ]);
+
+                //  var_dump($contactor);
                 $returninfo = Db::name("order_returninfo")->where(["returnCode"=>$bkcode])->find();
                 if(empty($returninfo)){
                     $returninfo=[
@@ -819,10 +902,27 @@ class After extends \app\BaseController
             }
             $up =Db::name("order_returninfo")->save($returninfo);
             if($up){
+                $old_info_status = $info['status'];
                 $info['status']=5;
                 $info['updatetime']=date("y-m-d H:i:s");
                 $ro =Db::name("order_return")->save($info);
                 if($ro){
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $info['returnCode'],//销售单code
+                        "status" => $old_info_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "SHD", $info['status'], $info);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SHD',
+                        "order_code" => $info['returnCode'],//销售单code
+                        "order_id" => $info['id'],
+                        "order_status" => $info['status']
+                    ]);
+
                     $thNo =makeNo("ST");
                     $thdata=[
                         "thNo"=>$thNo,
@@ -853,8 +953,24 @@ class After extends \app\BaseController
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
-                    $sav= Db::name("order_back")->insert($thdata);
+                    $sav= Db::name("order_back")->insert($thdata,true);
                     if($sav){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $thdata['thNo'],//销售单code
+                            "status" => $thdata['status'],//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "CKTHD", $thdata['status'], $thdata);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'CKTHD',
+                            "order_code" => $thdata['thNo'],//销售单code
+                            "order_id" => $sav,
+                            "order_status" => $thdata['status']
+                        ]);
+
                         Db::commit();
                         return app_show(0,"退货单新建成功",["thNo"=>$thNo]);
                     }
@@ -891,7 +1007,7 @@ class After extends \app\BaseController
             if (!$res) throw new Exception('该售后单记录修改失败');
 
             //记录日志
-            ActionLog::logAdd($data['token'], ["order_code" => $data['returnCode'], "status" => 8, "action_remark" => '', "action_type" => "cancel"], 'SHD', 8, $this->post);
+            ActionLog::logAdd($data['token'], ["order_code" => $data['returnCode'], "status" => $rs['status'], "action_remark" => '', "action_type" => "cancel"], 'SHD', 8, $this->post);
             ProcessOrder::AddProcess($this->post['token'], ["order_code" => $data['returnCode'], "order_id" => $rs['id'], "order_status" => 8, "order_type" => 'SHD']);
 
             //提交

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/Cat.php

@@ -504,6 +504,29 @@ public function status(){
     if($status===""){
         return error_show(1002,"参数status不能为空");
     }
+    if($status==1){
+        if($stn['rate']===""){
+            return error_show(1003,"单品修改下限未设置");
+        }
+        if($stn['order_rate']===""){
+            return error_show(1003,"预算成本利率未设置");
+        }
+        if($stn['sale_rate']===""){
+            return error_show(1003,"分类成本售价利率未设置");
+        }
+        if($stn['lower_rate']===""){
+            return error_show(1003,"分类最低毛利率未设置");
+        }
+//        if($stn['money_rate']==""){
+//            return error_show(1003,"分类财务利率未设置");
+//        }
+//        if($stn['low_rate']==""){
+//            return error_show(1003,"分类最低毛利未设置");
+//        }
+        if($stn['fund_code']==""){
+            return error_show(1003,"分类核算码未设置");
+        }
+    }
     if ($stn['level']==3) {
         if($status==1){
             $can = made($stn['id']);

app/admin/controller/Consult.php

@@ -148,6 +148,7 @@ class Consult extends Base
         if($token==''){
             return error_show(105,"参数token不能为空");
         }
+
         $user =GetUserInfo($token);
         if(empty($user)||$user['code']!=0){
             return error_show(102,"用户数据不存在");
@@ -201,7 +202,7 @@ class Consult extends Base
                         "brand_id"=>$value['brand_id'],
                         "arrival_time"=>$value['arrival_time'],
                         "specinfo"=>empty($specinfo)?"" : json_encode($specinfo),
-                        "cost_desc"=>$value['cost_desc'],
+                        "cost_desc" => isset($value['cost_desc']) ? $value['cost_desc'] : '',
                         "is_addrs"=>$value['is_addrs'],
                         "is_custom"=>$value['is_custom'],
                         "metal_id"=>$value['metal_id'],
@@ -219,12 +220,28 @@ class Consult extends Base
                         "status"=>1,
                         "is_del"=>0,
                         "addtime"=>date("Y-m-d H:i:s"),
-                        "updatetime"=>date("Y-m-d H:i:s")
+                        "updatetime"=>date("Y-m-d H:i:s"),
+                        'enclosure_file'=>isset($value['enclosure_file'])?$value['enclosure_file']:'',
                     ];
                     $up = Db::name("consult_info")->insert($info);
                     if(!$up){
                         Db::rollback();
                         return error_show(1004,'添加失败');
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $infoNo,//咨询单详情编号
+                            "status" => 1,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "ZXD", 1, $info);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $infoNo,//咨询单详情编号
+                            "order_id" => 0,
+                            "order_status" => 1
+                        ]);
                     }
                 }
                 $stn = ["order_code"=>$zxNo,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
@@ -329,6 +346,8 @@ class Consult extends Base
             return error_show(1004,"未找到信息数据");
         }
 
+        $enclosure_file =isset($this->post['enclosure_file'])&&$this->post['enclosure_file']!=""?trim($this->post['enclosure_file']):$zxinfo['enclosure_file'];
+
         $good_name= isset($this->post['good_name'])&&$this->post['good_name']!=""?trim($this->post['good_name']):"";
         if($good_name==""){
             return error_show(1003,"参数good_name不能为空");
@@ -359,9 +378,9 @@ class Consult extends Base
             return error_show(1003,"参数specinfo不能为空");
         }
         $cost_desc= isset($this->post['cost_desc'])&&$this->post['cost_desc']!=""?trim($this->post['cost_desc']):"";
-        if($cost_desc==""){
-            return error_show(1003,"参数cost_desc不能为空");
-        }
+//        if($cost_desc==""){
+//            return error_show(1003,"参数cost_desc不能为空");
+//        }
         $is_addrs= isset($this->post['is_addrs'])&&$this->post['is_addrs']!==""?intval($this->post['is_addrs']):"";
         if($is_addrs===""){
             return error_show(1003,"参数is_addrs不能为空");
@@ -469,10 +488,27 @@ class Consult extends Base
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
-                'bargain_status'=>1
+                'bargain_status'=>1,
+                'enclosure_file'=>$enclosure_file
             ];
             $up = Db::name("consult_info")->insert($info);
             if($up){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $innew,//咨询单详情编号
+                    "status" => 1,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "ZXD", 1, $info);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'ZXD',
+                    "order_code" => $innew,//咨询单详情编号
+                    "order_id" => 0,
+                    "order_status" => 1
+                ]);
+
                 if (!empty($bidlist)){
                     foreach ($bidlist as $value){
                         unset($value['id']);
@@ -495,6 +531,22 @@ class Consult extends Base
                 if($bar==false){
                     Db::rollback();
                     return error_show(1004,"反馈商品更新失败");
+                }else{
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                        "status" => $zxinfo['status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit，更改状态status
+                    ], "ZXD", $zxinfo['status'], $zxinfo);
+
+//                    并没有修改状态
+//                    ProcessOrder::AddProcess($this->post['token'], [
+//                        "order_type" => 'ZXD',
+//                        "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+//                        "order_id" => $zxinfo['id'],
+//                        "order_status" => $zxinfo['status']
+//                    ]);
                 }
 
                 //更新consule_order记录
@@ -526,11 +578,27 @@ class Consult extends Base
         if($status==1&&$zxinfo['status']>1){
             $zxinfo['bargain_num']=+1;
         }
+        $old_zxinfo_status = $zxinfo['status'];
         $zxinfo['status']=$status;
         $zxinfo['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("consult_info")->save($zxinfo);
         if($up){
 
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                "status" => $old_zxinfo_status,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "ZXD", $zxinfo['status'], $zxinfo);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'ZXD',
+                "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                "order_id" => $zxinfo['id'],
+                "order_status" => $zxinfo['status']
+            ]);
+
             return app_show(0,"状态更新成功");
         }else{
             return error_show(1003,"状态更新失败");
@@ -760,10 +828,20 @@ class Consult extends Base
                             Db::rollback();
                             return error_show(1006,"项目反馈失败");
                         }else{
+                            $old_projectinfo_status = $projectinfo['status'];
                             $projectinfo['status']=2;
                             $projectinfo['updatetime']=date("Y-m-d H:i:s");
                             $up = Db::name("project_info")->save($projectinfo);
                             if($up){
+
+                                //修改状态，添加待办，只记录动作
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $projectinfo['pgNo'],//编码
+                                    "status" => $old_projectinfo_status,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "PRO", 2, $projectinfo);
+
                                 $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
                                     ->count();
                                 if($count==0){
@@ -774,7 +852,23 @@ class Consult extends Base
                                         if($proc==false){
                                             Db::rollback();
                                             return error_show(1006,"项目反馈失败");
+                                        }else{
+                                            //修改状态，添加待办
+                                            ActionLog::logAdd($this->post['token'], [
+                                                "order_code" => $projetc['projectNo'],//项目编码
+                                                "status" => 1,//这里的status是之前的值
+                                                "action_remark" => '',//备注
+                                                "action_type" => "status"//新建create，编辑edit，更改状态status
+                                            ], "PRO", 2, $projetc);
+
+                                            ProcessOrder::AddProcess($this->post['token'], [
+                                                "order_type" => 'PRO',
+                                                "order_code" => $projetc['projectNo'],
+                                                "order_id" => $projetc['id'],
+                                                "order_status" => 2
+                                            ]);
                                         }
+
                                     }
                                 }
                             }
@@ -993,24 +1087,55 @@ 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){
                     Db::rollback();
                     return error_show(1006,"项目反馈失败");
                 }else{
+                    $old_projectinfo_status = $projectinfo['status'];
                     $projectinfo['status']=2;
                     $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,"项目反馈失败");
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectinfo['pgNo'],//编码
+                            "status" => $old_projectinfo_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 2, $projectinfo);
+
+                        $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, "项目反馈失败");
+                                }else{
+                                    //修改状态，添加待办
+                                    ActionLog::logAdd($this->post['token'], [
+                                        "order_code" => $projectinfo['projectNo'],//项目编码
+                                        "status" => 1,//这里的status是之前的值
+                                        "action_remark" => '',//备注
+                                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                                    ], "PRO", 2, $this->post);
+
+                                    ProcessOrder::AddProcess($this->post['token'], [
+                                        "order_type" => 'PRO',
+                                        "order_code" => $projectinfo['projectNo'],
+                                        "order_id" => $project_id,
+                                        "order_status" => 2
+                                    ]);
+                                }
+
                             }
                         }
                     }
@@ -1103,10 +1228,27 @@ class Consult extends Base
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $up =Db::name("consult_bids")->save($info);
                if($up){
+                   $old_infos_status = $infos['status'];
                    $infos['status']=3;
                    $infos['updatetime']=date("Y-m-d H:i:s");
                    $ups =Db::name("consult_info")->save($infos);
                    if($ups){
+
+                       //修改状态，添加待办
+                       ActionLog::logAdd($this->post['token'], [
+                           "order_code" => $infos['infoNo'],//咨询单详情编号
+                           "status" => $old_infos_status,//这里的status是之前的值
+                           "action_remark" => '',//备注
+                           "action_type" => "status"//新建create，编辑edit，更改状态status
+                       ], "ZXD", $infos['status'], $infos);
+
+                       ProcessOrder::AddProcess($this->post['token'], [
+                           "order_type" => 'ZXD',
+                           "order_code" => $infos['infoNo'],//咨询单详情编号
+                           "order_id" => $infos['id'],
+                           "order_status" => $infos['status']
+                       ]);
+
                        Db::commit();
                        return app_show(0,"议价单生成成功",["bargainNo"=>$bargainNo]);
                    }
@@ -1120,6 +1262,7 @@ class Consult extends Base
         }
     }
 
+    //选择商品
     public function bids_check(){
         $bidNo = isset($this->post['bidNo'])&& $this->post['bidNo']!=""?trim($this->post['bidNo']):"";
         if($bidNo===""){
@@ -1142,10 +1285,27 @@ class Consult extends Base
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $bids = Db::name("consult_bids")->save($info);
                 if($bids){
+                    $old_infos_status = $infos['status'];
                     $infos['status']=4;
                     $infos['updatetime']=date("Y-m-d H:i:s");
                     $se = Db::name("consult_info")->save($infos);
                     if($se){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $infos['infoNo'],//咨询单详情编号
+                            "status" => $old_infos_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "ZXD", $infos['status'], $infos);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $infos['infoNo'],//咨询单详情编号
+                            "order_id" => $infos['id'],
+                            "order_status" => $infos['status']
+                        ]);
+
                         Db::commit();
                         return app_show(0,"商品确定成功");
                     }
@@ -1158,6 +1318,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 +1528,24 @@ class Consult extends Base
             ("zxNo");
             $where[] = ['zxNo','in',$zxlist];
         }
-
-        $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,"申请人数据不存在");
+        $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];
         }
-        $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 +1583,17 @@ 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')
+                    ->field('id,remark,status')
+                    ->where(['infoNo' => $infoNo, 'bidsNo' => $value['bidNo']])
+                    ->whereIn('status', [5, 6])
+                    ->find();
+            }
+            $data[] = $value;
         }
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);
     }
@@ -1448,14 +1622,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/Data.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace app\admin\controller;
+
+use think\App;
+use think\facade\Db;
+
+//数据统计类
+class Data extends Base
+
+{
+    //数据看板，获取相关统计数据
+    public function index()
+    {
+        $data = [];
+
+        //1.今日销量(单数、金额)
+        $data['today_sales_volume'] = [
+            'orders_number' => '0',
+            'money' => '00.00'
+        ];
+
+        //2.今日销冠(部门、姓名、单数、金额)
+        $data['today_sales_champion'] = [
+            'company_id' => '0',
+            'company' => 'xxx部',
+            'nickname' => '张三',
+            'orders' => '0',
+            'money' => '00.00'
+        ];
+
+        //3.今日采购(采购订单数量、商品数量、竞价单数、反馈商品数)
+        $data['today_purchase'] = [
+            'orders' => '0',
+            'goods' => '0',
+            'bidding_orders' => '0',
+            'feedback_goods' => '0'
+        ];
+
+        //4.今日订单列表(按照完成率排序，前三名的部门、单数、金额)
+        $data['today_order'] = [
+            ['company' => 'xxx部', 'orders' => '30', 'money' => '300'],
+            ['company' => 'xx部', 'orders' => '20', 'money' => '200'],
+            ['company' => 'x部', 'orders' => '10', 'money' => '100'],
+        ];
+
+        //5.本月完成率列表(按照完成率排序，前三名的部门、完成单数和完成率，区分今日、本周、本月和毛利率状态：2达标、1最低、0不达标等情况)
+        $data['month_completion_rate'] = [
+            'today' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
+            ],
+            'week' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
+            ],
+            'month' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
+            ],
+        ];
+
+        //6.待开票(单数、金额)
+        $data['wait_invoice'] = [
+            'orders' => '10',
+            'money' => '34.45'
+        ];
+
+        //7.待回款(单数、金额)
+        $data['wait_return'] = [
+            'orders' => '100',
+            'money' => '3.45'
+        ];
+
+        //8.待回票(单数、金额)
+        $data['wait_ticket'] = [
+            'orders' => '8',
+            'money' => '38.5'
+        ];
+
+        //9.待付款(单数、金额)
+        $data['wait_payment'] = [
+            'orders' => '34',
+            'money' => '5338.58'
+        ];
+
+
+
+        //10.竞价(招标单数、未竞标单数)
+        $data['bidding'] = [
+            'bidding_orders' => '10',
+            'no_bidding_orders' => '2'
+        ];
+
+        //11.采购单(采购单数、未下单数)
+        $data['purchase'] = [
+            'purchase_orders' => '10',
+            'no_purchase_orders' => '2'
+        ];
+
+        //12.采购单(采购下单数、未生产单数)
+        $data['purchase_2'] = [
+            'orders' => '10',
+            'no_orders' => '2'
+        ];
+
+        //13.未发货(单数、商品数)
+        $data['no_deliver'] = [
+            'orders' => '10',
+            'goods' => '2'
+        ];
+
+        //14.转单率(部门名称、今日转单率、本月转单率，今年转单率，按照年度转单率排序)
+        $data['transfer_order_rate'] = [
+            ['company' => 'xxx部', 'today_tor' => '34%', 'month_tor' => '68%', 'year_tor' => '45%'],
+            ['company' => 'xx部', 'today_tor' => '34%', 'month_tor' => '68%', 'year_tor' => '40%'],
+            ['company' => 'x部', 'today_tor' => '34%', 'month_tor' => '68%', 'year_tor' => '6%'],
+        ];
+
+        return app_show(0, '请求成功', $data);
+
+    }
+
+}

app/admin/controller/Good.php

@@ -6,6 +6,7 @@ namespace app\admin\controller;
 use app\admin\model\GoodLog;
 use think\App;
 use think\facade\Db;
+use think\facade\Validate;
 
 //线上商品
 class Good extends Base
@@ -119,8 +120,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=[];
@@ -252,6 +258,16 @@ class Good extends Base
         $proof =Db::name("good_proof")->where(["spuCode"=>$good_platform['spuCode'],"is_del"=>0])->order("updatetime desc")->field("id,proof_type,proof_url")->find();
         $data['proof'] = isset($proof)&&$proof!=false? $proof:[];
         $data["nakelist"]=$nakearry;
+
+        //补充采购员字段
+        //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+        $temp_basic_info = Db::name('good_basic')
+            ->field('id,createrid purchase_id,creater purchase')
+            ->where(['spuCode'=>$data['spuCode'],'is_del'=>0])
+            ->find();
+        $data['purchase_id'] = $temp_basic_info['purchase_id'];
+        $data['purchase'] = $temp_basic_info['purchase'];
+
         return app_show(0,"获取成功",$data);
     }
 
@@ -282,7 +298,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,"预警库存更新成功");
@@ -451,29 +468,39 @@ class Good extends Base
     public function GetStockWsm(){
         $page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
         $size = isset($this->post['size']) &&$this->post['size'] !=="" ? intval($this->post['size']):10;
-        $condition = [["is_del","=",0]];
+        $condition = [["gs.is_del","=",0]];
         $wsm_code = isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']):"";
         if($wsm_code!==""){
-            $condition[]=["wsm_code","=",$wsm_code];
+            $condition[]=["gs.wsm_code","=",$wsm_code];
         }
         $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($suplierNo!==""){
             $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["wsm_code","in",$wsmcode];
+            $condition[]=["gs.wsm_code","in",$wsmcode];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["wsm_code","in",$wsmcode];
+            $condition[]=["gs.wsm_code","in",$wsmcode];
         }
-        $build= Db::name("good_stock")->where($condition)->group("wsm_code")->field("wsm_code")->buildSql();
+        $build= Db::name("good_stock")
+            ->alias('gs')
+            ->where($condition)
+            ->where('whi.wsm_type','<>',2)//2表示虚拟仓，虚拟仓不参加统计
+            ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
+            ->group("gs.wsm_code")
+            ->field("gs.wsm_code")
+            ->buildSql();
         $count = Db::table($build." a")->count();
         $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
         $list = Db::name("good_stock")
+            ->alias('gs')
             ->where($condition)
+            ->where('whi.wsm_type','<>',2)//2表示虚拟仓，虚拟仓不参加统计
             ->page($page,$size)
-            ->group("wsm_code")
-            ->field("wsm_code,sum(wait_in_stock) wait_in_stock,sum(wait_out_stock) wait_out_stock,sum(usable_stock) usable_stock,sum(intra_stock) intra_stock,sum(warn_stock) warn_stock,sum(total_stock) total_stock")
+            ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
+            ->group("gs.wsm_code")
+            ->field("gs.wsm_code,sum(wait_in_stock) wait_in_stock,sum(wait_out_stock) wait_out_stock,sum(usable_stock) usable_stock,sum(intra_stock) intra_stock,sum(warn_stock) warn_stock,sum(total_stock) total_stock")
             ->select()
             ->toArray();
         $data=[];
@@ -518,6 +545,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'],[]);
+
                 }
 
 
@@ -634,28 +663,34 @@ class Good extends Base
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function Stat(){
-        $condition =[["is_del","=",0]];
+        $condition =[["gs.is_del","=",0]];
         $wsm_code = isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']):"";
         if($wsm_code!=""){
-            //$condition["wsm_code"] = $wsm_code;
-            $condition[]=["wsm_code","=",$wsm_code];
+            //$condition["gs.wsm_code"] = $wsm_code;
+            $condition[]=["gs.wsm_code","=",$wsm_code];
         }
         $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
         if($suplierNo!==""){
             $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["wsm_code","in",$wsmcode];
+            $condition[]=["gs.wsm_code","in",$wsmcode];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             // $where['khNo'] = $khNo;
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["wsm_code","in",$wsmcode];
+            $condition[]=["gs.wsm_code","in",$wsmcode];
         }
 //        $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
 //        if($type_code!=""){
-//            $condition[] = ["good_type_code","=",$type_code];
+//            $condition[] = ["gs.good_type_code","=",$type_code];
 //        }
-        $statlist = Db::name("good_stock")->where($condition)->field("sum(wait_in_stock) as wait_in_stock,sum(wait_out_stock) as wait_out_stock ,sum(usable_stock) as usable_stock,sum(intra_stock) as intra_stock,sum(total_stock) as total_stock,sum(warn_stock) as warn_stock")->find();
+        $statlist = Db::name("good_stock")
+            ->alias('gs')
+            ->where($condition)
+            ->where('whi.wsm_type','<>',2)//2表示虚拟仓，虚拟仓不参与
+            ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
+            ->field("sum(gs.wait_in_stock) as wait_in_stock,sum(gs.wait_out_stock) as wait_out_stock ,sum(gs.usable_stock) as usable_stock,sum(gs.intra_stock) as intra_stock,sum(gs.total_stock) as total_stock,sum(gs.warn_stock) as warn_stock")
+            ->find();
         return app_show(0,"获取成功",$statlist);
     }
 
@@ -836,4 +871,83 @@ class Good extends Base
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
     }
 
+
+    //根据价格区间，筛选符合条件的商品列表
+    public function getGoodListByLadder()
+    {
+
+        //1.请求参数
+        $param=$this->request->only(['min_price','max_price','page'=>1,'size'=>15],'post','trim');
+
+        //2.参数校验
+        $val=Validate::rule([
+            'min_price'=>'require|float|elt:max_price',
+            'max_price'=>'require|float|egt:min_price',
+            'page'=>'require|number|gt:0',
+            'size'=>'require|number|gt:0',
+        ]);
+
+        if(!$val->check($param)) return error_show(1004,$val->getError());
+
+        //3.组织SQL语句
+        $skuCodes = Db::name('good_ladder')
+            ->field('skuCode')
+            ->whereBetween('sale_price', [$param['min_price'], $param['max_price']])
+            ->where(['is_del' => 0, 'status' => 1])
+            ->group('skuCode')
+            ->buildSql();
+
+        //4.查询列表并补充相关信息(从list方法照搬)
+        $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,gl.min_num,gl.max_num")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+            ->leftJoin("good_platform b", "a.spuCode=b.spuCode")
+            ->leftJoin("good_basic gb", "gb.spuCode=a.spuCode")
+            ->leftJoin("good_ladder gl", "gl.skuCode=b.skuCode")
+            ->where('b.skuCode in ' . $skuCodes)
+            ->page($param['page'], $param['size'])
+            ->order("b.addtime desc")
+            ->select();
+        $data = [];
+        foreach ($list as $value) {
+            $value['cat_info'] = made($value['cat_id'], []);
+            $platform = Db::name("platform")->where(["id" => $value['platform_code']])->find();
+            $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name'] : "";
+            $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en'] : "";
+            $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
+            $value['supplier_name'] = isset($supplier['name']) ? $supplier['name'] : "";
+            $brand = Db::name("brand")->where(["id" => $value['brand_id']])->find();
+            $value["brand_name"] = isset($brand['brand_name']) ? $brand['brand_name'] : "";
+            $unit = Db::name("unit")->where(["id" => $value['good_unit']])->find();
+            $value['unit'] = isset($unit['unit']) ? $unit['unit'] : "";
+            $company = Db::name("business")->where(["companyNo" => $value['companyNo']])->find();
+            $value['company'] = isset($company['company']) ? $company['company'] : "";
+            $value['stock_total'] = Db::name("good_stock")->where(['spuCode' => $value['spuCode'], "is_del" => 0])->sum("usable_stock");
+            $value['status'] = $value['exam_status'];
+            $value['exclusive'] = makeExcluse($value['is_exclusive']);
+            $value['good_info_img'] = $value['good_info_img'];
+            $value['good_img'] = $value['good_img'];
+            $spec = Db::name("good_spec")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->select()->toArray();
+            $speclist = [];
+            if (!empty($spec)) {
+                foreach ($spec as $val) {
+                    $temp = [];
+                    $temp['spec_id'] = $val['spec_id'];
+                    $temp['spec_value_id'] = $val['spec_value_id'];
+                    $sp = Db::name("specs")->where(["id" => $val['spec_id']])->find();
+                    $temp['spec_name'] = isset($sp["spec_name"]) ? $sp["spec_name"] : "";
+                    $spv = Db::name("spec_value")->where(["id" => $val['spec_value_id']])->find();
+                    $temp['spec_value'] = isset($spv["spec_value"]) ? $spv["spec_value"] : "";
+                    $speclist[] = $temp;
+                }
+            }
+            $value['specinfo'] = $speclist;
+            $value['noble_name'] = isset($value['noble_metal']) && $value['noble_metal'] != 0 ? $this->noble[$value['noble_metal']] : "";
+            $data[] = $value;
+        }
+
+        return app_show(0, '请求成功', $data);
+
+    }
+
 }

app/admin/controller/Goodup.php

@@ -108,12 +108,38 @@ class Goodup extends Base
               ->group("a.spuCode")->column('a.spuCode');
             $where[]=["spuCode","in",$sta];
         }
+        $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(102,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        if($rm!=''){
+            $useinfo = Db::name("user_role")->where(['uid'=>$rm,"status"=>1,"is_del"=>0])->find();
+            if($useinfo==false){
+                return error_show(1002,"未找到用户角色权限");
+            }
+            $check = checkRole($useinfo['roleid'],115);
+            if($check){
+                $where[]=['createrid', "=" ,$rm];
+            }
+        }
 
         $count = Db::name('good_basic')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('good_basic')->where($where)->page($page,$size)->order("addtime desc")->select();
+        $list = Db::name('good_basic')->where($where)->page($page,$size)->order("addtime desc")->select()->toArray();
         $data=[];
+
+        //查询一下这些spucode是否在平台上成功上线
+        $exam_statuss = Db::name('good_platform')
+            ->whereIn('spuCode',array_column($list,'spuCode'))
+            ->where(['is_del'=>0,'exam_status'=>6])//exam_status==6表示上线审核成功
+            ->column('id','spuCode');
+
         foreach ($list as $value){
                 $value["cat_info"]= made($value['cat_id'],[]);
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
@@ -126,6 +152,12 @@ class Goodup extends Base
                 $value['supplier_name']=isset($supplier['name'])?$supplier['name']:"";
                 $value['exclusive']=makeExcluse($value['is_exclusive']);
                 $value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
+                
+                //如果一个spucode在任意平台上线，那么就视为它上线，即手动把它的is_online值改为1
+                if (!empty($exam_statuss) && isset($exam_statuss[$value['spuCode']])) {
+                    $value['is_online'] = 1;
+                }
+
                 $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
@@ -253,7 +285,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 +331,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 +407,8 @@ class Goodup extends Base
                 "is_diff"=>$is_diff,
                 "config"=>$config,
                 "other_config"=>$other_config,
-                "is_step"=>$is_step,
+                "field_change"=>'',
+                "is_step" => count($good_ladder) > 1 ? 1 : 0,//如果阶梯价个数大于1，说明启用阶梯价
                 "is_online"=>0,
                 "status"=>0,
                 "createrid"=>$createrid,
@@ -418,14 +451,16 @@ class Goodup extends Base
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
                         if($is_gold_price==1){
-                            $gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])
-                                ->order("addtime desc")->find();
+//                            $gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])->order("addtime desc")->find();
+//                            $lemp['nake_total'] =$noble_weight*$gold['price']+ $value['cost_fee']*$noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
 
-                            $lemp['nake_total'] =$noble_weight*$gold['price']+ $value['cost_fee']*
-                                $noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
+                            //成本总计启用实时金价时，采用供应商实时金价
+                            $lemp['nake_total'] = $noble_weight * $cgd_gold_price + $value['cost_fee'] * $noble_weight + $value['mark_fee'] + $value['package_fee'] + $value['cert_fee'] + $value['nake_fee'] + $value['delivery_fee'] + $value['other_fee'];
                         }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");
@@ -587,8 +622,12 @@ class Goodup extends Base
 //        if($sample_day===""){
 //            return error_show(1004,"参数sample_day不能为空");
 //        }
-        $sample_fee = isset($this->post['sample_fee'])&&$this->post['sample_fee']!==""? floatval($this->post['sample_fee']):"0";
-
+     //   $sample_fee = isset($this->post['sample_fee'])&&$this->post['sample_fee']!==""? floatval
+        //($this->post['sample_fee']):"0";
+        $config = isset($this->post['config'])&&$this->post['config']!==""? trim($this->post['config']):"";
+        $other_config = isset($this->post['other_config'])&&$this->post['other_config']!==""? trim($this->post['other_config']):"";
+        $is_diff = isset($this->post['is_diff'])&&$this->post['is_diff']!==""? intval($this->post['is_diff']):"0";
+        $is_stock = isset($this->post['is_stock'])&&$this->post['is_stock']!==""? intval($this->post['is_stock']):"";
         $good_img = isset($this->post['good_img'])&&$this->post['good_img']!=""? trim($this->post['good_img']):"";
         if($good_img===""){
             return error_show(1004,"参数good_img不能为空");
@@ -636,7 +675,10 @@ class Goodup extends Base
                 "delivery_day"=>$delivery_day,
                 "lead_time"=>$lead_time,
                 "sample_day"=>$sample_day,
-                "sample_fee"=>$sample_fee,
+                "is_diff"=>$is_diff,
+                'is_stock'=>$is_stock,
+                "config"=>$config,
+                "other_config"=>$other_config,
                 "good_img"=>$good_img,
                 "good_thumb_img"=>$good_thumb_img,
                 "good_info_img"=>$good_info_img,
@@ -696,6 +738,7 @@ class Goodup extends Base
         $mark_fee = isset($this->post['mark_fee'])&&$this->post['mark_fee']!==""? floatval($this->post['mark_fee']):"0";
         $demo_fee = isset($this->post['demo_fee'])&&$this->post['demo_fee']!==""? floatval($this->post['demo_fee']):"0";
         $open_fee = isset($this->post['open_fee'])&&$this->post['open_fee']!==""? floatval($this->post['open_fee']):"0";
+        $sample_fee = isset($this->post['sample_fee'])&&$this->post['sample_fee']!==""? floatval($this->post['sample_fee']):"0";
         $noble_metal = isset($this->post['noble_metal'])&&$this->post['noble_metal']!==""? intval($this->post['noble_metal']):"0";
         $noble_weight = isset($this->post['noble_weight'])&&$this->post['noble_weight']!==""? floatval($this->post['noble_weight']):"0";
         $is_gold_price= isset($this->post['is_gold_price'])&&$this->post['is_gold_price']!==""? intval($this->post['is_gold_price']):"0";
@@ -705,14 +748,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,
@@ -720,14 +763,15 @@ class Goodup extends Base
             "mark_fee"=>$mark_fee,
             "demo_fee"=>$demo_fee,
             "open_fee"=>$open_fee,
+            "sample_fee"=>$sample_fee,
             "noble_metal"=>$noble_metal,
             "noble_weight"=>$noble_weight,
             "is_gold_price"=>$is_gold_price,
             "market_price"=>$market_price,
             "nake_price"=>$nake_price,
             "cgd_gold_price"=>$cgd_gold_price,
-            "is_step"=>$is_step,
-            "status"=>"2",
+            "is_step" => count($good_ladder) > 1 ? 1 : 0,
+            "status"=>"3",
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $field = array_diff_assoc($data,$datas);
@@ -743,6 +787,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 +811,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['creater_id'] = 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 +1371,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");
@@ -1549,15 +1600,18 @@ 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']):"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不能为空");
-        }
+        $config = isset($this->post['config'])&&$this->post['config']!==""? trim($this->post['config']):"";
+        $other_config = isset($this->post['other_config'])&&$this->post['other_config']!==""? trim($this->post['other_config']):"";
+        $is_diff = isset($this->post['is_diff'])&&$this->post['is_diff']!==""? intval($this->post['is_diff']):"0";
+        $is_stock = isset($this->post['is_stock'])&&$this->post['is_stock']!==""? intval($this->post['is_stock']):"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不能为空");
+//        }
         $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 {
@@ -1598,6 +1652,10 @@ class Goodup extends Base
                 "good_info_img"=>$good_info_img,
                 "cert_fee"=>$cert_fee,
                 "packing_fee"=>$packing_fee,
+                "is_diff"=>$is_diff,
+                "config"=>$config,
+                "other_config"=>$other_config,
+                "is_stock"=>$is_stock,
                 "cost_fee"=>$cost_fee,
                 "mark_fee"=>$mark_fee,
                 "demo_fee"=>$demo_fee,
@@ -1608,7 +1666,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 +1696,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 +1720,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/Process.php

@@ -27,10 +27,10 @@ class Process extends BaseController
      $page =isset($this->post['page']) &&$this->post['page']!="" ? intval($this->post['page']) : 1;
      $size =isset($this->post['size']) &&$this->post['size']!="" ? intval($this->post['size']) : 10;
 
-     $count = Db::name("process")->count();
+     $count = Db::name("process")->where('is_del',0)->count();
      $total = ceil($count/$size);
      $page = $page>$total ? $total:$page;
-     $list = Db::name("process")->page($page,$size)->select();
+      $list = Db::name("process")->where('is_del', 0)->page($page, $size)->select();
      return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
   }
 

app/admin/controller/Project.php

@@ -2,6 +2,8 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
@@ -110,6 +112,15 @@ class Project extends Base
                     }
                     $in = Db::name("project_info")->insertAll($la);
                     if($in>0){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectNo,//编码,这里是project的编码
+                            "status" => 1,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "PRO", 1, $la);
+
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                     }
@@ -201,16 +212,43 @@ class Project extends Base
             }
             $nu = Db::name("project_feedback")->insertAll($data);
             if($nu>0){
+                $old_projectinfo_status = $projectinfo['status'];
                 $projectinfo['status']=2;
                 $projectinfo['updatetime']=date("Y-m-d H:i:s");
                 $up = Db::name("project_info")->save($projectinfo);
                 if($up){
+
+                    //修改状态，添加待办，只记录动作
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $pgNo,//编码,这里是project的编码
+                        "status" => $old_projectinfo_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "PRO", 2, $projectinfo);
+
+
                     $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){
+
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code"=>$projectinfo['projectNo'],//项目编码
+                                "status"=>1,//这里的status是之前的值
+                                "action_remark"=>'',//备注
+                                "action_type"=>"status"//新建create，编辑edit，更改状态status
+                            ],"PRO",2,$this->post);
+
+                            ProcessOrder::AddProcess($this->post['token'],[
+                                "order_type"=>'PRO',
+                                "order_code"=>$projectinfo['projectNo'],
+                                "order_id"=>0,//这里更新是根据编码更新的，没有主键id
+                                "order_status"=>2
+                            ]);
+
                             Db::commit();
                             return app_show(0,"添加成功");
                         }
@@ -507,12 +545,29 @@ class Project extends Base
                             Db::rollback();
                             return error_show(1004,"未找到反馈商品咨询单");
                         }
+                        $old_bids_status = $bids["status"];
                         $bids["status"]=3;
                         $bids["updatetime"]=date("Y-m-d H:i:s");
                        $bd=Db::name("consult_info")->save($bids);
                        if($bd==false){
                            Db::rollback();
                            return error_show(1004,"反馈商品咨询单更新失败");
+                       }else{
+
+                           //修改状态，添加待办
+                           ActionLog::logAdd($this->post['token'], [
+                               "order_code" => $bids['infoNo'],//咨询单详情编号
+                               "status" => $old_bids_status,//这里的status是之前的值
+                               "action_remark" => '',//备注
+                               "action_type" => "status"//新建create，编辑edit，更改状态status
+                           ], "ZXD", 3, $bids);
+
+                           ProcessOrder::AddProcess($this->post['token'], [
+                               "order_type" => 'ZXD',
+                               "order_code" => $bids['infoNo'],//咨询单详情编号
+                               "order_id" => $bids['id'],
+                               "order_status" => 3
+                           ]);
                        }
                     }
 //                    $value['sale_price'] = $price['sale_price'];
@@ -554,10 +609,36 @@ class Project extends Base
                 ];
                 $up =Db::name("project_plan")->insert($data);
                 if($up){
+
+                    //修改状态，添加待办，只记录动作
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $planNo,//编码
+                        "status" => 0,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                    ], "PRO", 0, $data);
+
+                    $old_project_status = $info['status'];
                     $info['status']=4;
                     $info['updatetime']=date("Y-m-d H:i:s");
                     $cr =Db::name("project")->save($info);
                     if($cr){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectNo,//项目编码
+                            "status" => $old_project_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 4, $info);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'PRO',
+                            "order_code" => $projectNo,
+                            "order_id" => $info['id'],
+                            "order_status" => 4
+                        ]);
+
                         Db::commit();
                         return app_show(0,"方案制作成功",["planNo"=>$planNo]);
                     }
@@ -694,10 +775,20 @@ class Project extends Base
             if($up){
 
                 foreach ($infolist as $value){
+                    $old_projectinfo_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($value);
                     if($up){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $value['pgNo'],//编码
+                            "status" => $old_projectinfo_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 3, $value);
+
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
@@ -706,6 +797,23 @@ class Project extends Base
                             if(!$proc){
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
+                            }else{
+
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $value['projectNo'],//项目编码
+                                    "status" => 3,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "PRO", 3, $this->post);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'PRO',
+                                    "order_code" => $value['projectNo'],
+                                    "order_id" => 0,
+                                    "order_status" => 3
+                                ]);
+
                             }
                         }
                     }else{
@@ -742,6 +850,15 @@ class Project extends Base
         try{
             $up = Db::name("project_plan")->where(["planNo"=>$planNos,'is_del'=>0,"status"=>0])->save(["status"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
             if($up) {
+
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNos,//编码
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "PRO", 1, $selec);
+
                 $project = array_column($selec, "projectNo");
                 if (empty($project)) {
                     Db::rollback();
@@ -749,6 +866,22 @@ class Project extends Base
                 }
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $project,//项目编码
+                        "status" => 4,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "PRO", 5, $this->post);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'PRO',
+                        "order_code" => $project,
+                        "order_id" => 0,
+                        "order_status" => 5
+                    ]);
+
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }
@@ -779,6 +912,17 @@ class Project extends Base
         $info['updatetime']=date("Y-m-d H:i:s");
         $up =Db::name("project")->save($info);
         if($up){
+
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $projectNo,//项目编码
+                "status" => $info['status'],//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "edit"//新建create，编辑edit，更改状态status
+            ], "PRO", $info['status'], $info);
+
+            //这里并未修改状态，所以不需要调用ProcessOrder::AddProcess();
+
             return app_show(0,"利润率修改成功");
         }else{
             return error_show(1004,"利润率修改失败");

app/admin/controller/Purch.php

@@ -145,8 +145,8 @@ class Purch extends Base
             }
             
             //采购单详情字段order_type 为1或者2时，取线上商品库 商品创建人   order_type 为3或者4时 取采购反馈的商品库 商品反馈人
-            $value['cgder_id'] = $goon['createrid'];
-            $value['cgder'] = $goon['creater'];
+//            $value['cgder_id'] = $goon['createrid'];
+//            $value['cgder'] = $goon['creater'];
 
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$value['cgdNo'],"is_del"=>0])->select();
             $value['child']=empty($inorder)? [] : $inorder;
@@ -379,7 +379,19 @@ class Purch extends Base
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
         if($upd){
-            ActionLog::logAdd($this->post['token'],$order,'cgd',$data['status'],$this->post);
+//            ActionLog::logAdd($this->post['token'],$order,'cgd',$data['status'],$this->post);
+
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], $order, "CGD", $data['status'], $this->post);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'CGD',
+                "order_code" => $order['status'],//销售单code
+                "order_id" => $data['id'],
+                "order_status" => $data['status']
+            ]);
+
+
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,'更新失败');
@@ -412,7 +424,7 @@ class Purch extends Base
         if($upd){
             $process=["order_code"=>$cgdNo,"order_id"=>$data['id'],"order_status"=>$status,"order_type"=>'CGD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
-            ActionLog::logAdd($this->post['token'],$order,'cgd',$status,$this->post);
+            ActionLog::logAdd($this->post['token'],$order,'CGD',$status,$this->post);
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,'更新失败');

app/admin/controller/Purchin.php

@@ -265,7 +265,7 @@ class Purchin extends BaseController
                             Db::rollback();
                             return error_show(1004,"新建失败");
                         }
-                            $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
+                            $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"];
                             GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
                             ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good  );
                             $process=["order_code"=>$cgdNo,"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
@@ -312,8 +312,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  );
@@ -328,6 +328,23 @@ class Purchin extends BaseController
                                     if($up==false){
                                         Db::rollback();
                                         return error_show(1004,"出库单出库失败");
+                                    }else{
+                                        foreach ($out as $k => $v_outCode) {
+                                            //修改状态，添加待办
+                                            ActionLog::logAdd($this->post['token'], [
+                                                "order_code" => $v_outCode,//出库单号
+                                                "status" => 0,//这里的status是之前的值
+                                                "action_remark" => '',//备注
+                                                "action_type" => "status"//新建create，编辑edit，更改状态status
+                                            ], "CKD", 1, $this->post);
+
+                                            ProcessOrder::AddProcess($this->post['token'], [
+                                                "order_type" => 'CKD',
+                                                "order_code" => $v_outCode,//出库单号
+                                                "order_id" => 0,
+                                                "order_status" => 1
+                                            ]);
+                                        }
                                     }
                                     $good1 = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
                                     if($good1==false){
@@ -546,7 +563,7 @@ class Purchin extends BaseController
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
-                        ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
@@ -570,7 +587,7 @@ class Purchin extends BaseController
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
-                        ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
@@ -610,8 +627,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  );
@@ -783,11 +800,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/Reorder.php

@@ -423,12 +423,28 @@ class Reorder extends \app\BaseController
                     $orderinfo['wsend_num']-=$info['num'];
                     $orderinfo['th_num']+=$info['num'];
                     $orderinfo['send_status'] = $orderinfo['send_num'] == 0 ? 1 : $orderinfo['wsend_num'] == 0 ? 3 : 2;
+                    $old_status = $orderinfo['status'];
                     $orderinfo['status'] = $orderinfo['send_num'] == 0 ? 3 : $orderinfo['wsend_num'] == 0 ? 5 : 4;
                     $orderinfo['updatetime']=date("Y-m-d H:i:s");
                     $return = Db::name("sale")->save($orderinfo);
                     if($return==false){
                         Db::rollback();
                         return error_show(1004,"更新失败");
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $orderinfo['orderCode'],//销售单code
+                            "status" => $old_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "XSQRD", $orderinfo['status'], $orderinfo);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'XSQRD',
+                            "order_code" => $orderinfo['orderCode'],//销售单code
+                            "order_id" => $orderinfo['id'],
+                            "order_status" => $orderinfo['status']
+                        ]);
                     }
 
                     foreach ($good_stock as $value){

app/admin/controller/Resign.php

@@ -697,11 +697,27 @@ class Resign extends BaseController
             return error_show(1004,"未找到仓库数据");
         }
         $info['wsm_code']=$wsm;
+        $old_info_status = $info['status'];
         $info['status']=1;
         $info['updatetime']=date("y-m-d H;i:s");
         $up =Db::name("purchease")->save($info);
         if($up){
 
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $info['bk_code'],//销售单code
+                "status" => $old_info_status,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "edit"//新建create，编辑edit，更改状态status
+            ], "BHD", $info['status'], $info);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'BHD',
+                "order_code" => $info['bk_code'],//销售单code
+                "order_id" => $info['id'],
+                "order_status" => $info['status']
+            ]);
+
             return app_show(0,"备库单仓库选择成功");
         }else{
             return error_show(1004,"备库单仓库选择失败");
@@ -778,8 +794,24 @@ class Resign extends BaseController
         ];
         Db::startTrans();
         try{
-            $up =Db::name("purchease_order")->insert($cg);
-            if($up){
+            $up =Db::name("purchease_order")->insert($cg,true);
+            if($up>0){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $cg['cgdNo'],//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "CGD", $cg['status'], $cg);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'CGD',
+                    "order_code" => $cg['cgdNo'],//销售单code
+                    "order_id" => $up,
+                    "order_status" => $cg['status']
+                ]);
+
                 $data=[
                     "cgdNo"=>$cgdCode,
                     "spuCode"=>$info['spuCode'],
@@ -810,18 +842,36 @@ 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,
+//                    $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) {
+                    //商品变动日志表，good_log_code字段存储采购单号
 //                        GoodLog::LogAdd($this->post['token'], $good_data, 'RKD');
 //                        ActionLog::logAdd($this->post['token'], $order, "RKD", 1, $good);
 //                        $process = ["order_code" => $cgdCode, "order_id" => Db::name("purchease_order")->getLastInsID(), "order_status" => $cg['status'], "order_type" => 'CGD'];
 //                        ProcessOrder::AddProcess($this->post['token'], $process);
                         $info['wsm_code'] = $wsm_code;
+                        $old_info_status = $info['status'];
                         $info['status'] = 2;
                         $info['updatetime'] = date("Y-m-d H:i:s");
                         $bas = Db::name("purchease")->save($info);
                         if ($bas) {
+
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $info['bk_code'],//销售单code
+                                "status" => $old_info_status,//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "edit"//新建create，编辑edit，更改状态status
+                            ], "BHD", $info['status'], $info);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'BHD',
+                                "order_code" => $info['bk_code'],//销售单code
+                                "order_id" => $info['id'],
+                                "order_status" => $info['status']
+                            ]);
+
                             Db::commit();
                             return app_show(0, "采购单新建成功", ["cgdNo" => $cgdCode]);
                         }

app/admin/controller/Sale.php

@@ -8,6 +8,7 @@ use Exception;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+use think\facade\Validate;
 
 //销售单
 class Sale extends Base
@@ -69,7 +70,7 @@ class Sale extends Base
         $workNo =isset($this->post['workNo'])&&$this->post['workNo']!=""? trim($this->post['workNo']):"";
        // $poNo =isset($this->post['poNo'])&&$this->post['poNo']!=""? trim($this->post['poNo']):"";
         $ct = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
-            ->where(['a.skuCode' => $good_code])->find();
+            ->where(['a.skuCode' => $good_code])->field("b.*,a.skuCode,a.platform_code,a.plat_code")->find();
             if ($ct == false) {
                 return error_show(1002, "未找到商品数据");
             }
@@ -141,6 +142,8 @@ class Sale extends Base
             "good_num"=>$good_num,
             "good_type"=>$goodtype,
             "order_type"=>$is_stock==1?1:2,
+            "createrid"=>$ct['createrid'],
+            "creater"=>$ct['creater'],
             'send_way'=>2
 
         ];
@@ -213,7 +216,7 @@ class Sale extends Base
                     $bol=$this->createCgd($cgd);
                     if($bol==false){
                         Db::rollback();
-                        return error_show(1002,"咨询订单创建失败");
+                        return error_show(1002,"订单创建失败");
                     }
                 }else{
                     $dd=[
@@ -328,6 +331,21 @@ class Sale extends Base
                                     if ($ou == false) {
                                         Db::rollback();
                                         return error_show(1002, "发货地址添加创建失败");
+                                    }else{
+                                        //修改状态，添加待办
+                                        ActionLog::logAdd($this->post['token'], [
+                                            "order_code" => $outCode,//出库单号
+                                            "status" => 0,//这里的status是之前的值
+                                            "action_remark" => '',//备注
+                                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                                        ], "CKD", 0, $out);
+
+                                        ProcessOrder::AddProcess($this->post['token'], [
+                                            "order_type" => 'CKD',
+                                            "order_code" => $outCode,//出库单号
+                                            "order_id" => 0,
+                                            "order_status" => 0
+                                        ]);
                                     }
                                 }
                             }
@@ -419,8 +437,24 @@ class Sale extends Base
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
         ];
-        $up =Db::name("purchease_order")->insert($cg);
+        $up =Db::name("purchease_order")->insert($cg,true);
         if($up){
+
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $cg['cgdNo'],//销售单code
+                "status" => 0,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "create"//新建create，编辑edit，更改状态status
+            ], "CGD", $cg['status'], $cg);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'CGD',
+                "order_code" => $cg['cgdNo'],//销售单code
+                "order_id" => $up,
+                "order_status" => $cg['status']
+            ]);
+
             $rela=[
                 "orderCode"=>$data['orderCode'],
                 "cgdNo"=>$cgdCode,
@@ -451,11 +485,12 @@ class Sale extends Base
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
+                    $stoc= Db::name("good_stock")->save($stokc);
+                    if($stoc==false){
+                        return false;
+                    }
                 }
-                $stoc= Db::name("good_stock")->save($stokc);
-                if($stoc==false){
-                    return false;
-                }
+
                 return true;
             }
         }else{
@@ -581,10 +616,25 @@ class Sale extends Base
                         if($ou==false){
                             Db::rollback();
                             return error_show(1002,"发货地址添加创建失败");
+                        }else{
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $outCode,//出库单号
+                                "status" => 0,//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "create"//新建create，编辑edit，更改状态status
+                            ], "CKD", 0, $out);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'CKD',
+                                "order_code" => $outCode,//出库单号
+                                "order_id" => 0,
+                                "order_status" => 0
+                            ]);
                         }
 
                         //维护商品所在仓库的库存 --- 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();
@@ -598,7 +648,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,
@@ -611,7 +661,6 @@ class Sale extends Base
                         }
                         //维护商品所在仓库的库存 --- end
 
-
                         if($num==0){
                             break;
                         }
@@ -669,6 +718,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 = "";
@@ -689,6 +741,8 @@ class Sale extends Base
             "mark_fee"=>$zxinfo['mark_fee'],
             "demo_fee"=>$zxinfo['demo_fee'],
             "good_num"=>$good_num,
+            "createrid"=>$zxinfo['createrid'],
+            "creater"=>$zxinfo['creater'],
             "good_type"=>1,
             "is_diff"=>$zxinfo['is_diff'],
             "order_type"=>3,
@@ -741,7 +795,7 @@ class Sale extends Base
                 "zxNo"=>$bidNo,
                 "platform_order"=>"",
                 "platform_id"=>0,
-                "remark"=>"",
+                "remark"=>$remark,
                 "arrive_time"=>$arrtime,
                 "is_stock"=>0,
                 "is_activity"=>0,
@@ -753,12 +807,28 @@ class Sale extends Base
             ];
             $datainfo = Db::name('sale')->insert($data, true);
             if($datainfo>0){
+                    $old_zx_status = $zx['status'];
                     $zx['status']=5;
                     $zx['updatetime']=date("Y-m-d H:i:s");
                     $sa=Db::name("consult_info")->save($zx);
                     if($sa==false){
                         Db::rollback();
                         return error_show(1002,"咨询单修改失败");
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $zx['infoNo'],//咨询单详情编号
+                            "status" => $old_zx_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "ZXD", 5, $zx);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $zx['infoNo'],//咨询单详情编号
+                            "order_id" => $zx['id'],
+                            "order_status" => 5
+                        ]);
                     }
                     $bol=$this->createCgd($cgd);
                     if($bol==false){
@@ -797,8 +867,8 @@ class Sale extends Base
                         "send_way"=>$zxinfo['send_way'],
                         "status"=>1,
                         "is_del"=>0,
-                        "createrid"=>$rm,
-                        "creater"=>$ri,
+                        "createrid"=>$zxinfo['createrid'],
+                        "creater"=>$zxinfo['creater'],
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
@@ -863,6 +933,21 @@ class Sale extends Base
                                 if($ou==false){
                                     Db::rollback();
                                     return error_show(1002,"发货地址添加创建失败");
+                                }else{
+                                    //修改状态，添加待办
+                                    ActionLog::logAdd($this->post['token'], [
+                                        "order_code" => $outCode,//出库单号
+                                        "status" => 0,//这里的status是之前的值
+                                        "action_remark" => '',//备注
+                                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                                    ], "CKD", 0, $out);
+
+                                    ProcessOrder::AddProcess($this->post['token'], [
+                                        "order_type" => 'CKD',
+                                        "order_code" => $outCode,//出库单号
+                                        "order_id" => 0,
+                                        "order_status" => 0
+                                    ]);
                                 }
                                 $order['send_num']+=$value['receipt_quantity'];
                                 $order['wsend_num']-=$value['receipt_quantity'];
@@ -995,20 +1080,46 @@ class Sale extends Base
                     return error_show(1002, "项目订单生成失败");
                 }
             }
+            $old_plan_status = $plan['status'];
             $plan['status']=2;
             $plan['updatetime']=date("Y-m-d H:i:s");
             $in =Db::name("project_plan")->save($plan);
             if($in==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
+            }else{
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNo,//编码
+                    "status" => $old_plan_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "PRO", 2, $plan);
             }
+            $old_project_status = $project["status"];
             $project["status"]=6;
             $project['updatetime']=date("Y-m-d H:i:s");
             $pr =Db::name("project")->save($project);
             if($pr==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
+            }else{
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $project['projectNo'],//项目编码
+                    "status" => $old_project_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "PRO", 6, $project);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'PRO',
+                    "order_code" => $project['projectNo'],
+                    "order_id" => $project['id'],
+                    "order_status" => 6
+                ]);
             }
+
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){
@@ -1049,6 +1160,8 @@ class Sale extends Base
             "mark_fee"=>$goodinfo['mark_fee'],
             "demo_fee"=>$goodinfo['demo_fee'],
             "good_num"=>$data['good_num'],
+            "createrid"=>$goodinfo['createrid'],
+            "creater"=>$goodinfo['creater'],
             "good_type"=>1,
             "order_type"=>4,
             "send_way"=>$goodinfo['send_way'],
@@ -1134,8 +1247,8 @@ class Sale extends Base
                 "send_way"=>$goodinfo['send_way'],
                 "status"=>1,
                 "is_del"=>0,
-                "createrid"=>0,
-                "creater"=>'',
+                "createrid"=>$goodinfo['createrid'],
+                "creater"=>$goodinfo['creater'],
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
@@ -1236,7 +1349,8 @@ class Sale extends Base
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function project_good($data){
-        $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->find();
+        $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->field("b.*,a.skuCode,a.platform_code,a.plat_code")->find();
         if($good==false){
             return false;
         }
@@ -1305,6 +1419,8 @@ class Sale extends Base
                 "demo_fee"=>$good['demo_fee'],
                 "good_num"=>$data['good_num'],
                 "good_type"=>1,
+                "createrid"=>$good['createrid'],
+                "creater"=>$good['creater'],
                 "order_type"=>$good['is_stock']==1?1:2,
                 'send_way'=>2
             ];
@@ -1897,7 +2013,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'],
@@ -1964,6 +2080,21 @@ class Sale extends Base
                                 ActionLog::logAdd($this->post['token'],$sti,"xsd",0,$sti);
                                 Db::rollback();
                                 return error_show(1003, "创建失败");
+                            }else{
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $outCode,//出库单号
+                                    "status" => 0,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                                ], "CKD", 0, $data);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'CKD',
+                                    "order_code" => $outCode,//出库单号
+                                    "order_id" => 0,
+                                    "order_status" => 0
+                                ]);
                             }
                         }
                         $wsm_in_code = makeNo("CF");
@@ -2197,8 +2328,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");
                 }
 
@@ -2285,8 +2417,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) {
@@ -2302,7 +2436,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();
@@ -2818,6 +2954,24 @@ class Sale extends Base
                     }
                     $datainfo = Db::name('order_out')->insertAll($data);
                     if($datainfo>0){
+
+                        foreach ($data as $k => $v_data) {
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $v_data['outCode'],//出库单号
+                                "status" => $v_data['status'],//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "create"//新建create，编辑edit，更改状态status
+                            ], "CKD", $v_data['status'], $v_data);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'CKD',
+                                "order_code" => $v_data['outCode'],//出库单号
+                                "order_id" => 0,
+                                "order_status" => $v_data['status']
+                            ]);
+                        }
+
                         Db::commit();
                         return app_show(0,"出库单新建成功");
                     }
@@ -2861,6 +3015,7 @@ class Sale extends Base
         $outinfo['post_code'] = $post_code;
         $outinfo['post_fee'] = $post_fee;
         $outinfo['sendtime'] = date("Y-m-d H:i:s");
+        $old_outinfo_status = $outinfo['status'];
         $outinfo['status'] = 2;
         $outinfo['updatetime'] = date("Y-m-d H:i:s");
 
@@ -2868,6 +3023,22 @@ class Sale extends Base
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "status" => $old_outinfo_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "CKD", $outinfo['status'], $outinfo);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'CKD',
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "order_id" => $outinfo['id'],
+                    "order_status" => $outinfo['status']
+                ]);
+
                 $stokc =Db::name("good_stock")->where(['spuCode'=>$einfo['good_code'],"wsm_code"=>$outinfo['wsm_code'],"is_del"=>0])->find();
                 if($stokc==false){
                     Db::rollback();
@@ -3163,4 +3334,51 @@ class Sale extends Base
         $order["noble_weight"] = isset($order['weight'])?$order['weight']:0;
         return app_show(0,"获取成功",$order);
     }
+
+    //获取采反商品详情，当数据不在good_zixun中,模仿goodzxinfo
+    public  function getGoodZxInfoByNotZixun(){
+
+        $param=$this->request->only(['spuCode'],'post','trim');
+
+        $val=Validate::rule(['spuCode'=>'require']);
+
+        if(!$val->check($param)) return error_show(1004,$val->getError());
+
+        $order = Db::name('consult_bids')
+            ->field(true)
+            ->where(['spuCode'=>$param['spuCode'],'is_del'=>0])
+            ->find();
+
+//        $orderCode= isset($this->post['spuCode'])&&$this->post['spuCode']!=''?trim($this->post['spuCode']):"";
+//        if($orderCode==""){
+//            return error_show(1003,"参数spuCode不能为空");
+//        }
+//        $order= Db::name("good_zixun")->where(["spuCode"=>$orderCode,"is_del"=>0])->find();
+//        if(empty($order)){
+//            return error_show(1003,"订单数据未找到");
+//        }
+        $unit =Db::name("unit")->where(["id"=>$order['unit_id']])->find();
+        if($order['brand_id']!=0){
+            $brand=Db::name("brand")->where(["id"=>$order['brand_id']])->find();
+            $order["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
+        }else{
+            $order["brand_name"]="";
+            $order["brand_id"]="";
+        }
+        $order['specinfo']=json_decode($order['specinfo'],true);
+        $order['unit'] = isset($unit['unit'])?$unit['unit']:'';
+        $order['cat_info'] = made($order['cat_id'],[]);
+        $order['noble_name']=isset($order['noble_metal'])&&$order['noble_metal']!=0?$this->noble[$order['noble_metal']] :"";
+        if($order['is_gold_price']==1){
+            $price=Db::name("gold_price1")->where(["type"=>$order['noble_metal'],"status"=>1,"is_del"=>0])->order("addtime desc")->find();
+
+        }
+        $supplier = Db::name("supplier")->where(["code"=>$order['supplierNo']])->find();
+        $order['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
+//        $palt =Db::name("platform")->where(["id"=>$order['platform_id']])->find();
+//        $order['platform_name']=isset($palt['platform_name']) ? $palt['platform_name']:"";
+        $order["gold_price"] = isset($price['price'])?$price['price']:0;
+        $order["noble_weight"] = isset($order['weight'])?$order['weight']:0;
+        return app_show(0,"获取成功",$order);
+    }
 }

app/admin/controller/Salezx.php

@@ -183,6 +183,23 @@ class Salezx extends \app\BaseController
                            if($ou==false){
                                Db::rollback();
                                return error_show(1002,"咨询订单创建失败");
+                           }else{
+
+                               //修改状态，添加待办
+                               ActionLog::logAdd($this->post['token'], [
+                                   "order_code" => $outCode,//出库单号
+                                   "status" => $out['status'],//这里的status是之前的值
+                                   "action_remark" => '',//备注
+                                   "action_type" => "create"//新建create，编辑edit，更改状态status
+                               ], "CKD", $out['status'], $out);
+
+                               ProcessOrder::AddProcess($this->post['token'], [
+                                   "order_type" => 'CKD',
+                                   "order_code" => $outCode,//出库单号
+                                   "order_id" => 0,
+                                   "order_status" => $out['status']
+                               ]);
+
                            }
                         }else{
                             Db::rollback();
@@ -190,6 +207,22 @@ class Salezx extends \app\BaseController
                         }
                     }
                 }
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $orderCode,//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "XSQRD", 0, $data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'XSQRD',
+                    "order_code" => $orderCode,//销售单code
+                    "order_id" => $datainfo,
+                    "order_status" => 0
+                ]);
+
                     Db::commit();
                     return error_show(0,"咨询订单创建成功");
             }
@@ -268,8 +301,24 @@ class Salezx extends \app\BaseController
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
-                    $up =Db::name("purchease_order")->insert($cg);
+                    $up =Db::name("purchease_order")->insert($cg,true);
                     if($up){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $cg['cgdNo'],//销售单code
+                            "status" => 0,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "CGD", $cg['status'], $cg);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'CGD',
+                            "order_code" => $cg['cgdNo'],//销售单code
+                            "order_id" => $up,
+                            "order_status" => $cg['status']
+                        ]);
+
                         return true;
                     }else{
                         return false;
@@ -507,9 +556,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{
@@ -660,6 +712,21 @@ class Salezx extends \app\BaseController
                 if($si==false){
                     Db::rollback();
                     return error_show(1003,"创建失败");
+                }else{
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $der['orderCode'],//销售单code
+                        "status" => $item,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "XSQRD", $der['status'], $der);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'XSQRD',
+                        "order_code" => $der['orderCode'],//销售单code
+                        "order_id" => $der['id'],
+                        "order_status" => $der['status']
+                    ]);
                 }
             $sio = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$sio,"zxd",$der['status'],$der);

app/admin/controller/Specvalue.php

@@ -25,27 +25,38 @@ class Specvalue extends BaseController
         $list = Db::name('spec_value')->where($where)->page($page,$size)->order("addtime desc")->select();
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
-    public function create(){
-        $spec_id = isset($this->post['spec_id']) && $this->post['spec_id'] !=="" ? intval($this->post['spec_id']):"";
-        if($spec_id==""){
-            return error_show(1002,"参数spec_id不能为空");
+
+    public function create()
+    {
+        $spec_id = isset($this->post['spec_id']) && $this->post['spec_id'] !== "" ? intval($this->post['spec_id']) : "";
+        if ($spec_id == "") {
+            return error_show(1002, "参数spec_id不能为空");
         }
-        $spec_value = isset($this->post['spec_value']) && $this->post['spec_value'] !=="" ? trim($this->post['spec_value']):"";
-        if($spec_value==""){
-            return error_show(1002,"参数spec_value不能为空");
+        $spec_value = isset($this->post['spec_value']) && $this->post['spec_value'] !== "" ? trim($this->post['spec_value']) : "";
+        if ($spec_value == "") {
+            return error_show(1002, "参数spec_value不能为空");
         }
-        $data = [
-            "spec_id"=>$spec_id,
-            "spec_value"=>$spec_value,
-            "is_del"=>0,
-            "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
-        ];
-        $info = Db::name("spec_value")->insert($data);
-        if($info){
-            return error_show(0,"新建成功");
-        }else{
-            return error_show(1002,"新建失败");
+
+        $id_is_empty = Db::name('spec_value')
+            ->field('id')
+            ->where([
+                'spec_id' => $spec_id,
+                'spec_value' => $spec_value,
+                'is_del' => 0
+            ])->find();
+
+        if ($id_is_empty) return error_show(1005, '数据库已存在该规格值');
+        else {
+            $data = [
+                "spec_id" => $spec_id,
+                "spec_value" => $spec_value,
+                "is_del" => 0,
+                "addtime" => date("Y-m-d H:i:s"),
+                "updatetime" => date("Y-m-d H:i:s")
+            ];
+            $info = Db::name("spec_value")->insert($data);
+            if ($info) return error_show(0, "新建成功");
+            else   return error_show(1002, "新建失败");
         }
     }
     public function all(){

app/admin/controller/Version.php

@@ -2,6 +2,8 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -298,10 +300,20 @@ class Version extends BaseController
             if($up){
 
                 foreach ($infolist as $value){
+                    $old_value_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($value);
                     if($up){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $value['projectNo'],//编码
+                            "status" => $old_value_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 3, $value);
+
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
@@ -310,6 +322,22 @@ class Version extends BaseController
                             if(!$proc){
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
+                            }else{
+
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code"=>$value['projectNo'],//项目编码
+                                    "status"=>$old_value_status,//这里的status是之前的值
+                                    "action_remark"=>'',//备注
+                                    "action_type"=>"status"//新建create，编辑edit，更改状态status
+                                ],"PRO",$value['status'],$value);
+
+                                ProcessOrder::AddProcess($this->post['token'],[
+                                    "order_type"=>'PRO',
+                                    "order_code"=>$value['projectNo'],
+                                    "order_id"=>$value['id'],
+                                    "order_status"=>$value['status']
+                                ]);
                             }
                         }
                     }else{
@@ -326,6 +354,21 @@ class Version extends BaseController
                             if($staar==false){
                                 Db::rollback();
                                 return error_show(1002, "项目咨询单招标结束失败");
+                            }else{
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $consult['zxNo'],//项目编码
+                                    "status" => 1,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "ZXD", 2, $this->post);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'ZXD',
+                                    "order_code" => $consult['zxNo'],
+                                    "order_id" => 0,
+                                    "order_status" => 2
+                                ]);
                             }
                         }
                     }
@@ -367,9 +410,33 @@ class Version extends BaseController
                 }
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code"=>$project,//项目编码
+                        "status"=>4,//这里的status是之前的值
+                        "action_remark"=>'',//备注
+                        "action_type"=>"status"//新建create，编辑edit，更改状态status
+                    ],"PRO",5,$this->post);
+
+                    ProcessOrder::AddProcess($this->post['token'],[
+                        "order_type"=>'PRO',
+                        "order_code"=>$project,
+                        "order_id"=>0,//这里更新是根据编码更新的，没有主键id
+                        "order_status"=>5
+                    ]);
+
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }
+            }else{
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNos,//编码
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "PRO", 1, $this->post);
             }
             Db::rollback();
             return error_show(1004,"方案选择失败");

app/admin/route/app.php

@@ -102,6 +102,7 @@ Route::rule('saleoutinfo','admin/Sale/outinfo');
 Route::rule('saleaddr','admin/Sale/addAddr');
 Route::rule('salegetprice','admin/Sale/getPrice');
 Route::rule('goodzxinfo','admin/Sale/goodzxinfo');
+Route::rule('getgoodzxinfobynotzixun','admin/Sale/getGoodZxInfoByNotZixun');
 
 Route::rule('checkflist','admin/Check/flist');
 Route::rule('checklist','admin/Check/list');
@@ -163,14 +164,15 @@ Route::rule("addrall","admin/Addr/all");
 Route::rule("goodlist","admin/Good/list");
 Route::rule("goodwarn","admin/Good/SetWarn");
 Route::rule("goodstatus","admin/Good/SetStatus");
-Route::rule("goodstat","admin/Good/Stat");
+Route::rule("goodstat","admin/Good/Stat");//库存概况
 Route::rule("goodstock","admin/Good/GetStock");
 Route::rule("goodall","admin/Good/all");
 Route::rule("getstockgod","admin/Good/GetStockGod");
-Route::rule("getstockwsm","admin/Good/GetStockWsm");
+Route::rule("getstockwsm","admin/Good/GetStockWsm");//库存统计
 Route::rule("getstockbet","admin/Good/GetStockBet");
 Route::rule("goodloglist","admin/Good/loglist");
 Route::rule("goodplist","admin/Good/goodlist");
+Route::rule("getgoodlistbyladder","admin/Good/getGoodListByLadder");
 
 Route::rule("purchlist","admin/Resign/list");
 Route::rule("purchadd","admin/Resign/add");
@@ -333,7 +335,7 @@ Route::rule('businessstatus','admin/Business/status');
 Route::rule('businesssinfo','admin/Business/info');
 Route::rule('businesstitle','admin/Business/title');
 
-Route::rule('gooduplist','admin/Goodup/list');
+Route::rule('gooduplist','admin/Goodup/list');//商品列表
 
 Route::rule('unitcreate','admin/Unit/create');
 Route::rule('unitlist','admin/Unit/list');
@@ -341,8 +343,8 @@ Route::rule('unitedit','admin/Unit/edit');
 Route::rule('unitdelete','admin/Unit/del');
 Route::rule('unitstatus','admin/Unit/status');
 
-Route::rule('goodupcreate','admin/Goodup/create');
-Route::rule('gooduplist','admin/Goodup/list');
+Route::rule('goodupcreate','admin/Goodup/create');//创建商品成本
+//Route::rule('gooduplist','admin/Goodup/list');
 Route::rule('goodupeditinfo','admin/Goodup/editinfo');
 Route::rule('goodupinfo','admin/Goodup/info');
 Route::rule('goodupeditfee','admin/Goodup/editfee');
@@ -351,7 +353,7 @@ Route::rule('gooduponline','admin/Goodup/online');
 Route::rule('goodupexam','admin/Goodup/online_exam');
 Route::rule('goodupeditladder','admin/Goodup/editladder');
 Route::rule('goodexam','admin/Goodup/exam');
-Route::rule('goodinfo','admin/Good/info');
+Route::rule('goodinfo','admin/Good/info');//商品详情
 Route::rule('againonline','admin/Goodup/againOnline');
 Route::rule('goodupcopy','admin/Goodup/copy');
 Route::rule('goodupedit','admin/Goodup/edit');
@@ -464,3 +466,4 @@ Route::rule("projectshareplan","admin/Version/project_plan");
 Route::rule("projectsharecheck","admin/Version/feedCheck");
 Route::rule("plancheck","admin/Version/planCheck");
 
+Route::rule('getdata','admin/Data/index');//数据看板，获取相关统计数据

app/common.php

@@ -752,4 +752,16 @@ function GoodPrice($data,$cost_rate=0){
     $rate = ($data['open_fee']/$data['num']+ $data['cost_fee']+$data['packing_fee']+$data["mark_fee"]+$data["cert_fee"]+$data['nake_fee'])/(1-$cost_rate
         );
     return $rate;
+}
+
+function checkRole($roleid,$menu){
+    $roleinfo = Db::name("role_action")->where([['role_id',"=",$roleid],["status","=",1]])->find();
+    if($roleinfo['private_data']!=""){
+
+        $private = explode(",",$roleinfo['private_data']);
+        if(in_array($menu,$private)){
+            return true;
+        }
+    }
+    return false;
 }