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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zzs 2024-11-25 17:26:13 +08:00
commit 7c89041f82
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
View File

@ -1109,9 +1109,9 @@ public class SalesOrderUtils {
for (DynamicObject destport : destports) { for (DynamicObject destport : destports) {
DynamicObject port = destport.getDynamicObject("fbasedataid"); DynamicObject port = destport.getDynamicObject("fbasedataid");
if (port == null) continue; if (port == null) continue;
port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_factory"); port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_namecn");
if (!port.getString("yem_factory").isEmpty()) { if (!port.getString("yem_namecn").isEmpty()) {
sb.append(port.getString("yem_factory")).append(";"); sb.append(port.getString("yem_namecn")).append(";");
} }
} }
if (sb.lastIndexOf(";") == sb.length() - 1) { if (sb.lastIndexOf(";") == sb.length() - 1) {

2
src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
View File

@ -32,7 +32,7 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn {
splitContainer.setCollapse("yem_splitpanelap1", true); splitContainer.setCollapse("yem_splitpanelap1", true);
Object yemSigndate = this.getModel().getValue("yem_signdate"); Object yemSigndate = this.getModel().getValue("yem_signdate");
if (yemSigndate == null) { if (yemSigndate == null) {
// this.getModel().setValue("yem_signdate", new Date()); this.getModel().setValue("yem_signdate", this.getModel().getValue("createtime"));
} }
} }