Merge branch 'master-new' into master-new-dev-wf

app/admin/controller/After.php

@@ -83,7 +83,7 @@ class After extends Base
 //	        $cgderid =$wsm['contactor'] ??0;
 //		}
 
-        if ($oder['order_type'] == 3) {
+        if ($oder['order_type'] == 3||$oder['order_type'] == 4) {
             $goon = Db::name("good_zixun")
                 ->where(["spuCode" => $oder['good_code'], "is_del" => 0])
                 ->findOrEmpty();
@@ -367,7 +367,7 @@ class After extends Base
 //        $info['companyNo'] = $orderinfo['supplierNo'];
         $info['sale_price'] = $orderinfo['sale_price'];
         $info['total_price'] = sprintf("%1\$.2f", $orderinfo['sale_price'] * $info['error_num']);
-        if ($orderinfo['order_type'] == 3) {
+        if ($orderinfo['order_type'] == 3 || $orderinfo['order_type'] == 4) {
             $goon = Db::name("good_zixun")
                 ->field('cat_id,supplierNo')
                 ->where(["spuCode" => $orderinfo['good_code'], "is_del" => 0])

app/admin/controller/Orderback.php

@@ -204,7 +204,7 @@ class Orderback extends Base
 //          ->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])
 //          ->value('company','');
         $info['addr_cn']=GetAddr($info['addr_code']);
-        if($orderinfo['order_type']==3){
+        if($orderinfo['order_type']==3 || $orderinfo['order_type']==4){
             $goon = Db::name("good_zixun")
                 ->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])
                 ->find();
@@ -558,7 +558,7 @@ class Orderback extends Base
             }
             $spuCode= $info['good_code'];
             if($sale['order_type']!=1){
-              if($sale['order_type']==3){
+              if($sale['order_type']==3 ||$sale['order_type']==4){
 		          $goon = Db::name("good_zixun")->where(["spuCode"=>$sale['good_code'],"is_del"=>0])->find();
 		          $isZx=1;
 		      }else {

app/admin/controller/Purch.php

@@ -235,7 +235,7 @@ class Purch extends Base
 //			$supplierCgder =Db::name("supplier")->where(["code"=>$value['supplierNo']])->findOrEmpty();
 //            $value['supplier_cgderid'] = $supplierCgder['personid'] ??'';
 //            $value['supplier_cgder'] = $supplierCgder['person'] ??'';
-            if($value['order_type']==3){
+            if($value['order_type']==3 || $value['order_type']==4){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
                 //为了格式统一，缺了一个spec_value
@@ -312,6 +312,7 @@ class Purch extends Base
         $im = Db::name('purchease_back')->where(['cgdNo' => $data['cgdNo'], 'is_del' => 0])->select();
         $var = [];
         foreach ($im as $value) {
+
             if (in_array($data['order_type'], [3, 4])) {
                 $goo = Db::name("good_zixun")->field('cat_id')->where(["spuCode" => $value['spuCode'], "is_del" => 0])->findOrEmpty();
             } else {
@@ -326,6 +327,7 @@ class Purch extends Base
         }
         //采购工差单
         $dom = Db::name("purchease_diff")->where(['cgdNo' => $data['cgdNo'], 'is_del' => 0])->find();
+
         if (in_array($data['order_type'], [3, 4])) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $data['spuCode'], "is_del" => 0])->find();
         } else {

app/admin/controller/Purchback.php

@@ -209,7 +209,7 @@ public function backfe(){
             return error_show(1002,"未找到数据");
         }
         $dom = Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],'is_del'=>0])->find();
-        if($dom['order_type']==3){
+        if($dom['order_type']==3 ||$dom['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dom['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dom['spuCode']])->find();

app/admin/controller/Purchin.php

@@ -163,7 +163,7 @@ class Purchin extends Base
             $value['cgder'] = $all_supplier_list[$value['supplierNo']]['person']??'';
 
             //获取规格、品牌信息
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type'] == 4 ) {
                 $temp = Db::name('good_zixun')
                     ->alias('gz')
                     ->field('gz.specinfo,b.brand_name')
@@ -602,7 +602,7 @@ class Purchin extends Base
             return error_show(1004,"未找到数据");
         }
         $dom = Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],'is_del'=>0])->find();
-        if($dom['order_type']==3){
+        if($dom['order_type']==3|| $dom['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dom['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dom['spuCode']])->find();

app/admin/controller/Reorder.php

@@ -36,7 +36,7 @@ class Reorder extends Base
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
-        if($order['order_type']==3){
+        if($order['order_type']==3 ||$order['order_type']==4){
             $goon = Db::name("good_zixun")
                 ->where(["spuCode"=>$order['good_code'],"is_del"=>0])
                 ->findOrEmpty();
@@ -567,7 +567,7 @@ class Reorder extends Base
            return error_show(1004,"未找到退货数据");
        }
        $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
-        if($orderinfo['order_type']==3){
+        if($orderinfo['order_type']==3 ||$orderinfo['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
 
         }else {
@@ -1344,7 +1344,7 @@ class Reorder extends Base
             return error_show(1002,"仓库未发货数量不足退货");
         }
 
-        if($order['order_type']==3) $goon = Db::name("good_zixun")->field('supplierNo')->where(["spuCode"=>$order['good_code'],"is_del"=>0])->findOrEmpty();
+        if($order['order_type']==3 ||$order['order_type']==4) $goon = Db::name("good_zixun")->field('supplierNo')->where(["spuCode"=>$order['good_code'],"is_del"=>0])->findOrEmpty();
         else  $goon = Db::name('good_basic')
                 ->where(['spuCode' => $order['good_code']])->findOrEmpty();
         if(empty($goon)) return json_show(1004,'该商品不存在');
@@ -1443,7 +1443,7 @@ class Reorder extends Base
         if($retrun>0){
             return error_show(1005,"存在退货订单数据");
         }
-        if($order['order_type']==3){
+        if($order['order_type']==3 ||$order['order_type']==4){
             $goon = Db::name("good_zixun")
                 ->where(["spuCode"=>$order['good_code'],"is_del"=>0])
                 ->findOrEmpty();

app/admin/controller/Sale.php

@@ -2227,7 +2227,7 @@ class Sale extends Base
 
         $data = [];
         foreach ($list as $value) {
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 ||$value['order_type']==4) {
                 $var = Db::name("good_zixun")->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
                 $value["speclist"] = isset($var['specinfo']) && $var['specinfo'] != "" ? json_decode($var['specinfo'], true) : "";
             } else {
@@ -2442,7 +2442,7 @@ class Sale extends Base
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if ($einfo['order_type'] == 3) {
+        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();
@@ -2573,7 +2573,7 @@ class Sale extends Base
                 ->find();
             $einfo['proof_type'] = isset($proof['proof_type']) ? $proof['proof_type'] : '';
             $einfo['proof_url'] = isset($proof['proof_url']) ? $proof['proof_url'] : '';
-        } elseif ($einfo['order_type'] == 3) {
+        } elseif ($einfo['order_type'] == 3 ||$einfo['order_type']==4) {
             $einfo['proof_type'] = isset($goon['proof_type']) ? $goon['proof_type'] : '';
             $einfo['proof_url'] = isset($goon['proof_url']) ? $goon['proof_url'] : '';
         } else {
@@ -3719,7 +3719,7 @@ class Sale extends Base
             return error_show(1002, "未找到出库数据");
         }
         $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        if ($item['order_type'] == 3) {
+        if ($item['order_type'] == 3 ||$item['order_type'] == 4  ) {
             $goodinfo = Db::name("good_zixun")->where(["spuCode" => $item['good_code'], "is_del" => 0])->find();
             if ($goodinfo == false) {
                 return error_show(1004, "未找到商品数据");
@@ -4108,9 +4108,9 @@ class Sale extends Base
                 //如果是库存品，只能由库管和库管-张凯旋操作
                 $own_roleid = Db::name('user_role')->where(['is_del'=>0,'uid'=>$uid,'status'=>1])->value('roleid',0);
                 if (!in_array($own_roleid, config('app.wsm_cgder_role'))) throw new \think\Exception('库存品只能由库管人员操作');
-            } elseif ($einfo['is_stock'] == 0 || $einfo['order_type'] == 3) {
+            } elseif ($einfo['is_stock'] == 0) {
                 //非库存品和采返商品只能由供应商负责人操作
-                if ($einfo['order_type'] == 3) {
+                if ($einfo['order_type'] == 3 || $einfo['order_type'] ==4 ) {
                     $supplierNo = Db::name('good_zixun')
 //                        ->leftJoin("supplier b", "a.supplierNo=b.code")
                         ->where(['spuCode' => $einfo['good_code'], 'is_del' => 0])
@@ -4701,7 +4701,7 @@ class Sale extends Base
 		$userCommon = new \app\admin\common\User();
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
                 $good = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,supplierNo')
@@ -4901,7 +4901,8 @@ class Sale extends Base
                         return app_show(1003, $value['outCode'] . '发货单只能由库管操作');
                     }
                 } else {
-                	if($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==3){
+                	if($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==3
+                	||$sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['order_type']==4 ){
 		                $personid = Db::name('good_zixun')->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
 		                              ->where(['a.spuCode' => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['good_code'], 'a.is_del' => 0])
 		                              ->value('personid');
@@ -5011,9 +5012,9 @@ class Sale extends Base
                         if ($stock_rs == false) throw new Exception($value['outCode'] . '库存更新失败');
 		                    $outsend =Db::name("order_send")->where(["outCode"=> $value['outCode']])->findOrEmpty();
 		                    if(empty($outsend)){
-		                            Db::rollback();
-		                             return error_show(1002, "未找到关联采购单");
-		                        }
+		                    	Db::rollback();
+		                        return error_show(1002, "未找到关联采购单");
+		                    }
 		                    $cgdinfo= Db::name("purchease_order")->where(["cgdNo"=>$outsend['cgdNo'],"is_del"=>0])
 		                    ->findOrEmpty();
 		                    $bn_code =makeNo("BN");

app/admin/controller/SaleReport.php

@@ -541,7 +541,7 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3 ||$value['order_type']==4) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u','u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else  $value['unit'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             $value['is_stock'] = isset($this->all_stock[$value['is_stock']]) ? $this->all_stock[$value['is_stock']] : '';
@@ -698,7 +698,7 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type']==4) {
                 $value['unit'] = Db::name("good_zixun")
                     ->alias('gz')
                     ->leftJoin('unit u', 'u.id=gz.good_unit')
@@ -769,7 +769,8 @@ class SaleReport extends Base
                 $value['二级企业'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3||$value['order_type']==4) $value['单位'] = Db::name("good_zixun")->alias('gz')
+            ->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['单位'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             if (!isset($company_tmp[$value['apply_id']])) $company_tmp[$value['apply_id']] = $value['apply_id'];
@@ -847,7 +848,8 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3 || $value['order_type']==4) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u',
+             'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['unit'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             if (!isset($uid_tmp[$value['apply_id']])) $uid_tmp[$value['apply_id']] = $value['apply_id'];//get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
@@ -949,7 +951,8 @@ class SaleReport extends Base
                 $value['二级企业'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3 || $value['order_type']==4) $value['单位'] = Db::name("good_zixun")->alias('gz')
+            ->leftJoin('unit u','u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['单位'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             if (!isset($uid_tmp[$value['apply_id']])) $uid_tmp[$value['apply_id']] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
@@ -1408,7 +1411,7 @@ class SaleReport extends Base
         foreach ($data as $value) {
 
             if (!isset($codes[$value['customer_code']])) $codes[$value['customer_code']] = $value['customer_code'];
-            if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
+            if ($value['order_type'] == 3 || $value['order_type']==4) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
             else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode'], 'is_del' => 0])->value('noble_metal');
 
             if (!isset($uid_tmp[$value['apply_id']])) $uid_tmp[$value['apply_id']] = $value['apply_id'];
@@ -1465,7 +1468,7 @@ class SaleReport extends Base
         foreach ($data as $value) {
             if (!isset($codes[$value['customer_code']])) $codes[$value['customer_code']] = $value['customer_code'];
 
-            if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
+            if ($value['order_type'] == 3|| $value['order_type']==4) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
             else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode'], 'is_del' => 0])->value('noble_metal');
 
 

app/admin/controller/SupplierClient.php

@@ -167,7 +167,7 @@ class SupplierClient extends Base {
             $value['supplier_cgderid'] = $person_list[$value['supplierNo']]['personid'] ?? '';
             $value['supplier_cgder'] = $person_list[$value['supplierNo']]['person'] ?? '';
             $value['companyName'] = $names['data'][$value['companyNo']] ?? '';
-            if($value['order_type']==3){
+            if($value['order_type']==3 || $value['order_type']==4){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
                 //为了格式统一，缺了一个spec_value
@@ -342,7 +342,7 @@ class SupplierClient extends Base {
             $value['cgder'] = $all_supplier_list[$value['supplierNo']]['person']??'';
 
             //获取规格、品牌信息
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 ||$value['order_type']==4) {
                 $temp = Db::name('good_zixun')
                     ->alias('gz')
                     ->field('gz.specinfo,b.brand_name')
@@ -471,7 +471,7 @@ class SupplierClient extends Base {
         $names = $userCommon->handle('getCodeAndName',['code'=>array_unique(array_column($list,'companyNo'))]);
 
         foreach ($list as $value){
-            if($value['order_type']==3){
+            if($value['order_type']==3 ||$value['order_type']==4){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             }else {
                 $goon =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();

app/admin/controller/Version.php

@@ -464,8 +464,8 @@ class Version extends BaseController
                 $postdata=json_decode($postinfo['post_data'],true);
             }
         }
-         if($orderinfo['order_type']==3){
-            $good=Db::name("consult_bids")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
+         if($orderinfo['order_type']==3 || $orderinfo['order_type']==4){
+            $good=Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
           }else{
             $good=Db::name("good")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
          }