nc推送billid加后缀;
This commit is contained in:
+6
-2
@@ -657,7 +657,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
makeQuery.setInnerNumber(invoiceId);
|
makeQuery.setInnerNumber(invoiceId);
|
||||||
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
|
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
|
||||||
if (makeList.getCode()==200){
|
if (makeList.getCode()==200){
|
||||||
|
int count = 0;
|
||||||
for (TmsMakeOutInvoice make : makeList.getData()) {
|
for (TmsMakeOutInvoice make : makeList.getData()) {
|
||||||
|
count++;
|
||||||
List<Ysitem> ysitemList=new ArrayList<Ysitem>();
|
List<Ysitem> ysitemList=new ArrayList<Ysitem>();
|
||||||
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
|
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
|
||||||
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
|
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
|
||||||
@@ -768,7 +770,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
billhead.setDef29(reconciliation.getInnerNumber());
|
billhead.setDef29(reconciliation.getInnerNumber());
|
||||||
billhead.setBodys(bodys);
|
billhead.setBodys(bodys);
|
||||||
Ysbill bill=new Ysbill();
|
Ysbill bill=new Ysbill();
|
||||||
bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId()));
|
bill.setId("ys"+String.valueOf(reconciliation.getReconciliationId())+"_"+count);
|
||||||
bill.setBillhead(billhead);
|
bill.setBillhead(billhead);
|
||||||
Ysufinterface ufinterface=new Ysufinterface();
|
Ysufinterface ufinterface=new Ysufinterface();
|
||||||
ufinterface.setAccount("NKNC");
|
ufinterface.setAccount("NKNC");
|
||||||
@@ -1088,7 +1090,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
makeQuery.setInnerNumber(invoiceId);
|
makeQuery.setInnerNumber(invoiceId);
|
||||||
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
|
R<List<TmsMakeOutInvoice>> makeList=wlhyServiceFeign.selectMakeOutInvoiceListByReconciliation(makeQuery);
|
||||||
if (makeList.getCode()==200){
|
if (makeList.getCode()==200){
|
||||||
|
int count= 0;
|
||||||
for (TmsMakeOutInvoice make : makeList.getData()) {
|
for (TmsMakeOutInvoice make : makeList.getData()) {
|
||||||
|
count++;
|
||||||
List<SKitem> ysitemList=new ArrayList<SKitem>();
|
List<SKitem> ysitemList=new ArrayList<SKitem>();
|
||||||
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
|
ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
|
||||||
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
|
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
|
||||||
@@ -1173,7 +1177,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
billhead.setDef29(reconciliation.getInnerNumber());
|
billhead.setDef29(reconciliation.getInnerNumber());
|
||||||
billhead.setBodys(bodys);
|
billhead.setBodys(bodys);
|
||||||
SKbill bill=new SKbill();
|
SKbill bill=new SKbill();
|
||||||
bill.setId("sk"+String.valueOf(reconciliation.getReconciliationId()));
|
bill.setId("sk"+String.valueOf(reconciliation.getReconciliationId())+"_"+count);
|
||||||
bill.setBillhead(billhead);
|
bill.setBillhead(billhead);
|
||||||
SKufinterface ufinterface=new SKufinterface();
|
SKufinterface ufinterface=new SKufinterface();
|
||||||
ufinterface.setAccount("NKNC");
|
ufinterface.setAccount("NKNC");
|
||||||
|
|||||||
Reference in New Issue
Block a user