violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-ljw' into test

Browse Source 
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
#	src/main/java/kd/cosmic/Application.java
This commit is contained in:
zzs01@yunemao.com 2024-08-30 15:42:51 +08:00
commit 7eb5c3d888
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
View File

@ -122,10 +122,11 @@ public class SalesOrderSubmitOp extends AbstractOperationServicePlugIn {
List<String> list = new ArrayList<>();
for (DynamicObject yemMulticon : yemMulticonfig) {
String yemConfigurtypeen = yemMulticon.getString("yem_configurtypeen");
list.add(yemConfigurtypeen+"\n");
list.add(yemConfigurtypeen);
}
String mergedString = String.join(";", list);
String mergedString = String.join(";"+"\n", list);
yemEsMAterialin.set("yem_optional",mergedString);
SaveServiceHelper.update(dynamicObject);
}
}
}

2
src/main/java/com/yem/wm/es/storagetrans/list/StorageTransKDListFilter.java
View File

@ -2,6 +2,7 @@ package com.yem.wm.es.storagetrans.list;
import kd.bos.form.events.SetFilterEvent;
import kd.bos.list.plugin.AbstractListPlugin;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
/**
* @author ljw
@ -15,5 +16,6 @@ public class StorageTransKDListFilter extends AbstractListPlugin {
{
super.setFilter(e);
e.addCustomQFilter(new QFilter("yem_transportstyle.name", QFilter.equals,"快递"));
e.addCustomQFilter(new QFilter("yem_quicknotentry.yem_isbankdocument", QCP.equals, "0"));
}
}