|
@@ -267,7 +267,7 @@ class invoiceStore extends DooModel {
|
|
|
if (! empty ( $itid ) && is_numeric ( $itid )) {
|
|
|
|
|
|
$field = 'a.apStatus,a.isid,a.invoiceCompany,a.invoiceTitle,a.TIN,a.address,a.phone,a.bank,a.bankAccount,a.invoiceElement,a.invoiceQuantity,a.invoiceUnitPrice,a.invoicePrice,a.invoiceType,a.remark
|
|
|
- ,a.mailItems,a.recipientsAddress,a.recipients,a.recipientsPhone,a.remark,a.remark,a.remark,a.remark
|
|
|
+ ,a.mailItems,a.recipientsAddress,a.recipients,a.recipientsPhone,a.remark,a.remark,a.remark,a.remark,a.userName
|
|
|
,b.invoiceSerial,b.printTime,b.invoiceNo,b.status,b.printStatus,b.untreadStatus,b.irid';
|
|
|
|
|
|
$sql = "select " . $field . " from " . $this->_table . " as a left join CLD_invoice as b on (a.iid=b.iid) where a.trainId=" . $itid;
|
|
@@ -275,33 +275,37 @@ class invoiceStore extends DooModel {
|
|
|
$list = $query->fetchAll ();
|
|
|
}
|
|
|
|
|
|
- //获得收款流水号
|
|
|
- $iridList=array();
|
|
|
+ // 获得收款流水号
|
|
|
+ $iridList = array ();
|
|
|
foreach ( $list as $key => $value ) {
|
|
|
$list [$key] ['storeKey'] = $XDeode->encode ( $value ['isid'] );
|
|
|
- $list [$key]['iridArray']=array();
|
|
|
- if (!empty($value['irid'])){
|
|
|
- array_push($iridList, $value['irid']);
|
|
|
- $list [$key]['iridArray']=explode(',', $value['irid']);
|
|
|
+ $list [$key] ['iridArray'] = array ();
|
|
|
+ if (! empty ( $value ['irid'] )) {
|
|
|
+ array_push ( $iridList, $value ['irid'] );
|
|
|
+ $list [$key] ['iridArray'] = explode ( ',', $value ['irid'] );
|
|
|
}
|
|
|
- $list[$key]['invoiceReceivables']=array();
|
|
|
+ $list [$key] ['invoiceReceivables'] = array ();
|
|
|
}
|
|
|
$iridString = implode ( ',', $iridList );
|
|
|
|
|
|
Doo::loadModel ( 'invoiceReceivables' );
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
|
|
|
- $irlist=$invoiceReceivables->getInvoiceReceivablesInIridString($iridString);
|
|
|
- foreach ($irlist as $key=>$value){
|
|
|
- foreach ($list as $k=>$v){
|
|
|
- if (in_array($value['irid'],$v['iridArray'])){
|
|
|
- array_push($list[$k]['invoiceReceivables'], array($value['irid'],$value['receivablesSerial'],$value['iridKeyK']));
|
|
|
+ $irlist = $invoiceReceivables->getInvoiceReceivablesInIridString ( $iridString );
|
|
|
+ foreach ( $irlist as $key => $value ) {
|
|
|
+ foreach ( $list as $k => $v ) {
|
|
|
+ if (in_array ( $value ['irid'], $v ['iridArray'] )) {
|
|
|
+ array_push ( $list [$k] ['invoiceReceivables'], array (
|
|
|
+ $value ['irid'],
|
|
|
+ $value ['receivablesSerial'],
|
|
|
+ $value ['iridKeyK']
|
|
|
+ ) );
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //print_r($list);
|
|
|
- //echo $iridString;
|
|
|
+ // print_r($list);
|
|
|
+ // echo $iridString;
|
|
|
|
|
|
return $list;
|
|
|
}
|
|
@@ -425,8 +429,12 @@ class invoiceStore extends DooModel {
|
|
|
|
|
|
return Doo::db ()->lastInsertId ();
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ function delInvoiceStoreByIsid($isid='') {
|
|
|
+ if (empty ( $isid ))
|
|
|
+ return '';
|
|
|
+ $sql = "DELETE FROM " . $this->_table . " WHERE `isid`=" . $isid;
|
|
|
+ $query = Doo::db ()->query ( $sql );
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 批量更新
|
|
@@ -436,10 +444,9 @@ class invoiceStore extends DooModel {
|
|
|
function UpdateBatchInvoiceStore($sql = "") {
|
|
|
if (empty ( $sql ))
|
|
|
return 0;
|
|
|
-
|
|
|
+
|
|
|
$query = Doo::db ()->query ( $sql );
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
?>
|