推送nc状态更新修改;新字段sql整理;
This commit is contained in:
+18
@@ -198,6 +198,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
if (ncUrl!=null&&ncUrl!="") {
|
||||
url = ncUrl;
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
String salesmanId = reconciliation.getSalesmanId();
|
||||
@@ -403,6 +405,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
billManageMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -412,8 +416,13 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
@@ -469,6 +478,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
if (ncUrl!=null&&ncUrl!="") {
|
||||
url = ncUrl;
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
List<BmsMakeOutInvoiceItem> bmsMakeOutInvoiceItems = bmsMakeOutInvoiceItemMapper.selectList(new LambdaQueryWrapper<BmsMakeOutInvoiceItem>().eq(BmsMakeOutInvoiceItem::getMakeId, make.getId()));
|
||||
@@ -674,6 +685,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
billManageMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -684,8 +697,13 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
billManageMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
|
||||
+64
@@ -444,6 +444,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
String invoiceNumber="";
|
||||
@@ -625,6 +627,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -634,6 +638,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
}//else if(reconciliation.getOrganizationName().contains("通宇")){
|
||||
else if(reconciliation.getOrganizationId()==2830){//通宇
|
||||
@@ -677,6 +684,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
order = result.getData()!=null && result.getData().size()>0?result.getData().get(0):null;
|
||||
}
|
||||
if (order==null){
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到对应订单信息");
|
||||
}
|
||||
String url = "";
|
||||
@@ -688,6 +697,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
|
||||
@@ -771,6 +782,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
ysitemList.add(item);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
|
||||
Ysbodys bodys=new Ysbodys();
|
||||
@@ -885,6 +899,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -896,6 +912,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
@@ -929,6 +947,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
order = result.getData()!=null && result.getData().size()>0?result.getData().get(0):null;
|
||||
}
|
||||
if (order==null){
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到对应订单信息");
|
||||
}
|
||||
String url = "";
|
||||
@@ -940,6 +960,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
|
||||
@@ -1023,6 +1045,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
ysitemList.add(item);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
|
||||
Ysbodys bodys=new Ysbodys();
|
||||
@@ -1137,6 +1162,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -1148,6 +1175,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
@@ -1195,6 +1224,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
if(result.getCode()==200){
|
||||
@@ -1230,7 +1261,13 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}*/
|
||||
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
SKbodys bodys=new SKbodys();
|
||||
bodys.setItem(ysitemList);
|
||||
@@ -1343,6 +1380,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -1393,6 +1432,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
order = result.getData()!=null && result.getData().size()>0?result.getData().get(0):null;
|
||||
}
|
||||
if (order==null){
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到对应订单信息");
|
||||
}
|
||||
String url = "";
|
||||
@@ -1404,6 +1445,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make);
|
||||
@@ -1488,6 +1531,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
item.setMoney_bal(String.valueOf(totalInvoiceValue));
|
||||
ysitemList.add(item);
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
SKbodys bodys=new SKbodys();
|
||||
bodys.setItem(ysitemList);
|
||||
@@ -1600,6 +1646,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -1612,6 +1660,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
@@ -1645,6 +1695,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
order = result.getData()!=null && result.getData().size()>0?result.getData().get(0):null;
|
||||
}
|
||||
if (order==null){
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到对应订单信息");
|
||||
}
|
||||
String url = "";
|
||||
@@ -1656,6 +1708,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
if (urlList != null && urlList.size() > 0) {
|
||||
url = urlList.get(0).getInterfaceTypeValue();
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
throw new ServiceException("未找到该组织的推送地址!");
|
||||
}
|
||||
R<List<TmsMakeOutInvoiceItem>> itemR = wlhyServiceFeign.selectMakeOutInvoiceItemList(make);
|
||||
@@ -1739,7 +1793,13 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
item.setMoney_cr(String.valueOf(totalInvoiceValue));
|
||||
item.setMoney_bal(String.valueOf(totalInvoiceValue));
|
||||
ysitemList.add(item);
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
} else {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
}
|
||||
SKbodys bodys=new SKbodys();
|
||||
bodys.setItem(ysitemList);
|
||||
@@ -1852,6 +1912,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
response.close();
|
||||
} catch (Exception e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
try {
|
||||
@@ -1864,6 +1926,8 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
||||
}
|
||||
}
|
||||
} catch (JAXBException e) {
|
||||
reconciliation.setSynchronousStatus(2);
|
||||
reconciliationMapper.updateById(reconciliation);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
|
||||
+5
-1
@@ -4,4 +4,8 @@ COMMENT ON COLUMN "NGWL_TEST_BMS"."NC_LOG"."SEND_TIME" IS '推送时间';
|
||||
|
||||
ALTER TABLE "NGWL_TEST_FINANCE"."NC_LOG" ADD COLUMN "SEND_TIME" DATE;
|
||||
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."NC_LOG"."SEND_TIME" IS '推送时间';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."NC_LOG"."SEND_TIME" IS '推送时间';
|
||||
|
||||
ALTER TABLE "NGWL_TEST_PRODUCT"."SYS_ORGANIZATION" ADD COLUMN "NC_CODE" VARCHAR2(128);
|
||||
|
||||
COMMENT ON COLUMN "NGWL_TEST_PRODUCT"."SYS_ORGANIZATION"."NC_CODE" IS 'nc编码';
|
||||
Reference in New Issue
Block a user