|
@@ -1304,6 +1304,14 @@ class InvoiceController extends DooController {
|
|
Doo::loadModel ( 'invoice' );
|
|
Doo::loadModel ( 'invoice' );
|
|
$invoice = new invoice ();
|
|
$invoice = new invoice ();
|
|
|
|
|
|
|
|
+
|
|
|
|
+ //加入限制必须填写入开票内容和邮寄物品
|
|
|
|
+ $invoiceStore = new invoiceStore ();
|
|
|
|
+ $isDetail=$invoiceStore->getInvoiceStoreByIsid($isid,'isid,trainId ,invoiceElement,mailItemsJson');
|
|
|
|
+ if(empty($isDetail['invoiceElement'])||empty($isDetail['mailItemsJson'])){
|
|
|
|
+ header ( 'Content-Type:text/html;charset=utf-8' );
|
|
|
|
+ die ( 'illegal request! 请设置开票内容或邮寄物品' );
|
|
|
|
+ }
|
|
// 拷贝插入一条发票数据
|
|
// 拷贝插入一条发票数据
|
|
$invoiceStore = new invoiceStore ();
|
|
$invoiceStore = new invoiceStore ();
|
|
$iid = $invoiceStore->setInvoiceStoreToApproval ( $isid );
|
|
$iid = $invoiceStore->setInvoiceStoreToApproval ( $isid );
|
|
@@ -1423,6 +1431,16 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
// 判断哪些已经加入审批过
|
|
// 判断哪些已经加入审批过
|
|
|
|
|
|
|
|
+ //加入限制必须填写入开票内容和邮寄物品
|
|
|
|
+ $invoiceStore = new invoiceStore ();
|
|
|
|
+ $isList=$invoiceStore->getInvoiceStoreInIsid($isidString,'isid,trainId ,invoiceElement,mailItemsJson');
|
|
|
|
+ foreach ($isList as $key=>$value){
|
|
|
|
+ if(empty($value['invoiceElement'])||empty($value['mailItemsJson'])){
|
|
|
|
+ header ( 'Content-Type:text/html;charset=utf-8' );
|
|
|
|
+ die ( 'illegal request! 请设置开票内容或邮寄物品' );
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
// 拷贝插入一条发票数据
|
|
// 拷贝插入一条发票数据
|
|
$invoiceStore = new invoiceStore ();
|
|
$invoiceStore = new invoiceStore ();
|
|
$invoiceStore->setInvoiceStoreBatchToApproval ( $isidString );
|
|
$invoiceStore->setInvoiceStoreBatchToApproval ( $isidString );
|
|
@@ -1524,32 +1542,6 @@ class InvoiceController extends DooController {
|
|
);
|
|
);
|
|
$invoiceTraining->setInvoiceTrainByCondition ( $item );
|
|
$invoiceTraining->setInvoiceTrainByCondition ( $item );
|
|
|
|
|
|
- // Doo::loadModel ( 'invoiceOperationLog' );
|
|
|
|
- // $item = array (
|
|
|
|
- // 'date' => date ( "Y-m-d H:i:s" ),
|
|
|
|
- // 'operation' => "创建",
|
|
|
|
- // 'status' => 1,
|
|
|
|
- // 'img' => $this->staff [0] ['avatar'],
|
|
|
|
- // 'username' => $this->staff [0] ['username'],
|
|
|
|
- // 'uid' => $this->staff [0] ['sid'],
|
|
|
|
- // 'category' => $this->staff [0] ['category'],
|
|
|
|
- // 'iid' => $iid
|
|
|
|
- // );
|
|
|
|
-
|
|
|
|
- // $invoiceOperationLog = new invoiceOperationLog ();
|
|
|
|
- // $invoiceOperationLog->setInvoiceOperationLog ( $item ,$iidString);
|
|
|
|
- // $item = array (
|
|
|
|
- // 'date' => date ( "Y-m-d H:i:s" ),
|
|
|
|
- // 'operation' => "提交审批",
|
|
|
|
- // 'status' => 1,
|
|
|
|
- // 'img' => $this->staff [0] ['avatar'],
|
|
|
|
- // 'username' => $this->staff [0] ['username'],
|
|
|
|
- // 'uid' => $this->staff [0] ['sid'],
|
|
|
|
- // 'category' => $this->staff [0] ['category'],
|
|
|
|
- // 'iid' => $iid
|
|
|
|
- // );
|
|
|
|
- // $invoiceOperationLog->setInvoiceOperationLog ( $item );
|
|
|
|
-
|
|
|
|
Doo::loadModel ( 'staff' );
|
|
Doo::loadModel ( 'staff' );
|
|
$staff = new staff ();
|
|
$staff = new staff ();
|
|
$username2 = $staff->getOne ( array (
|
|
$username2 = $staff->getOne ( array (
|
|
@@ -2400,6 +2392,11 @@ class InvoiceController extends DooController {
|
|
$invoicePosted = $invoice->getPostByInvoice ( 1 );
|
|
$invoicePosted = $invoice->getPostByInvoice ( 1 );
|
|
$expressList = $express->getExpressByAll ();
|
|
$expressList = $express->getExpressByAll ();
|
|
|
|
|
|
|
|
+ $invoicePostExpress="";
|
|
|
|
+ if(isset($_COOKIE["invoicePostExpress"]))
|
|
|
|
+ $invoicePostExpress=$_COOKIE["invoicePostExpress"];
|
|
|
|
+ $this->data ['invoicePostExpress'] =$invoicePostExpress;
|
|
|
|
+
|
|
$this->data ['expressList'] = $expressList;
|
|
$this->data ['expressList'] = $expressList;
|
|
$this->data ['invoicePost'] = $invoicePost;
|
|
$this->data ['invoicePost'] = $invoicePost;
|
|
$this->data ['invoicePosted'] = $invoicePosted;
|
|
$this->data ['invoicePosted'] = $invoicePosted;
|
|
@@ -2425,6 +2422,8 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
$invoicePrintDetail = $invoice->getInvoiceByIid ( $iid );
|
|
$invoicePrintDetail = $invoice->getInvoiceByIid ( $iid );
|
|
|
|
|
|
|
|
+ setcookie('invoicePostExpress',$expressNumber);
|
|
|
|
+
|
|
$item = array (
|
|
$item = array (
|
|
'iid' => $iid,
|
|
'iid' => $iid,
|
|
'postStatus' => 1,
|
|
'postStatus' => 1,
|