|
|
@@ -128,7 +128,7 @@ public class MOMainController implements ApplicationContextAware {
|
|
|
"'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
|
|
|
"mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
|
|
|
"'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
|
|
|
- "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
|
|
|
+ "mo.cDefine5 as headerAttributeBigint2,'' as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
|
|
|
"mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
|
|
|
"mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
|
|
|
"0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3',de.cDepName as headerAttributeString14," +
|
|
|
@@ -139,7 +139,6 @@ public class MOMainController implements ApplicationContextAware {
|
|
|
" on mo.cPersonCode = hr1.cPsn_Num " +
|
|
|
" left join foreigncurrency curr " +
|
|
|
" on mo.cexch_name = curr.cexch_name " +
|
|
|
- " left join OM_MOmain_extradefine ex on mo.MOID = ex.MOID " +
|
|
|
" left join Department de on hr.cDept_num = de.cDepCode "+
|
|
|
" where mo.iVerifyStateNew = 2 and ((mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 is null) or (mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 =1)) order by mo.dCreateTime desc";
|
|
|
|
