提交boss解除限制

core/CoreApp/controllers/Boss.php

@@ -218,7 +218,7 @@ class Boss extends Start_Controller
 			if(in_array($y['express'],[78,79,84])){
 				$r = $this->check->checkOverdue($y['name'],$y['number'],$y['address']);
 				if(!$r){
-					echo json_encode(array('msg'=>'同一个客户3天内发货超过2包，不可出库！是否取消此单的出库限制！','success'=>false,'is_able'=>1));exit;
+					echo json_encode(array('msg'=>'同一个客户3天内发货超过2包，不可出库！请联系店员做申报信息修改！','success'=>false));exit;
 				}
 			}
 
@@ -1894,10 +1894,23 @@ class Boss extends Start_Controller
 	}
 
 	public function _yxDPDchuku(){
-		$params = $this->input->get(NULL, TRUE);
+		$params = $this->input->post(NULL, TRUE);
+		if(empty($params['order'])){
+			$params = $this->input->get(NULL, TRUE);
+		}
+		if(empty($params['order'])){
+			echo json_encode(array('msg' => '请填写运单号', 'success' => false));
+			exit;
+		}
+		
 		$y = $this->logic_order->getInfo("waybill = '".$params['order']."'","*");
 		if(empty($y)){
 			echo json_encode(array('msg' => '请核对运单号是否正确', 'success' => false));
+			exit;
+		}
+		if(!in_array($y['express'],[78,79,84])){
+			echo json_encode(array('msg' => '非DPD快递不支持此操作', 'success' => false));
+			exit;
 		}
 		$this->check->allowOverdue($y['name'],$y['number'],$y['address']);
 		echo json_encode(array('msg' => '已成功提交', 'success' => true));

template/erp/boss.html

@@ -8,6 +8,12 @@
 <li><font class="bossok" data-c="bossout" data-u="out">确定出库</font></li>
 </ul>
 
+<ul class="search bossyxdpdck" style="border-bottom: 1px solid #ccc;padding:16px 0">
+    <p style="color:#666;font-size: 18px;line-height:50px;">解除DPD出库限制</p>
+    <li>运单号：<input value="" name="order" type="text" style="width:268px"></li>
+    <li><font class="bossok" style="width: 200px;" data-c="bossyxdpdck" data-u="yxdpdck">确定解除限制</font></li>
+</ul>
+
 <ul class="search qczd" style="border-bottom: 1px solid #ccc;padding:16px 0">
 <p style="color:#666;font-size: 18px;line-height:50px;">清除占单</p>
 <li>订单编号：<input value="" name="number" type="text" style="width:150px;text-align: center;"></li>