修改程序

core/CoreApp/controllers/Fullorder.php

@@ -653,9 +653,8 @@ class Fullorder extends Start_Controller {
 				{
 					$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz;
 					//如果是云尚快线那么需要展示一个可以查全程的运单号
-					$transfer_number = $this->logic_order->getTransferNumber($value);
-					if(!empty($transfer_number)){
-						$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$transfer_number."</p>";
+					if(in_array($value['express'],[71,75]) && !empty($value['waybillid'])){
+						$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$value['waybillid']."</p>";
 					}
 				}
 				
@@ -1374,9 +1373,8 @@ class Fullorder extends Start_Controller {
 			//查询净重开始
 			$post['jweight'] = $this->weight->get_weightcx($post['fpdata']);
 			unset($post[0]);
+			
 			//查询净重结束
-
-				$post = $this->logic_order->setTransferNumber($post);
 			    if($this->fullorder->save($post,$id))
         	    {
 					if($data['printtime'] == '0')
@@ -1418,9 +1416,6 @@ class Fullorder extends Start_Controller {
 		$fullorder['parameter'] = str_replace(",","---",$fullorder['parameter']);
 		$country = $this->country->find_all('1=1','id,name','name asc');//所有国家信息
 		$express = $this->express->find_all('1=1');//所有快递配置信息
-
-		//获取转单号
-		$fullorder['transfer_number'] = $this->logic_order->getTransferNumber($fullorder);
 		$this->data['fullorder'] = $fullorder;
 		if($fullorder['express'] == 2)
 		{
@@ -1973,8 +1968,6 @@ class Fullorder extends Start_Controller {
 		$this->data['returngoods'] = $returngoods?1:0;
 		$fullorder['shipremarks'] = str_replace(array('<','>'),array('&lt;','&gt;'),$fullorder['shipremarks']);
 		$fullorder['parameter'] = str_replace(",","---",$fullorder['parameter']);
-		//获取转单号
-		$fullorder['transfer_number'] = $this->logic_order->getTransferNumber($fullorder);
 		$this->data['fullorder'] = $fullorder;
 		if($fullorder['express'] == 2)
 		{

core/CoreApp/models/Model_logic_order.php

@@ -438,28 +438,5 @@ class Model_logic_order extends Lin_Model {
             return false;
         }
     }
-    /**
-     * 获取转单号
-     */
-    public function getTransferNumber($order_info){
-        if(in_array($order_info['express'],[71,75]) && !empty($order_info['waybillid'])){
-            return $order_info['waybillid'];
-        }
-        return "";
-    }
-
-    /**
-     * 将转单号字段转化为数据库存储的字段 
-     */
-    public function setTransferNumber($order_info){
-
-        if(in_array($order_info['express'],[71,75]) && isset($order_info['transfer_number'])){
-            $order_info['waybillid'] = $order_info['transfer_number'];
-            unset($order_info['transfer_number']);
-        }else{
-            unset($order_info['transfer_number']);
-        }
-        
-        return $order_info;
-    }
+   
 }

template/erp/fullorder_edit.html

@@ -257,7 +257,7 @@
 </li>
 <li class="lengththree">
 <em style="width: 80px;">转单号：</em>
-<input style="width: 60%;" name="transfer_number" value="{$fullorder['transfer_number']}" type="text">
+<input style="width: 60%;" name="waybillid" value="{$fullorder['waybillid']}" type="text">
 </li>
 <li class="lengththree">
 <em style="width: 80px;">运单号：</em>

template/erp/fullorder_readonly.html

@@ -213,7 +213,7 @@
 </li>
 <li class="lengththree">
 <em style="width: 80px;">转单号：</em>
-<b style="width: 60%;">{$fullorder['transfer_number']}</b>
+<b style="width: 60%;">{$fullorder['waybillid']}</b>
 </li>
 <li class="lengththree">
 <em style="width: 80px;">运单号：</em>

template/erp/fullorderexcel_add.html

@@ -87,6 +87,7 @@
 <li id="guarantee"><font>卖家保障</font><i class="fa fa-plus"></i></li>
 <li id="shop"><font>所属独立站</font><i class="fa fa-plus"></i></li>
 <li id="waybill"><font>物流单号</font><i class="fa fa-plus"></i></li>
+<li id="waybillid"><font>物流转单号</font><i class="fa fa-plus"></i></li>
 <li id="express"><font>物流类型</font><i class="fa fa-plus"></i></li>
 <li id="exstate"><font>物流状态</font><i class="fa fa-plus"></i></li>
 <li id="js"><font>物流服务类型</font><i class="fa fa-plus"></i></li>

template/erp/fullorderexcel_edit.html

@@ -87,6 +87,7 @@
 <li id="guarantee"><font>卖家保障</font><i class="fa fa-plus"></i></li>
 <li id="shop"><font>所属独立站</font><i class="fa fa-plus"></i></li>
 <li id="waybill"><font>物流单号</font><i class="fa fa-plus"></i></li>
+<li id="waybillid"><font>物流转单号</font><i class="fa fa-plus"></i></li>
 <li id="express"><font>物流类型</font><i class="fa fa-plus"></i></li>
 <li id="exstate"><font>物流状态</font><i class="fa fa-plus"></i></li>
 <li id="js"><font>物流服务类型</font><i class="fa fa-plus"></i></li>