Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
5b637ff03a
|
@ -61,7 +61,7 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
|
|||
if (qFilter==null){
|
||||
qFilter=qFilter1;
|
||||
}else {
|
||||
qFilter.or(qFilter1);
|
||||
qFilter=qFilter.or(qFilter1);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -77,23 +77,29 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
|
|||
|
||||
DynamicObject dynamicObject = dataEntities[i];
|
||||
String description = dynamicObject.getString("description");
|
||||
String sql = qFilter.toString();
|
||||
String replaced = sql.replace("description", "'"+description+"'");
|
||||
String selsql = " /*dialect*/ select 1 where "+replaced;
|
||||
DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云
|
||||
DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy());
|
||||
if (srcCollection.size()!=0){
|
||||
try {
|
||||
dynamicObject.set("kdretflag", null); //数据赋值
|
||||
} catch (Exception ex) {
|
||||
logger.info("进入banksavef方法直接赋值失败");
|
||||
if (qFilter!=null){
|
||||
String sql = qFilter.toString();
|
||||
String replaced = sql.replace("description", "'"+description+"'");
|
||||
String selsql = " /*dialect*/ select 1 where "+replaced;
|
||||
DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云
|
||||
DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy());
|
||||
if (srcCollection.size()!=0){
|
||||
try {
|
||||
dynamicObject.set("kdretflag", null); //数据赋值
|
||||
} catch (Exception ex) {
|
||||
logger.info("进入banksavef方法直接赋值失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(dynamicObject != null) {
|
||||
//通过基础资料或单据标识 的id 获取数据
|
||||
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("bei_transdetail", "id,billno,description,kdretflag", qFilter.toArray());
|
||||
if(bei_transdetail != null ) {
|
||||
|
|
Loading…
Reference in New Issue