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

app/admin/controller/Sale.php

@@ -1523,11 +1523,6 @@ class Sale extends Base
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         }
-//        $info = Db::name('sale_diff')->where(['orderCode' => $einfo['orderCode']])->select();
-//        //$de = Db::name('order_out')->where(['orderCode' => $einfo['orderCode']])->select();
-//        $dm = Db::name('order_return')->where(['orderCode' => $einfo['orderCode']])->select();
-//        $dk = Db::name('order_back')->where(['orderCode' => $einfo['orderCode']])->select();
-//        $sa = Db::name('sale_return')->where(['orderCode' => $einfo['orderCode']])->select();
         if($einfo['order_type']==3|| $einfo['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$einfo['good_code'],"is_del"=>0])->find();
         }else {
@@ -1591,32 +1586,15 @@ class Sale extends Base
         $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
 
         $in = Db::name('customer_info')->where(['companyNo' => $einfo['customer_code']])->field('companyName')->find();
-        // ->field('addr,contactor,mobile,receipt_quantity,arrive_time')
         $einfo['supplierName'] = '';
         if ($einfo['supplierNo'] != "") {
             $supplier = Db::name("business")->where(["companyNo" => $einfo['supplierNo']])->find();
             $einfo['supplierName'] = isset($supplier['company']) ? $supplier['company'] : "";
         }
-        $fo = Db::name('order_addr')->where(['orderCode' => $einfo['orderCode'], 'is_del' => 0])->select();
-        $bum = Db::name('order_out')->where(['orderCode' => $einfo['orderCode']])->select();
-        $ins = [];
-        if (!empty($bum)) {
-            foreach ($bum as $stn) {
-                $so = Db::name('order_addr')->where(['id' => $stn['addrid']])->find();
-                $addr = GetAddr($so['addr_code']);
-                $stn['addr_info'] = $addr;
-                $stn['add_code'] = json_decode($so['addr_code'], true);
-                $stn['addr'] = $so['addr'];
-                $stn['contact'] = $so['contactor'];
-                $stn['mobile'] = $so['mobile'];
-                $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
-                    ->where(["a.wsm_code" => $stn['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
-                $stn['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-                $stn['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-                $stn['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
-                $ins[] = $stn;
-            }
-        }
+        $fo = Db::name('order_addr')->alias("a")->leftJoin("order_out b","a.id=b.addrid")
+            ->where(['a.orderCode' => $einfo['orderCode'], 'a.is_del' => 0,"b.is_del"=>0])->field("a.*,b.post_name,b.post_code,
+            b.post_fee,b.sendtime,b.send_num,b.check_num,b.error_num,b.wsm_code,b.order_type,b.status as send_status,b.outCode")
+            ->select();
         $addrs = [];
         if (!empty($fo)) {
             foreach ($fo as $value) {
@@ -1626,12 +1604,12 @@ class Sale extends Base
                     $addr = GetAddr($value['addr_code']);
                     $value['addr_info'] = $addr;
                     $value['addr_code'] = json_decode($value['addr_code'], true);
-
-                    $send = Db::name("order_out")->where(['addrid' => $value['id'], 'orderCode' => $einfo['orderCode']])->sum("send_num");
-
-                    $value['send_num'] = $send ?? 0;
                 }
-                $value['wsend_num'] = $value['receipt_quantity'] - $value['send_num'];
+                $value['wsm_name']="";
+                if(isset($value['wsm_code'])&&$value['wsm_code']!=""){
+                    $wsmcode = Db::name("warehouse_info")->where(["wsm_code" => $value['wsm_code']])->find();
+                    $value['wsm_name'] =isset($wsmcode['name'])?$wsmcode['name']:"";
+                }
                 $addrs[] = $value;
             }
         }
@@ -1640,41 +1618,10 @@ class Sale extends Base
             $use =Db::name("order_use")->where(["id"=>$einfo['use_order']])->find();
             $einfo['useage'] = isset($use['order_use']) ?$use['order_use']:"";
         }
-//        //->field('num,sale_price,wsm_code,stock_id')
-//        $st = Db::name('sale_info')->where(['orderCode' => $einfo['orderCode']])->select();
-//        $data = [];
-//        if (!empty($fo)) {
-//            foreach ($st as $value) {
-//                $value['wsm_name'] = "";
-//                $value['wsm_supplier'] = "";
-//                $value['wsm_supplierNo'] = "";
-//                $value['usable_stock'] = 0;
-//                $value['send_num'] = 0;
-//                if ($value['wsm_code'] != "") {
-//                    $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
-//                        ->where(["a.wsm_code" => $value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
-//                    $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-//                    $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-//                    $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
-//                    $dn = Db::name('good_stock')->where(['wsm_code' => $value['wsm_code'], 'good_type_code' => $einfo['good_code']])->find();
-//                    $value['usable_stock'] = isset($dn['usable_stock']) ? $dn['usable_stock'] : "0";
-//                    $send = Db::name("order_out")->where(["wsm_code" => $value['wsm_code'], 'orderCode' => $einfo['orderCode']])->sum("send_num");
-//                    $value['send_num'] = $send ?? 0;
-//                }
-//                $value['wsend_num'] = $value['num'] - $value['send_num'];
-//                $data[] = $value;
-//            }
-//        }
-//        $einfo['info'] = $data;
         $einfo['companyName'] = isset($in['companyName']) ? $in['companyName'] : "";
         $einfo['addrs'] = $addrs;
-       // $einfo['orderout'] = $ins;
         $einfo['can'] = $int;
         $einfo['goodinfo'] = $goon;
-//        $einfo['salediff'] = $info;
-//        $einfo['orderreturn'] = $dm;
-//        $einfo['orderback'] = $dk;
-//        $einfo['salereturn'] = $sa;
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         } else {
@@ -2170,9 +2117,6 @@ class Sale extends Base
                         Db::rollback();
                         return error_show(1002, "库存更新失败");
                     }
-
-                    //  $send = Db::name("order_out")->where(["wsm_code" => $wsm_code, 'orderCode' => $orderCode])->sum
-                    //("send_num");
                     $item =$dr['status'];
                     $dr['send_num'] +=$codeinfo['send_num'];
                     $dr['wsend_num'] -= $codeinfo['send_num'];//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
@@ -2577,14 +2521,6 @@ class Sale extends Base
         }
         $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
         $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
-//        $addrid = isset($this->post['addrid']) && $this->post['addrid'] !== "" ? intval($this->post['addrid']) : "";
-//        $dr = Db::name('order_addr')->where(['id' => $addrid, 'is_del' => 0])->find();
-//        if (empty($dr)) {
-//            return error_show(1003, "收货人信息未找到");
-//        }
-//        if ($dr['orderCode'] !== $orderCode) {
-//            return error_show(1002, "订单code不存在");
-//        }
         $sendtime = isset($this->post['sendtime']) && $this->post['sendtime'] !== "" ? $this->post['sendtime'] : date("Y-m-d H:i:s");
         $order =Db::name("order_num")->where(["orderCode"=>$orderCode,"status"=>1])->where([["wsend_num",">=",0]])
             ->select()->toArray();