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

app/admin/controller/After.php

@@ -9,7 +9,7 @@ use think\Exception;
 use think\facade\Db;
 use think\facade\Validate;
 
-
+//售后
 class After extends \app\BaseController
 {
     public $post=[];
@@ -219,18 +219,22 @@ class After extends \app\BaseController
         $info["addr_code"]=json_decode($info['addr_code'],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();
+//        $customer = Db::name("customer_info")->where(["companyNo"=>$info['customer_code']])->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")
+            ->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']:"";
-        $info['customer_name'] = isset($customer['companyName']) ?trim($customer['companyName']):'';
+
+        $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;
 
         //仓库的联系人、职位、电话、省市区和地址
@@ -239,6 +243,8 @@ class After extends \app\BaseController
         $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'];//地址
 
         return app_show(0,"获取成功",$info);
     }

app/admin/controller/Allot.php

@@ -9,6 +9,8 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//调拨  allot_info(从表)和allot_stock(主表)
+//调拨之后，修改库存，采购单的仓库编号是否也需要修改
 class Allot extends BaseController
 {
     public $post= "";
@@ -113,6 +115,7 @@ class Allot extends BaseController
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);
     }
     public function create(){
+
         $token =isset($this->post['token']) && $this->post['token'] !=="" ? trim($this->post['token']) :"";
     $wsm_out = isset($this->post['wsm_out']) && $this->post['wsm_out'] !=="" ? trim($this->post['wsm_out']) :"";
     if($wsm_out==""){
@@ -122,22 +125,29 @@ class Allot extends BaseController
     if($wsm_in==""){
         return error_show(1002,"入库仓库不能为空");
     }
-        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !=="" ? trim($this->post['in_companyNo']) :"";
-        if($in_companyNo==""){
-            return error_show(1002,"in_companyNo不能为空");
-        }
-        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !=="" ? trim($this->post['out_companyNo']) :"";
-        if($out_companyNo==""){
-            return error_show(1002,"out_companyNo不能为空");
-        }
-        $company =Db::name("business")->where(['companyNo'=>$in_companyNo,"is_del"=>0])->find();
-        if($company==false){
-            return error_show(1002,"未找到入库业务公司");
-        }
-        $company =Db::name("business")->where(['companyNo'=>$out_companyNo,"is_del"=>0])->find();
-        if($company==false){
-            return error_show(1002,"未找到出库业务公司");
-        }
+
+        //根据出入库的仓库编码，查出对应的公司、业务公司
+        $warehouse_temp_info = Db::name('warehouse_info')
+            ->where(['is_del' => 0, 'status' => 1])
+            ->whereIn('wsm_code', [$wsm_out, $wsm_in])
+            ->column('supplierNo,companyNo', 'wsm_code');//supplierNo所属供货商，companyNo业务企业
+
+//        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !=="" ? trim($this->post['in_companyNo']) :"";
+//        if($in_companyNo==""){
+//            return error_show(1002,"in_companyNo不能为空");
+//        }
+//        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !=="" ? trim($this->post['out_companyNo']) :"";
+//        if($out_companyNo==""){
+//            return error_show(1002,"out_companyNo不能为空");
+//        }
+//        $company =Db::name("business")->where(['companyNo'=>$in_companyNo,"is_del"=>0])->find();
+//        if($company==false){
+//            return error_show(1002,"未找到入库业务公司");
+//        }
+//        $company =Db::name("business")->where(['companyNo'=>$out_companyNo,"is_del"=>0])->find();
+//        if($company==false){
+//            return error_show(1002,"未找到出库业务公司");
+//        }
 //    $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code'] !=="" ? trim($this->post['good_type_code']) :"";
 //    if($good_type_code==""){
 //        return error_show(1002,"商品属性不能为空");
@@ -171,8 +181,8 @@ class Allot extends BaseController
                 "allot_code"=>$allot_code,
                 "wsm_out"=>$wsm_out,
                 "wsm_in"=>$wsm_in,
-                "out_companyNo"=>$out_companyNo,
-                "in_companyNo"=>$in_companyNo,
+                "out_companyNo"=>$warehouse_temp_info[$wsm_out]['companyNo'],
+                "in_companyNo"=>$warehouse_temp_info[$wsm_in]['companyNo'],
                 "apply_name"=>$ri,
                 "apply_id"=>$rm,
                 "post_name"=>$post_name,
@@ -194,8 +204,9 @@ class Allot extends BaseController
                         ->join("good_stock c", "c.spuCode = b.spuCode", "left")
                         ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
                         ->join("supplier n","n.code=v.supplierNo","left")
-                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'b.spuCode' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
-                        ->field("b.spuCode,b.good_name,b.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
+                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                        ->field("b.spuCode,b.good_name,b.good_unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
+
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");
@@ -206,7 +217,7 @@ class Allot extends BaseController
                         $temp = [];
                         $temp['good_name'] = $st['good_name'];
                         $temp['allot_code'] =$allot_code;
-                        $temp['good_type_code'] = $value['good_code'];
+                        $temp['good_type_code'] = $value['spuCode'];
                         $temp['allot_num'] = $value['allot_num'];
                         $temp['usable_num'] = 0;
                         $temp['error_num'] = 0;
@@ -274,7 +285,7 @@ class Allot extends BaseController
 
             $data=[];
         foreach ($vmp as $k=>$value){
-            $s =Db::name('good_stock')->where(['spuCode'=>$value['spuCode'],'wsm_code'=>$str['wsm_out']])
+            $s =Db::name('good_stock')->where(['spuCode'=>$value['good_type_code'],'wsm_code'=>$str['wsm_out']])
                 ->find();
             if($str['status']<=1) {
                 $value['usable_num'] = $s['usable_stock'];
@@ -349,8 +360,8 @@ class Allot extends BaseController
                         ->join("good_stock c", "c.spuCode = b.spuCode", "left")
                         ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
                         ->join("supplier n","n.code=v.supplierNo","left")
-                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'b.spuCode' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
-                        ->field("b.spuCode,b.good_name,b.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
+                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                        ->field("b.spuCode,b.good_name,b.good_unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
                     if (empty($st)) {
                         Db::rollback();
                         return error_show(1003, "商品不能为空");
@@ -370,7 +381,7 @@ class Allot extends BaseController
                     $temp = [];
                    isset($value['id'])&&$value['id']!=="" ? $temp['id'] = $value['id']:'';
                     $temp['good_name'] = $st['good_name'];
-                    $temp['good_type_code'] = $value['good_code'];
+                    $temp['good_type_code'] = $value['spuCode'];
                     $temp['allot_num'] = $value['allot_num'];
                     $temp['usable_num'] = 0;
                     $temp['error_num'] = 0;
@@ -579,13 +590,13 @@ class Allot extends BaseController
             $good_data=[];
             foreach ($dain as $value) {
                 $st = Db::name("good")->alias("b")
-                    ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_out'], 'b.spuCode' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                    ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_out'], 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
                     ->field("b.spuCode,b.good_name,c.wsm_code,c.usable_stock")->find();
                 if (empty($st)) {
                     Db::rollback();
                     return error_show(1003, "未找到商品");
                 }
-                $n = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code'],'is_del'=>0])->find();
+                $n = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=> $al['allot_code'],'is_del'=>0])->find();
                 if(empty($n)){
                     Db::rollback();
                     return error_show(10032, "未找到数据");
@@ -601,13 +612,13 @@ class Allot extends BaseController
                 $temp['error_remark'] = $value['error_remark'];
                 $temp['stock_num']=$n['allot_num'];
                 $temp['updatetime'] = date("Y-m-d H:i:s");
-                $np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code'],'is_del'=>0])->save($temp);
+                $np = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=> $al['allot_code'],'is_del'=>0])->save($temp);
                 if($np==false){
                     Db::rollback();
                     return error_show(1001,"数据更新失败");
                 }
 
-                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_out'],
+                $stock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_out'],
                     "is_del"=>0])->find();
                 if($stock['intra_stock']<$n['allot_num']){
                     Db::rollback();
@@ -621,10 +632,10 @@ class Allot extends BaseController
                     return error_show(1002,"数据更新失败");
                 }
                 $good_data[]=["stock_id"=>$stock['id'],"type"=>2,'stock'=>$n['allot_num'],"stock_name"=>"intra_stock"];
-                $instock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
+                $instock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
                 if($instock==false){
                    $instock =[];
-                    $instock['spuCode']=$value['good_code'];
+                    $instock['spuCode']=$value['spuCode'];
                     $instock['wsm_code']=$al['wsm_in'];
                     $instock['wait_in_stock']=0;
                     $instock['wait_out_stock']=0;
@@ -687,7 +698,7 @@ public function vesio(){
             ActionLog::logAdd($this->post['token'],$order,"DBD",5,$this->post);
             foreach ($dain as $value) {
                 $st = Db::name("good")->alias("b")
-                    ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_in'], 'b.spuCode' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                    ->join("good_stock c", "c.spuCode = b.spuCode", "left")->where(['wsm_code' => $al['wsm_in'], 'b.spuCode' => $value['spuCode'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
                     ->field("b.spuCode,b.good_name,c.wsm_code,c.usable_stock")->find();
                 if (empty($st)) {
                     Db::rollback();
@@ -700,17 +711,17 @@ public function vesio(){
                 $temp['stock_num'] = $value['stock_num'];
                 $temp['error_remark'] = $value['error_remark'];
                 $temp['updatetime'] = date("Y-m-d H:i:s");
-                $np = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=> $al['allot_code']])->save($temp);
+                $np = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=> $al['allot_code']])->save($temp);
                 if($np==false){
                     Db::rollback();
                     return error_show(1001,"数据更新失败");
                 }
-                $p = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
+                $p = Db::name('allot_info')->where(['good_type_code'=>$value['spuCode'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
                 if($p==false){
                     Db::rollback();
                     return error_show(1002,"未找到数据");
                 }
-                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
+                $stock = Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
                 if($stock['wait_in_stock']<$p['stock_num']){
                     Db::rollback();
                    return error_show(2000,"超出待入库存数量");

app/admin/controller/Attr.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//客户属性
 class Attr extends BaseController
 {
     public $post="";

app/admin/controller/Brand.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//品牌
 class Brand extends BaseController
 {
     public $post="";

app/admin/controller/Business.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//业务企业
 class Business extends BaseController
 {
     public $post = "";

app/admin/controller/Cat.php

@@ -8,6 +8,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//分类
 class Cat extends BaseController
 {
 public $post="";

app/admin/controller/Catdesc.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//分类描述信息
 class Catdesc extends BaseController
 {
     public $post="";

app/admin/controller/Check.php

@@ -8,6 +8,7 @@ use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 
+//盘点 wsm_good_check(主表，记录了哪个仓库，那个人，什么时间)和wsm_check_item(盘点的商品明细)
 class Check extends BaseController
 {
 public $post = "";
@@ -497,6 +498,7 @@ public function edit()
 
     }
 
+    //导出(盘点的明细)
     public function exportGood(){
         $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
         if($id==""){
@@ -534,6 +536,7 @@ public function edit()
        // return app_show(0,"获取成功",$data);
     }
 
+    //导入
     public function importGood(){
         $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
         if($id==""){

app/admin/controller/Conf.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//系统配置
 class Conf extends BaseController
 {
     public function __construct(App $app)

app/admin/controller/Consult.php

@@ -8,6 +8,7 @@ use think\App;
 use think\facade\Db;
 use think\facade\Validate;
 
+//咨询单
 class Consult extends Base
 {
     public $noble=[];

app/admin/controller/Customar.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//客户
 class Customar extends BaseController
 {
     public $post = "";

app/admin/controller/Customer.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//客户的组织架构
 class Customer extends BaseController
 {
     public $post = "";

app/admin/controller/Departuser.php

@@ -6,6 +6,8 @@ use app\admin\model\ActionLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
+
+//部门
 class Departuser extends BaseController
 {
     public $post = "";

app/admin/controller/Exclusive.php

@@ -7,6 +7,7 @@ namespace app\admin\controller;
 use think\App;
 use think\facade\Db;
 
+//泰康专属的一个列表
 class Exclusive extends Base
 {
     public function __construct(App $app)

app/admin/controller/Express.php

@@ -6,6 +6,7 @@ use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
+//物流信息
 class Express extends \app\BaseController
 {
     public $post='';

app/admin/controller/Gold.php

@@ -8,6 +8,7 @@ use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
+//金价
 class Gold extends \app\BaseController
 {
     public $post=[];

app/admin/controller/Goldprice.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//金价
 class Goldprice extends BaseController
 {
     public $post="";

app/admin/controller/Good.php

@@ -6,6 +6,8 @@ namespace app\admin\controller;
 use app\admin\model\GoodLog;
 use think\App;
 use think\facade\Db;
+
+//线上商品
 class Good extends Base
 {
 
@@ -501,6 +503,7 @@ class Good extends Base
             $unit = Db::name("unit")->where(['id'=>$value['good_unit']])->find();
             $temp['unit'] = isset($unit['unit'])?$unit['unit']:"";
             $temp['sort_f']=isset($value['cat_id'])?made($value['cat_id']):[];
+            $temp['sort_f']=implode('/',array_column($temp['sort_f'],'name'));//由于这个字段原样在页面显示，所以在这里特意拼接成字符串
             $temp['attribute']=$value['craft_desc'];
             $temp['addtime']=$value['addtime'];
             $temp['usable_stock'] = isset($value['usable_stock'])? $value['usable_stock']:"";

app/admin/controller/Goodup.php

@@ -6,6 +6,7 @@ use app\admin\model\ChangeLog;
 use think\App;
 use think\facade\Db;
 
+//商品基础库
 class Goodup extends Base
 {
     public $noble=[];

app/admin/controller/Group.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\facade\Db;
 use think\App;
 
+//管理员权限分组
 class Group extends BaseController
 {
     public  function __construct(App $app)

app/admin/controller/Keepbrand.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//品牌授权
 class Keepbrand extends Base
 {
     public function __construct(App $app)

app/admin/controller/Listcustomer.php

@@ -6,6 +6,8 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
+
+//客户信息
 class Listcustomer extends BaseController
 {
     public $post = "";

app/admin/controller/Log.php

@@ -8,6 +8,7 @@ use think\Request;
 use think\App;
 use think\facade\Db;
 
+//日志
 class Log extends BaseController
 {
     public $post = "";

app/admin/controller/Menu.php

@@ -9,6 +9,7 @@ use think\App;
 use think\facade\Db;
 use think\Request;
 
+//菜单
 class Menu extends BaseController
 {
     public $post="";

app/admin/controller/Newfill.php

@@ -7,6 +7,8 @@ use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 
+
+//系统的组织架构
 class Newfill extends BaseController
 {
      public $post = "";

app/admin/controller/Orderback.php

@@ -8,6 +8,7 @@ use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
+//退货单
 class Orderback extends \app\BaseController
 {
     public $post=[];

app/admin/controller/Orderuse.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//订单用途
 class Orderuse extends BaseController
 {
     public $post="";

app/admin/controller/Platform.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//平台
 class Platform extends BaseController
 {
     public $post ="";

app/admin/controller/Process.php

@@ -5,6 +5,8 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
+
+//流程单
 class Process extends BaseController
 {
     public $post="";

app/admin/controller/Project.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use think\App;
 use think\facade\Db;
 
+//项目
 class Project extends Base
 {
 

app/admin/controller/Proorder.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//消息(已读未读)
 class Proorder extends BaseController
 {
 public $post="";

app/admin/controller/Purch.php

@@ -9,6 +9,7 @@ use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
+//采购单相关功能
 class Purch extends Base
 {
 
@@ -166,11 +167,15 @@ class Purch extends Base
         $im = Db::name('purchease_back')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
         $var=[];
         foreach ($im as $value){
-            $goon = Db::name('good_basic')->where(['spuCode'=>$value['good_code']])->field("cat_id")->find();
-            if(empty($goon)){
-                return error_show(1002,"未找到商品数据");
+            if($data['order_type']==3|| $data['order_type']==4){
+                $goo = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+            }else {
+                $goo =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
+            }
+            if($goo==false) {
+                return error_show(1002, "未找到商品数据");
             }
-            $cat= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
+            $cat= isset($goo['cat_id']) && $goo['cat_id'] !=0 ? made($goo['cat_id']):[];
             $value['cant']=$cat;
             $var[]=$value;
         }
@@ -467,19 +472,20 @@ class Purch extends Base
                 $orderCode = Db::name("order_num")->where([["cgdNo","=",$cg['cgdNo']],["status","=",1]])->column("orderCode");
 
                 if(!empty($orderCode)){
-                    $order = Db::name("sale")->where(["orderCode"=>$orderCode])->select()->toArray();
+                    $order = Db::name("sale")->where("orderCode", 'in', $orderCode)->select()->toArray();
                     if(empty($order)){
                         Db::rollback();
                         return error_show(1002,"未找到确认单信息");
                     }
                     foreach ($orderCode as $value){
                         $data=[
-                            "orderCode"=>$value['orderCode'],
-                            "good_code"=>$value['spuCode'],
-                            "good_name"=>$value['good_name'],
+                            "cgd_diffid"=>$item,
+                            "orderCode"=>$value,
+                            "good_code"=>$cg['spuCode'],
+                            "good_name"=>$cg['good_name'],
                             "diff_weight"=>$diff_weight,
-                            "diff_price"=>$diff_weight*$value['good_price'],
-                            "gold_price"=>$value['good_price'],
+                            "diff_price"=>$diff_weight*$cg['good_price'],
+                            "gold_price"=>$cg['good_price'],
                             "status"=>1,
                             "addtime"=>date("Y-m-d H:i:s"),
                             "updatetime"=>date("Y-m-d H:i:s")
@@ -557,7 +563,13 @@ class Purch extends Base
             return error_show(1002,"未找到采购工差单数据");
         }
         $dn = Db::name('purchease_order')->where(['cgdNo'=>$idinf['cgdNo'],'is_del'=>0])->find();
-        $goon = Db::name('good')->where(['spuCode'=>$idinf['good_code']])->find();
+
+        if($dn['order_type']==3|| $dn['order_type']==4){
+            $goon = Db::name("good_zixun")->where(["spuCode"=>$dn['spuCode'],"is_del"=>0])->find();
+        }else {
+            $goon =Db::name('good_basic')->where(['spuCode'=>$dn['spuCode']])->find();
+        }
+//        $goon = Db::name('good')->where(['spuCode'=>$idinf['good_code']])->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }
@@ -577,7 +589,6 @@ class Purch extends Base
             $idinf['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             $idinf['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
             $idinf['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
-            // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $idinf['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
             $idinf['addr_cn'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
             $idinf['wsm_addr']=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
@@ -609,7 +620,7 @@ class Purch extends Base
         $temp = $dio['status'];
             $dio['status']=$status;
             $dio['updatetime']=date("Y-m-d H:i:s");
-            $item = Db::name("purchease_diff")->update($dio);
+            $item = Db::name("purchease_diff")->save($dio);
          if ($item){
 //             $sto = ["order_code"=>$dio['cgdNo'],"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];
 //             ActionLog::logAdd($this->post['token'],$sto,"CGGCD",$dio['status'],$sto);

app/admin/controller/Purchback.php

@@ -8,6 +8,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//采购单退货
 class Purchback extends BaseController
 {
 public $post="";

app/admin/controller/Purchin.php

@@ -7,6 +7,8 @@ use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
+
+//采购单入库
 class Purchin extends BaseController
 {
     public $post="";

app/admin/controller/Reorder.php

@@ -7,6 +7,8 @@ use app\admin\model\ProcessOrder;
 use think\facade\Db;
 use think\App;
 use app\admin\model\ActionLog;
+
+//销售单退货
 class Reorder extends \app\BaseController
 {
     public $post=[];

app/admin/controller/Resign.php

@@ -11,6 +11,8 @@ use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
+
+//备货
 class Resign extends BaseController
 {
     public $post="";

app/admin/controller/Resigninfo.php

@@ -6,6 +6,8 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//交接
 class Resigninfo extends BaseController
 {
     public $post="";

app/admin/controller/Result.php

@@ -6,6 +6,8 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//异常原因
 class Result extends BaseController
 {
     public $post = "";

app/admin/controller/Role.php

@@ -6,6 +6,8 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//角色
 class Role extends BaseController
 {
 
@@ -197,7 +199,7 @@ class Role extends BaseController
         $info['action'] =explode(",",$info['action_conllect']);
         $info['action_data'] =$info['action_data']!=""?explode(",",$info['action_data']):"";
         $info['private_data'] =$info['private_data']!=""?explode(",",$info['private_data']) :"";
-        $info['private_field'] =$info['private_field']!=""?explode(",",$info['private_field']) :"";
+        $info['private_field'] =$info['private_field']!=""?explode(",",$info['private_field']) :[];
 
         return app_show(0,"获取成功",$info);
     }

app/admin/controller/Sale.php

@@ -9,6 +9,7 @@ use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 
+//销售单
 class Sale extends Base
 {
 
@@ -500,31 +501,7 @@ class Sale extends Base
                 $temp['arrive_time']=$arrtime;
                 $vmp = Db::name('order_addr')->insert($temp,true);
                 if($vmp>0){
-                    $outCode=makeNo("DF");
-                    $out=[
-                        "orderCode"=>$orderCode,
-                        "outCode"=>$outCode,
-                        "apply_id"=>$rm,
-                        "apply_name"=>$ri,
-                        "addrid"=>$vmp,
-                        "post_name"=>"",
-                        "post_code"=>"",
-                        "post_fee"=>0,
-                        "sendtime"=>date("Y-m-d H:i:s"),
-                        "send_num"=>$value['receipt_quantity'],
-                        "check_num"=>0,
-                        "error_num"=>0,
-                        "wsm_code"=>"",
-                        "order_type"=>$etid['order_type'],
-                        "status"=>0,
-                        "addtime"=>date("Y-m-d H:i:s"),
-                        "updatetime"=>date("Y-m-d H:i:s")
-                    ];
-                    $ou =Db::name("order_out")->insert($out);
-                    if($ou==false){
-                        Db::rollback();
-                        return error_show(1002,"发货地址添加创建失败");
-                    }
+
                     $order =Db::name("order_num")->where(["orderCode"=>$orderCode,"status"=>1])->where([["wsend_num",">=",0]])
                         ->select()->toArray();
                     if(empty($order)){
@@ -533,7 +510,9 @@ class Sale extends Base
                     $num = $value['receipt_quantity'];
                     $orsend=[];
                     foreach ($order as $val){
-                        $tep=[];$ornum=0;
+                        $outCode=makeNo("DF");
+                        $tep=[];
+                        $ornum=0;
                         if($val['wsend_num']>=$num){
                             $val['wsend_num']-=$num;
                             $val['send_num']+=$num;
@@ -563,10 +542,40 @@ class Sale extends Base
                             Db::rollback();
                             return error_show(1002,"发货地址添加创建失败");
                         }
+                        $cgdinfo =Db::name("purchease_order")->where(["cgdNo"=>$val['cgdNo']])->find();
+                        if($cgdinfo==false){
+                            Db::rollback();
+                            return error_show(1002,"未匹配到采购数据");
+                        }
+                        $out=[
+                            "orderCode"=>$orderCode,
+                            "outCode"=>$outCode,
+                            "apply_id"=>$rm,
+                            "apply_name"=>$ri,
+                            "addrid"=>$vmp,
+                            "post_name"=>"",
+                            "post_code"=>"",
+                            "post_fee"=>0,
+                            "sendtime"=>date("Y-m-d H:i:s"),
+                            "send_num"=>$ornum,
+                            "check_num"=>0,
+                            "error_num"=>0,
+                            "wsm_code"=>$cgdinfo['wsm_code'],
+                            "order_type"=>$etid['order_type'],
+                            "status"=>1,
+                            "addtime"=>date("Y-m-d H:i:s"),
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                        $ou =Db::name("order_out")->insert($out);
+                        if($ou==false){
+                            Db::rollback();
+                            return error_show(1002,"发货地址添加创建失败");
+                        }
                         if($num==0){
                             break;
                         }
                     }
+
                 }else{
                     Db::rollback();
                     return error_show(1002,"发货地址添加创建失败");
@@ -740,6 +749,7 @@ class Sale extends Base
                         "config"=>$zxinfo['config'],
                         "other_config"=>$zxinfo['other_config'],
                         "weight"=>$zxinfo['weight'],
+                        "good_weight"=>$zxinfo['good_weight'],
                         "is_diff"=>$zxinfo['is_diff'],
                         "supply_area"=>$zxinfo['supply_area'],
                         "pay_way"=>$zxinfo['pay_way'],
@@ -2301,13 +2311,12 @@ class Sale extends Base
 //        }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") {
-            $supplier = Db::name("supplier")->where([['code', "like", "%$supplierNo%"]])->column('code');
-//            if(empty($supplier)){
-//                return error_show(1004,"未找到供应商信息");
-//            }
-            $wsmcode = Db::name("sale")->where([
-                "is_del" => 0, "supplierNo" => $supplier])->column("orderCode");
-            $where[] = ['a.orderCode', "in", $wsmcode];
+//            $supplier = Db::name("business")->where([['code', "like", "%$supplierNo%"]])->column('code');
+////            if(empty($supplier)){
+////                return error_show(1004,"未找到供应商信息");
+////            }
+//            $wsmcode = Db::name("sale")->where(["is_del" => 0, "supplierNo" => $supplier])->column("orderCode");
+            $where[] = ['c.supplierNo', "like", "%$supplierNo%"];
         }
         $companyNo =isset($this->post['companyNo']) &&$this->post['companyNo'] !=="" ? trim($this->post['companyNo']):"";
         if($companyNo!=""){
@@ -2317,25 +2326,27 @@ class Sale extends Base
         $count = Db::name('sale_diff')->alias('a')
             ->join("sale c", "c.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=c.customer_code", "left")
-            ->join("good b", "b.good_code=a.good_code", "left")
             ->where($where)->count();
         $total = ceil($count / $size);
-        $page = $page >= $total ? $total : $page;
-       //var_dump( Db::name('sale_diff')->getLastSql());
+        $page = $page >= $total ? intval($total) : $page;
         $list = Db::name('sale_diff')->alias('a')
             ->join("sale c", "c.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=c.customer_code", "left")
-            ->join("good b", "b.good_code=a.good_kode", "left")
-            ->where($where)->page($page, $size)->field("a.*,b.cat_id,c.customer_code,v.companyName")
+            ->where($where)->page($page, $size)->field("a.*,c.customer_code,v.companyName,c.skuCode,c.order_type,c.supplierNo")
             ->order("a.addtime desc")->select();
 
         $data = [];
         foreach ($list as $value) {
-            $value['can'] = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
-            $wsm = Db::name("sale")->alias("a")->Join("supplier b", "a.supplierNo=b.code", "left")->where
-            (['a.orderCode' => $value['orderCode'], "a.is_del" => 0])->field("b.code,b.name")->find();
-            $value['supplierNo'] = isset($wsm['code']) ? $wsm['code'] : "";
-            $value['supplierName'] = isset($wsm['name']) ? $wsm['name'] : "";
+            if($value['order_type']==3|| $value['order_type']==4){
+                $goon = Db::name("good_zixun")->where(["spuCode"=>$value['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' => $value['skuCode']])->find();
+            }
+            $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
+            $wsm = Db::name("business")->where(['companyNo' => $value['supplierNo']])->find();
+            $value['supplierNo'] = isset($wsm['companyNo']) ? $wsm['companyNo'] : "";
+            $value['supplierName'] = isset($wsm['company']) ? $wsm['company'] : "";
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
@@ -2400,25 +2411,43 @@ class Sale extends Base
             return error_show(1004, "参数id不能为空");
         }
         $info = Db::name("sale_diff")->where(["id" => $id])->find();
-        if (empty($info)) {
+        if ($info==false) {
             return error_show(1004, "订单数据未找到");
         }
+        $cgd = Db::name("purchease_diff")->where(['id'=>$info['cgd_diffid']])->find();
+        if($cgd==false){
+            return error_show(1004, "采购工差单数据未找到");
+        }
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "3";
         $remark = isset($this->post['remark']) && $this->post['remark'] !== "" ? trim($this->post['remark']) : "";
         $ite=$info['status'];
-        $info['status'] = $status;
-        $info['remark'] = $remark;
-        $info['updatetime'] = date("Y-m-d H:i:s");
-        $up = Db::name("sale_diff")->save($info);
-        if ($up) {
-            $stx = ["order_code"=>$info["orderCode"],"status"=>$ite,"action_remark"=>'',"action_type"=>"status"];
-            ActionLog::logAdd($this->post['token'],$stx,"QRGCD",$info['status'],$info);
-            $order=["order_type"=>"QRGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$info['status']];
-            ProcessOrder::AddProcess($this->post['token'],$order);
-            return app_show(0, "更新成功");
-        } else {
-            return error_show(1003, "更新失败");
+        Db::startTrans();
+        try{
+            $upda=[
+                "status"=>$status,
+                "remark"=>$remark,
+                "updatetime"=> date("Y-m-d H:i:s"),
+            ];
+            $up = Db::name("sale_diff")->where($info)->save($upda);
+            if ($up) {
+                $stx = ["order_code"=>$info["orderCode"],"status"=>$ite,"action_remark"=>'',"action_type"=>"status"];
+                ActionLog::logAdd($this->post['token'],$stx,"QRGCD",$info['status'],$info);
+                $order=["order_type"=>"QRGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$status];
+                ProcessOrder::AddProcess($this->post['token'],$order);
+                $cgdup =Db::name("purchease_diff")->where(["id"=>$info['cgd_diffid']])->save($upda);
+                if($cgdup){
+                    Db::commit();
+                    return app_show(0, "更新成功");
+                }
+            }
+                Db::rollback();
+                return error_show(1003, "更新失败");
+
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1003,$e->getMessage());
         }
+
     }
 
     /**
@@ -2433,11 +2462,26 @@ class Sale extends Base
         if ($id === "") {
             return error_show(1004, "参数id不能为空");
         }
-        $info = Db::name('sale_diff')->alias('a')->join("good b", "b.good_code=a.good_kode", "left")->where
-        (["a.id" => $id])->field("a.*,b.cat_id")->find();
+        $info = Db::name('sale_diff')->where(["id" => $id])->find();
         if (empty($info)) {
-            return error_show(1004, "订单数据未找到");
+            return error_show(1004, "工差订单数据未找到");
+        }
+        $einfo = Db::name('sale')->where(['orderCode' => $info['orderCode'], 'is_del' => 0])->find();
+        if ($einfo==false) {
+            return error_show(1002, "未找到销售订单数据");
+        }
+        if($einfo['order_type']==3|| $einfo['order_type']==4){
+            $goon = Db::name("good_zixun")->where(["spuCode"=>$einfo['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' => $einfo['skuCode']])->find();
+        }
+        if($goon==false){
+            return error_show(1002, "未找到商品数据");
         }
+        $info['skuCode'] =isset($goon['skuCode']) ? $goon['skuCode']:"";
+        $info['spuCode'] =isset($goon['spuCode']) ? $goon['spuCode']:"";
+        $info['order_type'] =isset($einfo['order_type']) ? $einfo['order_type']:"";
         $info['can'] = isset($info['cat_id']) && $info['cat_id'] !== 0 ? made($info['cat_id']) : [];
         return app_show(0, "获取成功", $info);
     }
@@ -3047,6 +3091,7 @@ class Sale extends Base
         $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/Share.php

@@ -7,6 +7,8 @@ use app\BaseController;
 use think\Request;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//角色权限共享
 class Share extends BaseController
 {
     /**

app/admin/controller/Specs.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//商品规格
 class Specs extends BaseController
 {
     public $post="";

app/admin/controller/Specvalue.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//规格值
 class Specvalue extends BaseController
 {
     public $post="";

app/admin/controller/Suppler.php

@@ -8,6 +8,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//供应商
 class Suppler extends BaseController
 {
     public $post = "";

app/admin/controller/System.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\facade\Db;
 use think\Request;
 
+//系统设置
 class System extends BaseController
 {
     /**

app/admin/controller/Title.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//客户的营业执照相关信息
 class Title extends BaseController
 {
     public $post = "";

app/admin/controller/Unit.php

@@ -7,6 +7,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//单位
 class Unit extends BaseController
 {
     public $post ="";

app/admin/controller/User.php

@@ -6,6 +6,8 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//用户
 class User extends BaseController
 {
     /**

app/admin/controller/Version.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 
+//版本
 class Version extends BaseController
 {
     public function __construct(App $app)

app/admin/controller/WareHouse.php

@@ -5,6 +5,8 @@ use app\BaseController;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
+
+//仓库
 class WareHouse extends BaseController
 {
     public function __construct(App $app)

app/admin/model/ActionLog.php

@@ -12,6 +12,7 @@ use think\facade\Db;
 class ActionLog extends Model
 {
     /**
+     * 记录操作日志
      * @param $token
      * @param $order
      * @param $type

app/admin/model/ChangeLog.php

@@ -6,6 +6,7 @@ use think\Model;
 
 class ChangeLog extends Model
 {
+    //记录商品、咨询单的修改记录
     static function logAdd($type,$code,$before_info,$after_info,$token,$post){
         $user = GetUserInfo($token);
         unset($post['token']);

app/admin/model/GoodLog.php

@@ -7,6 +7,7 @@ use  think\Model;
 class GoodLog extends Model
 {
     /**
+     * 记录库存的变化
      * @param $token
      * @param $data [{'stock_id':1,'stock_name':‘usable_stock’,'stock_remark':'','stock':10,'type':'cgd'}]
      * @param $action_type

app/admin/model/OrderMsg.php

@@ -11,6 +11,7 @@ use think\Model;
  */
 class OrderMsg extends Model
 {
+    //每个用户的消息
     public static function addmsg($msg){
         $conf=Config::get("order");
         $order_type = $conf['order_type'];

app/admin/model/ProcessOrder.php

@@ -6,6 +6,7 @@ use think\facade\Config;
 
 class ProcessOrder extends \think\Model
 {
+    //记录流程
     public static function AddProcess($token,$order){
         $user = GetUserInfo($token);
         $uid = isset($user['data']['id']) ? $user['data']['id'] :0;

app/admin/model/Workflow.php

@@ -4,6 +4,7 @@
 namespace app\admin\model;
 use think\facade\Config;
 
+//记录操作流程
 class Workflow extends \think\Model
 {