【泛微对接】【银行登记对接明细合并】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -348,6 +348,9 @@ public class ERPServiceImpl implements ERPService {
             }
             baseDao.execute(sqls);
 
+            if("QXKW".equals(ev.toUpperCase())){
+                baseDao.execute("update "+master+"AccountRegister set ar_currencytype=0 where ar_id="+ar_id);
+            }
 
             //String defaultCurr =  baseDao.getDBSetting(caller, "fyCurr");
 
@@ -428,6 +431,15 @@ public class ERPServiceImpl implements ERPService {
                     }
                 }
             }
+
+            String arid_string = Integer.valueOf(ar_id).toString();
+            if (baseDao.isDBSetting("AccountRegister!Bank","ALLOW_MERGEDETAIL_YHDJ")) {// 开启银行登记对接后合并明细
+                String msg = baseDao.callProcedure("SP_MERGEDETAIL_YHDJ", new Object[]{arid_string, master});
+                if (msg != null && !msg.trim().equals("")){
+                    return ApiResponse.failRsp("10085",msg);
+                }
+            }
+
             updateErrorString(ar_id,master);
             result.put("code", code);
             result.put("date", ar_date);