From c458340add9f8d1fd5d771788e0d2d4977e908ad Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 25 Nov 2024 16:37:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=8F=98=E6=9B=B4=E5=8D=95=E6=89=93=E5=BC=80=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E6=97=A5=E6=9C=9F=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java index 150b681e..92d5c505 100644 --- a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java +++ b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java @@ -32,7 +32,7 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { splitContainer.setCollapse("yem_splitpanelap1", true); Object yemSigndate = this.getModel().getValue("yem_signdate"); if (yemSigndate == null) { -// this.getModel().setValue("yem_signdate", new Date()); + this.getModel().setValue("yem_signdate", this.getModel().getValue("createtime")); } } From b207d40d766da6e53d00a6f6b1f076f8a4e9960d Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 25 Nov 2024 16:55:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88?= =?UTF-8?q?=E5=90=8C=E8=B4=B8=E6=98=93=E6=9C=AF=E8=AF=AD=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/utils/SalesOrderUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java index 468755b8..6542fd2d 100644 --- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java +++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java @@ -1109,9 +1109,9 @@ public class SalesOrderUtils { for (DynamicObject destport : destports) { DynamicObject port = destport.getDynamicObject("fbasedataid"); if (port == null) continue; - port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_factory"); - if (!port.getString("yem_factory").isEmpty()) { - sb.append(port.getString("yem_factory")).append(";"); + port = BusinessDataServiceHelper.loadSingle(port.getPkValue(), port.getDataEntityType().getName(), "yem_namecn"); + if (!port.getString("yem_namecn").isEmpty()) { + sb.append(port.getString("yem_namecn")).append(";"); } } if (sb.lastIndexOf(";") == sb.length() - 1) {