Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Sale.php

@@ -1585,38 +1585,37 @@ class Sale extends Base
         }
 
 
-        //->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;
+//        //->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['salediff'] = $info;
-        //$einfo['orderout'] = $de;
         $einfo['orderreturn'] = $dm;
         $einfo['orderback'] = $dk;
         $einfo['salereturn'] = $sa;