diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index 6eecee7fd..387641ec1 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -425,7 +425,8 @@ public class EmisSettleSubBillController extends EmisBaseController Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 int dayDiff=(int)(num/24/60/60/1000); if(dayDiff<3){ - return AjaxResult.error("账单未到出账确认时间,不允许处理:"+old.getBillCode()); + // 先暂时关闭,节后再开放 +// return AjaxResult.error("账单未到出账确认时间,不允许处理:"+old.getBillCode()); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index f6439e161..420760cce 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -178,6 +178,7 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC order.setWithTaxFlag( "1"); order.setShowBankAccountType("3"); + // 蓝票 order.setInvoiceType("1"); /*