nc及发票修改;
This commit is contained in:
+3
-3
@@ -157,7 +157,7 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
|||||||
String invoiceNumber="";
|
String invoiceNumber="";
|
||||||
|
|
||||||
//获取发票信息
|
//获取发票信息
|
||||||
Long invoiceId = reconciliation.getInvoiceId();
|
String invoiceId = reconciliation.getInvoiceId();
|
||||||
BmsInvoiceList bmsInvoiceList = bmsInvoiceListMapper.selectById(invoiceId);
|
BmsInvoiceList bmsInvoiceList = bmsInvoiceListMapper.selectById(invoiceId);
|
||||||
invoiceNumber = bmsInvoiceList.getInvoiceNumber();
|
invoiceNumber = bmsInvoiceList.getInvoiceNumber();
|
||||||
//关联不到订单暂时new
|
//关联不到订单暂时new
|
||||||
@@ -499,7 +499,7 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
|||||||
.eq(BillManage::getDelFlag,1));
|
.eq(BillManage::getDelFlag,1));
|
||||||
if(ObjectUtil.isNotNull(billManage)){
|
if(ObjectUtil.isNotNull(billManage)){
|
||||||
billManage.setIsInvoice(isInvoice);
|
billManage.setIsInvoice(isInvoice);
|
||||||
billManage.setInvoiceId(Long.valueOf(invoiceId));
|
billManage.setInvoiceId(invoiceId);
|
||||||
billManage.setApplyNumber(applyNumber);
|
billManage.setApplyNumber(applyNumber);
|
||||||
if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
|
||||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
@@ -517,7 +517,7 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
|||||||
.eq(BillManage::getDelFlag,1));
|
.eq(BillManage::getDelFlag,1));
|
||||||
if(ObjectUtil.isNotNull(billManage)){
|
if(ObjectUtil.isNotNull(billManage)){
|
||||||
billManage.setIsInvoice(isInvoice);
|
billManage.setIsInvoice(isInvoice);
|
||||||
billManage.setInvoiceId(Long.valueOf(invoiceId));
|
billManage.setInvoiceId(invoiceId);
|
||||||
billManage.setApplyNumber(applyNumber);
|
billManage.setApplyNumber(applyNumber);
|
||||||
if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
|
||||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|||||||
Reference in New Issue
Block a user