|
|
@@ -270,7 +270,7 @@ public class OwnBillController extends BaseController {
|
|
|
//销方识别号
|
|
|
String ziiSellerNo = CommonUtil.objToString(file.get("ziiSellerNo"));
|
|
|
if(!payerNo.equals(ziiPurchaserNo) || !payeeNo.equals(ziiSellerNo)){
|
|
|
-// return R.fail(500, "发票购销方不符合账款信息，不可进行账款关联");
|
|
|
+ return R.fail(500, "发票购销方不符合账款信息，不可进行账款关联");
|
|
|
}
|
|
|
//开票日期
|
|
|
String ziiDate = CommonUtil.objToString(file.get("ziiDate"));
|
|
|
@@ -278,7 +278,7 @@ public class OwnBillController extends BaseController {
|
|
|
//校验结果
|
|
|
String ziiCheckStt = CommonUtil.objToString(file.get("ziiCheckStt"));
|
|
|
if (!"1".equals(ziiCheckStt)) {
|
|
|
-// return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
|
|
|
+ return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
|
|
|
}
|
|
|
//贸易日期前一个月
|
|
|
Calendar startDate = Calendar.getInstance();
|
|
|
@@ -490,7 +490,7 @@ public class OwnBillController extends BaseController {
|
|
|
//销方识别号
|
|
|
String ziiSellerNo = CommonUtil.objToString(file.get("ziiSellerNo"));
|
|
|
if(!payerNo.equals(ziiPurchaserNo) || !payeeNo.equals(ziiSellerNo)){
|
|
|
-// return R.fail(500, "发票购销方不符合账款信息，不可进行账款关联");
|
|
|
+ return R.fail(500, "发票购销方不符合账款信息，不可进行账款关联");
|
|
|
}
|
|
|
//开票日期
|
|
|
String ziiDate = CommonUtil.objToString(file.get("ziiDate"));
|
|
|
@@ -498,7 +498,7 @@ public class OwnBillController extends BaseController {
|
|
|
//校验结果
|
|
|
String ziiCheckStt = CommonUtil.objToString(file.get("ziiCheckStt"));
|
|
|
if (!"1".equals(ziiCheckStt)) {
|
|
|
-// return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
|
|
|
+ return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
|
|
|
}
|
|
|
//贸易日期前一个月
|
|
|
Calendar startDate = Calendar.getInstance();
|
|
|
@@ -900,7 +900,7 @@ public class OwnBillController extends BaseController {
|
|
|
params.put("ziiCheckStt","1");
|
|
|
}else{
|
|
|
//验真发票
|
|
|
-// params = iOwnBillService.invoiceVerification(params);
|
|
|
+ params = iOwnBillService.invoiceVerification(params);
|
|
|
}
|
|
|
}else{
|
|
|
if(!CHECK_SUCCESS.equals(ziiCheckStt)){
|
sqg