Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Purchin.php

@@ -275,7 +275,7 @@ class Purchin extends Base
         if($send_num>$cgdinfo['wsend_num']-$wsmin_num){
             return error_show(1009,"采购单剩余未发货数量不足");
         }
-        if($sendtype==2 || $cgdinfo['order_type']!=1){
+        if($cgdinfo['order_type']!=1){
             $status=2;
         }
         $orin = [
@@ -332,48 +332,13 @@ class Purchin extends Base
                 $is_stock = Db::name('good_basic')
                     ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
                     ->value('is_stock');
-//                if($is_stock == 1){
-//                    //库存品，只能由库管操作
-//                    $own_roleid = Db::name('user_role')->where(['is_del' => 0, 'status' => 1, 'uid' => $this->uid])->value('roleid');
-//                    if (!in_array($own_roleid, config('app.wsm_cgder_role'))) throw new Exception('只能由库管人员操作');
-//                }else{
-                    //非库存品，只能由供应商负责人操作(开通账号的不能操作)
-                    //判断该供应商是否开通账号
-                    //好像status==4里面的判断没用了，但是没时间修改
-//                if ($is_stock == 0) {
-                    //全都只能由供应商负责人操作(开通账号的不能操作)
-//                    $res = SupplierRelationUserModel::field('id')
-//                        ->where(['is_del' => SupplierUserModel::$is_del_normal, 'supplierNo' => $cgdinfo['supplierNo'], 'status' => SupplierUserModel::$status_normal])
-//                        ->findOrEmpty()
-//                        ->isEmpty();
-//                    if (!$res) throw new Exception('供应商已开通账号，只能由供应商端操作');
-
-//				}
-
-//                $personid = Db::name('supplier')
-//                    ->where('code', $cgdinfo['supplierNo'])
-//                    ->value('personid');
-//				$userCommon= \app\admin\common\User::getIns();
-//	            $supplier_temp =$userCommon->handle("sInfo",["code"=>$cgdinfo['supplierNo']]);
-
-//                if ($supplier_temp['code']!=0 || empty($supplier_temp['data'])) throw new Exception('查不到该供应商的记录');
-//				$personid = $supplier_temp['data']['personid']??0;
-//				$person_name = $supplier_temp['data']['person']??'';
-//                if ($this->uid != $personid) throw new Exception('只能由供应商负责人操作');
-//                }
+
 
                 $userCommon = \app\admin\common\User::getIns();
                 $supplier_temp = $userCommon->handle('sInfo',['code'=>$cgdinfo['supplierNo']]);
                 $person = $supplier_temp['data'];
 
                 if ($this->level == 2 && $this->uid != $person['personid']) throw new Exception('只能由供应商负责人操作');
-//                    $person = Db::connect('mysql_sys')
-//                        ->name('supplier')
-//                        ->where('code', $cgdinfo['supplierNo'])
-//                        ->field('person,personid')
-//                        ->findOrEmpty();
-//                    if ($this->uid != $person['personid']) throw new Exception('只能由供应商负责人操作');
-//                }
 
                 if($status==1){
                             Db::commit();
@@ -423,39 +388,6 @@ class Purchin extends Base
 
                         //todo:: 新增bn编号库存数据修改
                         if($cgdinfo['order_type']==1){
-//                        	$bnin=GoodStockInfo::AddBn($stockid,$bn_code,$send_num,$cgdinfo['good_price']);
-//	                        if($bnin==false){
-//	                            Db::rollback();
-//	                            return error_show(1004,"库存bn数据新增失败");
-//	                        }
-                            $bk =Db::name("order_bk")->where(['cgdNo'=>$cgdinfo['cgdNo']])->find();
-                            if($bk==false){
-                                $bk=[
-                                    "cgdNo"=>$cgdinfo['cgdNo'],
-                                    "spuCode"=>$cgdinfo['spuCode'],
-                                    "companyNo"=>$cgdinfo['companyNo'],
-                                    "total_num"=>$send_num,
-                                    "merge_num"=>0,
-                                    "balance_num"=>$send_num,
-                                    "status"=>1,
-                                    "is_del"=>0,
-                                    'addtime'=>date("Y-m-d H:i:s"),
-                                    "updatetime"=>date("Y-m-d H:i:s")
-                                ];
-                                $upcgd =Db::name("order_bk")->save($bk);
-                            }else{
-                                $where=['id'=>$bk['id'],'total_num'=>$bk['total_num'],'balance_num'=>$bk['balance_num']];
-                                $bk['balance_num']+=$send_num;
-                                $bk['total_num']+=$send_num;
-                                $bk['updatetime']=date("Y-m-d H:i:s");
-                                $upcgd =Db::name("order_bk")->where($where)->update($bk);
-                            }
-
-                            if($upcgd==false){
-                                Db::rollback();
-                                return error_show(1004,"采购单数量更新失败");
-                            }
-
                             //商品表里的'可用总库存数'增加
                             Db::name('good')
                                 ->where(['is_del' => 0, 'spuCode' => $cgdinfo['spuCode']])
@@ -475,21 +407,6 @@ class Purchin extends Base
                                         return error_show(1004,"出库单出库失败");
                                     }else{
 
-                                        //尝试拆单
-
-
-                                        //查询是否有非库存品订单
-//                                        $is_stock = Db::name('sale')
-//                                            ->where([
-//                                                ['is_del','=',0],
-//                                                ['orderCode','in',array_column($out,'orderCode')]
-//                                            ])->column('is_stock','orderCode');
-
-//                                        $supplier = Db::name('supplier')
-//                                            ->field('person,personid')
-//                                            ->where(['code'=>$cgdinfo['supplierNo'],'is_del'=>0])
-//                                            ->findOrEmpty();
-
                                         foreach ($out as $k => $v_outCode) {
 	                                        \app\admin\model\OrderOutChild::makeChild($v_outCode['outCode']);
                                             ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [