Bläddra i källkod

暂时屏蔽往来账款购销方校验

dudm 3 år sedan
förälder
incheckning
dc77878e7a

+ 16 - 1
sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -255,7 +255,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"));
@@ -460,8 +460,23 @@ public class OwnBillController extends BaseController {
         if(fileList.size() == 0){
             return R.fail(500,"往来账款发票数据不能为空,请上传发票后重试");
         }
+        //购方
+        SysCompany payer = iSysCompanyService.getById(zbiPayerId);
+        //购方社会统一代码
+        String payerNo = payer.getScySocialCode();
+        //销方
+        SysCompany payee = iSysCompanyService.getById(zbiPayeeId);
+        //销方社会统一代码
+        String payeeNo = payee.getScySocialCode();
         //校验发票
         for (Map<String,String> file : fileList) {
+            //购方识别号
+            String ziiPurchaserNo = CommonUtil.objToString(file.get("ziiPurchaserNo"));
+            //销方识别号
+            String ziiSellerNo = CommonUtil.objToString(file.get("ziiSellerNo"));
+            if(!payerNo.equals(ziiPurchaserNo) || !payeeNo.equals(ziiSellerNo)){
+//                return R.fail(500, "发票购销方不符合账款信息,不可进行账款关联");
+            }
             //开票日期
             String ziiDate = CommonUtil.objToString(file.get("ziiDate"));
             Date ziiDateParse = sdf.parse(ziiDate);