Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java

@@ -657,6 +657,8 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
         }
 
         // 获取申请单金额 开票申请金额==开票金额
+        // 如果是手工金额允许作废发票
+        //
         EmisSettleInvoiceRecord oldIRCD=emisSettleInvoiceRecordMapper.selectInvoiceRecordByApplySeqNo(rcd.getApplySeqNo());
         if(oldIRCD.getApplyMoney().compareTo(rcd.getOpenMoney()) == 0 ){
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java

@@ -146,6 +146,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         }
 
         // 插入数据
+        emisWaybillAjustApply.setApplyDate(new Date());
         emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
 
         SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode());