edit

database/unit.php

@@ -143,6 +143,7 @@ return array
 			'"盎司","ounce",1,193,1,' . DEVER_TIME,
 
 			# 数量单位Number
+			'"个","pcs",2,2399,1,' . DEVER_TIME,
 			'"袋","bag",2,2299,1,' . DEVER_TIME,
 			'"件","piece",2,2298,1,' . DEVER_TIME,
 			'"箱","box",2,2297,1,' . DEVER_TIME,

lib/Order.php

@@ -33,25 +33,27 @@ class Order
 
     public function updateOrderNum($id, $name, $data)
     {
-        $servicer_store_id = Dever::param('servicer_store_id', $data);
-        if ($servicer_store_id) {
-            $info = Dever::db('scm_servicer/store')->find($servicer_store_id);
-            if ($info && $info['type'] == 1 && (!$info['area'] || !$info['address'] || !$info['truename'] || !$info['tel'])) {
-                Dever::alert('仓库[' . $info['name'] . ']收货地址未填写');
-            }
-        }
-
-        $seller_shop_id = Dever::param('seller_shop_id', $data);
-        if ($seller_shop_id) {
-            $info = Dever::db('scm_seller/shop')->find($seller_shop_id);
-            if ($info && $info['type'] == 1 && (!$info['area'] || !$info['address'] || !$info['truename'] || !$info['tel'])) {
-                Dever::alert('门店[' . $info['name'] . ']收货地址未填写');
-            }
-        }
-        
         $table = Dever::input('table');
         $prefix = Dever::input('prefix');
         if ($table && $prefix) {
+            $servicer_store_id = Dever::param('servicer_store_id', $data);
+            if ($servicer_store_id) {
+                $info = Dever::db('scm_servicer/store')->find($servicer_store_id);
+                if ($info && $info['type'] == 1 && (!$info['area'] || !$info['address'] || !$info['truename'] || !$info['tel'])) {
+                    Dever::db($table)->delete($id);
+                    Dever::alert('仓库[' . $info['name'] . ']收货地址未填写');
+                }
+            }
+
+            $seller_shop_id = Dever::param('seller_shop_id', $data);
+            if ($seller_shop_id) {
+                $info = Dever::db('scm_seller/shop')->find($seller_shop_id);
+                if ($info && $info['type'] == 1 && (!$info['area'] || !$info['address'] || !$info['truename'] || !$info['tel'])) {
+                    Dever::db($table)->delete($id);
+                    Dever::alert('门店[' . $info['name'] . ']收货地址未填写');
+                }
+            }
+
             $update['order_num'] = $this->getOrderNum($table, $prefix);
             $update['where_id'] = $id;
             Dever::db($table)->update($update);
@@ -280,7 +282,8 @@ class Order
 
         $data = Dever::db($order_table . '_goods')->select(array('order_id' => $order['id']));
 
-        $shop = Dever::db('shop/info')->find($order['type_id']);
+        print_r($order);die;
+        $shop = Dever::db('shop/info')->find($order['seller_shop_id']);
 
         list($assign, $source) = Dever::load('scm/lib/assign')->get($goods, $info, $shop, true);
 

module/scm_product/assets/pc/html/set_seller_goods.html

@@ -353,7 +353,7 @@
                     commission_price = parseFloat(commission_price);
                     commission_price = (commission_price/100) * parseFloat(node.price);
                 } else {
-                    commission_price = parseFloat(nodcommission_string);
+                    commission_price = parseFloat(commission_string);
                 }
 
                 if (commission) {

module/scm_seller/database/info.php

@@ -442,8 +442,10 @@ return array
             'location1' => array('分配配送商', Dever::url('lib/set.home?role=seller', 'scm_servicer')),
             'location2' => array('商品设置', Dever::url('lib/set.home?project=seller&table=goods&info=info', 'scm_product')),
             'add' => array('采购下单', 'buy_order&oper_table=info&search_option_seller_id={id}&oper_save_jump=buy_order'),
+            'add1' => array('代客下单', 'buy_order&oper_table=info&search_option_seller_id={id}&oper_save_jump=buy_order'),
             'br4' => array('<br />'),
-            'list' => array('资金账户', 'info&project=account&oper_table=info&oper_project=scm_seller&search_option_uid={id}', '"{account}"'),
+            'fast_add' => array('账户操作', 'push&project=account&oper_table=info&oper_project=scm_seller&uid={id}'),
+            'list' => array('账户列表', 'info&project=account&oper_table=info&oper_project=scm_seller&search_option_uid={id}', '"{account}"'),
         )
 	),