edit

app/factory/assets/pc/html/cashier.html

@@ -207,7 +207,8 @@
 
 				var data = {};
 				data = {store_id:store_id, factory_id:factory_id, goods:goods_string, info:info};
-				$.getJSON(url, data, function(t) {
+				$.post(url, data, function(t) {
+					t = JSON.parse(t);
 					if (t.status == 1) {
 						layui.layer.alert('订货下单成功', function(index){
 						  location.href = t.data;

app/shop/lib/Manage.php

@@ -583,4 +583,24 @@ class Manage
             Dever::alert('错误的订单号');
         }
     }
+
+    public function searchName($where)
+    {
+        $data = Dever::db('store/info')->like($where);
+        if (!$data) {
+            $data = Dever::db('shop/info')->like($where);
+        }
+
+        return $data;
+    }
+
+    public function searchFName($where)
+    {
+        $data = Dever::db('store/info')->like($where);
+        if (!$data) {
+            $data = Dever::db('factory/info')->like($where);
+        }
+
+        return $data;
+    }
 }

app/shop/src/Excel.php

@@ -311,6 +311,10 @@ class Excel
                     $refund_status = '未退款';
                 }
 
+                if ($v['source_type'] == 2) {
+                    $v1['p_price'] = 0;
+                }
+
                 $d = array
                 (
                     $info['name'],

app/store/assets/pc/html/cashier.html

@@ -204,7 +204,8 @@
 
 				var data = {};
 				data = {source_id:source_id, store_id:store_id, goods:goods_string, info:info};
-				$.getJSON(url, data, function(t) {
+				$.post(url, data, function(t) {
+					t = JSON.parse(t);
 					if (t.status == 1) {
 						layui.layer.alert('仓库库存调拨下单成功', function(index){
 						  location.href = t.data;

app/store/lib/Order.php

@@ -117,7 +117,6 @@ class Order
             Dever::load('store/lib/goods')->oper($order_data['source_id'], 1, 2, $buy_order_goods);
         }
         
-
         return Dever::url('project/database/list&project=shop&table=buy_order&menu=shop&menu_id=77&search_option_state=1&search_option_type=2&search_option_source_type=2', 'manage');
     }