wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
wenlukang1 2025-05-19 11:20:54 +08:00
parent 0a485f608e 040c3ed886
commit 5b637ff03a
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/BankSaveOP.java
View File

@ -61,7 +61,7 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
if (qFilter==null){ if (qFilter==null){
qFilter=qFilter1; qFilter=qFilter1;
}else { }else {
qFilter.or(qFilter1); qFilter=qFilter.or(qFilter1);
} }
} }
@ -77,23 +77,29 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
DynamicObject dynamicObject = dataEntities[i]; DynamicObject dynamicObject = dataEntities[i];
String description = dynamicObject.getString("description"); String description = dynamicObject.getString("description");
String sql = qFilter.toString(); if (qFilter!=null){
String replaced = sql.replace("description", "'"+description+"'"); String sql = qFilter.toString();
String selsql = " /*dialect*/ select 1 where "+replaced; String replaced = sql.replace("description", "'"+description+"'");
DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云 String selsql = " /*dialect*/ select 1 where "+replaced;
DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy()); DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云
if (srcCollection.size()!=0){ DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy());
try { if (srcCollection.size()!=0){
dynamicObject.set("kdretflag", null); //数据赋值 try {
} catch (Exception ex) { dynamicObject.set("kdretflag", null); //数据赋值
logger.info("进入banksavef方法直接赋值失败"); } catch (Exception ex) {
logger.info("进入banksavef方法直接赋值失败");
}
} }
} }
if(dynamicObject != null) { if(dynamicObject != null) {
//通过基础资料或单据标识 的id 获取数据 //通过基础资料或单据标识 的id 获取数据
QFilter newqFilter =new QFilter("id", QCP.equals,dynamicObject.getPkValue()); QFilter newqFilter =new QFilter("id", QCP.equals,dynamicObject.getPkValue());
qFilter.and(newqFilter); if (qFilter!=null){
qFilter=qFilter.and(newqFilter);
}else {
qFilter=newqFilter;
}
// qFilter.and(newqFilter);
// DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), "bei_transdetail"); // DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), "bei_transdetail");
DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle("bei_transdetail", "id,billno,description,kdretflag", qFilter.toArray()); DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle("bei_transdetail", "id,billno,description,kdretflag", qFilter.toArray());
if(bei_transdetail != null ) { if(bei_transdetail != null ) {