ad

app/admin/controller/CombindStock.php

@@ -36,7 +36,6 @@ class CombindStock extends Base
 		->withJoin(["wsminfo","good"],"left")
 		->where($where)->order("id desc")
 		->paginate(["page"=>$param['page'],"list_rows"=>$param['size']]);
-
 		return app_show(0,"获取成功",["list"=>$list->items(),"count"=>$list->total()]);
 		
 	}

app/admin/controller/Goodup.php

@@ -21,7 +21,6 @@ class Goodup extends Base
     public function __construct(App $app)
     {
         parent::__construct($app);
-
         $this->noble=\think\facade\Config::get("noble");
     }
     public function list(){
@@ -133,21 +132,6 @@ class Goodup extends Base
             else  $where[]=["gb.spuCode","not in",$sta];
         }
 
-//        //只有level2的账号过滤数据权限
-//        if ($this->level == 2) {
-//            $role = $this->checkDataShare();
-//            $hand = resign_hand_user($this->uid, 0);
-//            if (!empty($role[DataGroupModel::$type_全部])) {
-//                $arr = array_unique(array_merge($hand, $role[DataGroupModel::$type_全部]));
-//                $supplierNos = Db::connect('mysql_sys')
-//                    ->name('supplier')
-//                    ->where(['is_del' => 0, 'personid' => $arr])
-//                    ->column('code');
-//				array_push($supplierNos,'');
-//                $where[] = ['gb.supplierNo', 'in', $supplierNos];
-//            }
-//        }
-
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["gb.createrid", 'in', get_company_item_user_by_name($company_name)];
 
@@ -508,12 +492,12 @@ class Goodup extends Base
 	        $cgd_supplier_code =  isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
 	        $cgd_apply_id =  isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
-	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
+//	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
 	        $cgd_supplier_name='';
-	        if(isset($supplier_account[$supplierNo])){
+	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
 	            if($cgd_supplier_code=="")return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=="")return error_show(1004,'采购竞单人信息不能为空');
-	            if($supplier_origin_price==="")return error_show(1004,'采购供应商信息采购成本不能为空');
+//	            if($supplier_origin_price==="")return error_show(1004,'采购供应商信息采购成本不能为空');
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
 		          $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
 	        }
@@ -725,7 +709,7 @@ class Goodup extends Base
                 'is_combind'=>$isCombind,
                 'chargerid'=>$supplier['personid']??$createrid,
                 'charger'=>$supplier['person']??$creater,//负责人跟创建人一致
-                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+//                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
                 'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
                 'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
                 'cgd_apply_id'=>$cgd_apply_id,//竞单人
@@ -779,6 +763,7 @@ class Goodup extends Base
                         $lemp['mark_fee'] = $value['mark_fee'];
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
+                        $lemp['supplier_origin_price'] = $value['supplier_origin_price'];
                         if($is_gold_price==1 && $top_cat_id==6){
 
                             //$is_gold_price==1 表示启用实时金价，cat_id==6表示贵金属
@@ -1244,29 +1229,6 @@ class Goodup extends Base
                     "before_status"=>$datas['status'],
                     'holder_id'=>$datas['createrid'],
                 ]);
-//                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
-//                if($online){
-//                    $onup = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save
-//                    (["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-//                    if($onup==false){
-//                        Db::rollback();
-//                        return app_show(1004,"商品规成本修改失败");
-//                    }
-//                    //修改状态，添加待办
-//                    ActionLog::logAdd($this->post['token'], [
-//                        "order_code" =>$online['skuCode'],//咨询单详情编号
-//                        "status" =>  $online['exam_status'],//这里的status是之前的值
-//                        "action_remark" => '',//备注
-//                        "action_type" => "edit"//新建create，编辑edit，更改状态status
-//                    ], "SPSX",2,["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-//
-//                    ProcessOrder::AddProcess($this->post['token'], [
-//                        "order_type" => 'SPSX',
-//                        "order_code" => $online['skuCode'],//咨询单详情编号
-//                        "order_id" => $online['id'],
-//                        "order_status" =>2,"before_status"=>$online['exam_status']
-//                    ]);
-//                }
                 if($good_ladder!=="" && !empty($good_ladder)){
 
                     $user =GetUserInfo($this->post['token']);
@@ -1283,6 +1245,7 @@ class Goodup extends Base
                         $lemp['mark_fee'] = $value['mark_fee'];
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
+                        $lemp['supplier_origin_price'] = $value['supplier_origin_price'];
                         $top_cat_id = made($datas['cat_id']);//获取所有分类
                         $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
                         if($is_gold_price==1 && $top_cat_id==6){
@@ -2707,11 +2670,6 @@ class Goodup extends Base
             ->findOrEmpty();
         if(empty($good)) return json_show(1005,"商品数据未找到");
 
-//        $num=isset($this->post['min_num'])&&$this->post['min_num']!=="" ? intval($this->post['min_num']):"";
-//        if($num==""){
-//            return error_show(1005,"参数min_num不能为空");
-//        }
-
         $nakelist = Db::name("good_nake")
             ->where(['spuCode'=>$param['spuCode'],"is_del"=>0])
             ->where([["min_num","<=",$param['min_num']]])
@@ -2722,7 +2680,6 @@ class Goodup extends Base
                 ->where(['spuCode'=>$param['spuCode'],"is_del"=>0])
                 ->order("min_num asc")
                 ->find();
-
             //非库存品的话，继续校验最小起订量
             //库存品的话，不足采购起订量的时候，取采购最小起订量
             if ($good['is_stock'] == 0) return error_show(1010, "起订量不足{$nakelist['min_num']}");

app/admin/controller/Sale.php

@@ -105,20 +105,18 @@ class Sale extends Base
                 return error_show(1002, "参数act_code不能为空");
             }
         }
+           $origin = Db::name('good_nake')->where([['spuCode', '=', $spuCode], ['min_num', '<=', $good_num], ['is_del', '=', 0]])->order('min_num desc')->find();
+           if ($origin == false) {
+              return error_show(1003, '未找到相关阶梯成本价格');
+           }
+           $origin_price = $origin['nake_total'];
+           $cgd_origin_price = $origin['supplier_origin_price'];
         if ($goodinfo['is_stock'] == 1) {
            $stock_num = Db::name("good")->where(["spuCode"=> $spuCode])->value("usable_stock",0);
             if($stock_num < $good_num){
                 return error_show(1003, "商品可用库存数量不足");
             }
             $origin_price = 0;
-        } else {
-            if ($is_activity == 0) {
-                $origin = Db::name("good_nake")->where([["spuCode", "=", $spuCode], ["min_num", "<=", $good_num], ["is_del", "=", 0]])->order("min_num desc")->find();
-                if ($origin == false) {
-                    return error_show(1003, "未找到相关阶梯成本价格");
-                }
-                $origin_price = $origin['nake_total'];
-            }
         }
 
         $sale_price = isset($this->post['good_price']) && $this->post['good_price'] !== "" ? floatval($this->post['good_price']) : '';
@@ -193,7 +191,7 @@ class Sale extends Base
             'send_way' => 2,
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
-             'supplier_origin_price'=>$goodinfo['supplier_origin_price'],//供应商采购成本
+             'supplier_origin_price'=>$cgd_origin_price,//供应商采购成本
 	        'cgd_supplier_code'=>$goodinfo['cgd_supplier_code'],//采购供应商编号
 	        'cgd_supplier_name'=>$goodinfo['cgd_supplier_name'],//采购供应商编号
 	        'cgd_apply_id'=>$goodinfo['cgd_apply_id'],//竞单人
@@ -1881,16 +1879,14 @@ class Sale extends Base
             throw new Exception("商品售价信息未找到");
         }
         $sale_price = $goodlass['sale_price'];
-        $origin_price = 0;
-        if ($good['is_stock'] == 0) {
-            $origin = Db::name("good_nake")->where([["spuCode", "=", $data['spuCode']], ["min_num", "<=", $data['good_num']],
-                ["is_del", "=", 0]])->order("min_num desc")->find();
-            if ($origin == false) {
-//                return 4;//商品信息未找到
-                throw new Exception("商品成本售价信息未找到");
-            }
-            $origin_price = $origin['nake_total'];
+        $origin = Db::name('good_nake')->where([['spuCode', '=', $data['spuCode']], ['min_num', '<=', $data['good_num']],
+                ['is_del', '=', 0]])->order('min_num desc')->find();
+        if ($origin == false) {
+                throw new Exception('商品成本售价信息未找到');
         }
+         $origin_price = $good['is_stock'] == 0?$origin['nake_total']:0;
+         $cgd_origin_price = $origin['supplier_origin_price'];
+        
         if ($good['is_gold_price'] == 1 && $good['is_stock'] == 0) {
             $gold = Db::name("gold_price1")
                 ->field('id,price')
@@ -2012,7 +2008,7 @@ class Sale extends Base
                 'send_way' => 2,
                 'good_createrid' => $good['createrid'],
                 'good_creater' => $good['creater'],//商品创建人
-                 'supplier_origin_price'=>$good['supplier_origin_price'],//供应商采购成本
+                 'supplier_origin_price'=>$cgd_origin_price,//供应商采购成本
 		        'cgd_supplier_code'=>$good['cgd_supplier_code'],//采购供应商编号
 		        'cgd_supplier_name'=>$good['cgd_supplier_name'],//采购供应商编号
 		        'cgd_apply_id'=>$good['cgd_apply_id'],//竞单人

app/command/ExecByRelaComNoHandle.php

@@ -117,9 +117,6 @@ class ExecByRelaComNoHandle extends Command
                         'expiretime' => date('Y-m-d H:i:s', strtotime('+7 day')),
                         'remark' => ''
                     ]);
-
-                //$output->writeln('【' . $info['id'] . '】该预约记录处理成功');
-
             } //else  $output->writeln('没有可供处理的报表预约记录');
 
         } catch (Exception $exception) {
@@ -132,8 +129,6 @@ class ExecByRelaComNoHandle extends Command
                     'expiretime' => date('Y-m-d H:i:s', strtotime('+7 day')),
                     'remark' => $exception->getMessage()
                 ]);
-
-            //$output->writeln($exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
         }
 
     }

app/command/ImportOrderFromCHandleData.php

@@ -118,19 +118,18 @@ class ImportOrderFromCHandleData extends Command
                 $spuCode = $ct['spuCode'];
                 $skuCode = $ct['skuCode'];
                 $is_activity = empty($extend_data['activity_name']) ? 0 : 1;
-
+                $origin = Db::name('good_nake')
+                        ->where([['spuCode', '=', $spuCode], ['min_num', '<=', $good_num], ['is_del', '=', 0]])
+                        ->order('min_num desc')
+                        ->find();
+                if ($origin == false) throw new \Exception('未找到相关成本价格');
+                $origin_price = $goodinfo['is_stock'] == 1?0:$origin['nake_total'];
+                $cgd_origin_price = $origin['supplier_origin_price'];
                 if ($goodinfo['is_stock'] == 1) {
                     if ($ct['usable_stock'] < $good_num) {
                         throw new \Exception('商品库存数量不足');
                     }
-                    $origin_price = 0;
-                } else {
-                    $origin = Db::name("good_nake")
-                        ->where([["spuCode", "=", $spuCode], ["min_num", "<=", $good_num], ["is_del", "=", 0]])
-                        ->order("min_num desc")
-                        ->find();
-                    if ($origin == false) throw new \Exception('未找到相关成本价格');
-                    $origin_price = $origin['nake_total'];
+                    
                 }
 
                 $sale_price = $extend_data['price'];
@@ -211,15 +210,18 @@ class ImportOrderFromCHandleData extends Command
                     'gold_price' => $ct['cgd_gold_price'],
                     'good_createrid' => $goodinfo['createrid'],
                     'good_creater' => $goodinfo['creater'],//商品创建人
-                    "weight" => $ct['noble_weight']
+                    "weight" => $ct['noble_weight'],
+                    'supplier_origin_price'=>$cgd_origin_price,//供应商采购成本
+			        'cgd_supplier_code'=>$goodinfo['cgd_supplier_code'],//采购供应商编号
+			        'cgd_supplier_name'=>$goodinfo['cgd_supplier_name'],//采购供应商编号
+			        'cgd_apply_id'=>$goodinfo['cgd_apply_id'],//竞单人
+			        'cgd_apply_name'=>$goodinfo['cgd_apply_name'],//竞单人
                 ];
 
                 $send_num = $extend_data['num'];
                 $remark = $extend_data['order_remark'];
                 $rm = $c_data['createrid'];
                 $ri = $c_data['creater'];
-
-
                 $data = [
                     "orderCode" => $orderCode,
                     "good_code" => $spuCode,
@@ -557,6 +559,11 @@ class ImportOrderFromCHandleData extends Command
             "order_source" => $data['order_source'],
             "good_type" => $data['good_type'],
             "addtime" => date("Y-m-d H:i:s"),
+            'supplier_origin_price'=>$data["supplier_origin_price"],//供应商采购成本
+	        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
             "updatetime" => date("Y-m-d H:i:s"),
             'good_createrid' => $data['good_createrid'],
             'good_creater' => $data['good_creater'],//商品创建人

app/command/handleYzOrderData.php

@@ -90,22 +90,19 @@ class handleYzOrderData extends Command
                 $spuCode = $ct['spuCode'];
                 $skuCode = $ct['skuCode'];
 
-
+				$origin = Db::name('good_nake')
+				                        ->where([['spuCode', '=', $spuCode], ['min_num', '<=', $good_num], ['is_del', '=', 0]])
+				                        ->order('min_num desc')
+				                        ->find();
+				if ($origin == false) throw new \Exception('未找到相关成本价格');
+			        $origin_price = $goodinfo['is_stock'] == 1?0:$origin['nake_total'];
+			     $cgd_origin_price = $origin['supplier_origin_price'];
                 if ($is_stock == 1) {
                     if($ct['usable_stock'] < $good_num){
 			               throw new Exception('商品库存数量不足');
 			            }
                     $origin_price = 0;
 
-                } else {
-
-                    $origin = Db::name("good_nake")
-                        ->where([["spuCode", "=", $spuCode], ["min_num", "<=", $good_num], ["is_del", "=", 0]])
-                        ->order("min_num desc")
-                        ->find();
-                    if ($origin == false) throw new Exception('未找到相关成本价格');
-                    $origin_price = $origin['nake_total'];
-
                 }
 
 				$is_activity = 0;
@@ -141,11 +138,7 @@ class handleYzOrderData extends Command
                 $rm = isset($user['id']) ? $user['id'] : 0;
                 $ri = isset($user['nickname']) ? $user['nickname'] : 'youzan';
 				if($rm==0)throw new Exception('平台转单未找到对应的平台账户');
-
-//                $supplier_temp_info = Db::name('supplier')
-//                    ->field('id,person,personid')
-//                    ->where('code', $ct['supplierNo'])
-//                    ->findOrEmpty();
+				
                 $userCommon = User::getIns();
                 $tmp = $userCommon->handle('sInfo',['code'=>$ct['supplierNo']]);
                 $supplier_temp_info = $tmp['data']??[];
@@ -186,7 +179,6 @@ class handleYzOrderData extends Command
                     'activity_code' => $is_activity==1 ? $act['activity_code'] : ($is_activity==2?"txx":""),
                     "order_type" => $order_type,
                     "order_source" => $order_source,
-//                "poNo"=>$poNo,
                     'good_weight' => $ct['weight'],
                     'gold_price' => $ct['cgd_gold_price'],
                     'cost_price' => $ct['cost_fee'],
@@ -264,6 +256,11 @@ class handleYzOrderData extends Command
                             'good_createrid' => $goodinfo['createrid'],
                             'good_creater' => $goodinfo['creater'],//商品创建人
                             'weight' => $ct['noble_weight'],//商品创建人
+                              'supplier_origin_price'=>$cgd_origin_price,//供应商采购成本
+						        'cgd_supplier_code'=>$goodinfo['cgd_supplier_code'],//采购供应商编号
+						        'cgd_supplier_name'=>$goodinfo['cgd_supplier_name'],//采购供应商编号
+						        'cgd_apply_id'=>$goodinfo['cgd_apply_id'],//竞单人
+						        'cgd_apply_name'=>$goodinfo['cgd_apply_name'],//竞单人
                         ];
 
                         //非库存品
@@ -491,8 +488,6 @@ class handleYzOrderData extends Command
     private function createCgd($data = [], $rm = '0', $ri = '', array &$standing_book_data = [])
     {
         $cgdCode = makeNo("CG");
-//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
-//        if ($supplier == false) return false;
 
         $wsm = Db::name("warehouse_info")
             ->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "is_del" => 0])
@@ -570,6 +565,11 @@ class handleYzOrderData extends Command
             'good_createrid' => $data['good_createrid'],
             'good_creater' => $data['good_creater'],//商品创建人
             'from_tag' => isset($from_tag[$data['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
+            'supplier_origin_price'=>$data['supplier_origin_price'],//供应商采购成本
+	        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
         ];
         $up = Db::name("purchease_order")->insert($cg, true);
         if ($up) {