From 7ea350de04914646b1ef5473b14e004927257157 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 09:34:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E6=9C=8D=E5=8A=A1=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E6=97=A0=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/servicerepair/form/ServiceRepairFormPlugin.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/im/servicerepair/form/ServiceRepairFormPlugin.java b/src/main/java/com/yem/wm/im/servicerepair/form/ServiceRepairFormPlugin.java index 3d18c009..9224d608 100644 --- a/src/main/java/com/yem/wm/im/servicerepair/form/ServiceRepairFormPlugin.java +++ b/src/main/java/com/yem/wm/im/servicerepair/form/ServiceRepairFormPlugin.java @@ -4,6 +4,8 @@ import com.google.common.collect.Maps; import com.yem.wm.utils.FunctionalCommon; import com.yem.wm.utils.YEM; import kd.bos.bill.AbstractBillPlugIn; +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.entity.datamodel.IDataModel; import kd.bos.extplugin.sample.AbstractFormPlugin; import kd.bos.form.CloseCallBack; import kd.bos.form.FormShowParameter; @@ -12,6 +14,7 @@ import kd.bos.form.ShowType; import kd.bos.form.events.BeforeDoOperationEventArgs; import kd.bos.form.events.ClosedCallBackEvent; import kd.bos.form.operate.FormOperate; +import kd.bos.servicehelper.operation.SaveServiceHelper; import java.util.HashMap; @@ -42,8 +45,10 @@ public class ServiceRepairFormPlugin extends AbstractBillPlugIn { super.closedCallBack(e); IFormView view = this.getView(); String actionId = e.getActionId(); + IDataModel model = this.getModel(); + DynamicObject dataEntity = model.getDataEntity(true); if ("voidreason".equals(actionId)) { - view.invokeOperation("save"); + SaveServiceHelper.save(new DynamicObject[]{dataEntity}); view.invokeOperation("refresh"); } } From 7dd13631933342be8dea0d2b3eea611a79136d71 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 09:51:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E8=AE=A2=E8=88=B1=E5=A7=94=E6=89=98?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/StorageTransEdit_wl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java index 5b12ef59..d18437b0 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java @@ -288,16 +288,16 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn { boonle = false; i++; } - if (yemCutdate == null) { - string = string + i + ". 截单日期为空，请稍后重试！\n"; - boonle = false; - i++; - } - if (yemPortinterception == null) { - string = string + i + ". 截港日期为空，请稍后重试！\n"; - boonle = false; - i++; - } +// if (yemCutdate == null) { +// string = string + i + ". 截单日期为空，请稍后重试！\n"; +// boonle = false; +// i++; +// } +// if (yemPortinterception == null) { +// string = string + i + ". 截港日期为空，请稍后重试！\n"; +// boonle = false; +// i++; +// } if (null == yemCfscompnay) { string = string + i + ". 货代公司为空，请稍后重试！\n"; boonle = false; From 28e8697e2d65abe2a22030ec63916e22852c0ccd Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 2 Sep 2024 09:56:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:CMMP=E9=83=A8=E4=BB=B6=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E5=AE=A1=E6=A0=B8=E6=A0=A1=E9=AA=8C=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java b/src/main/java/com/yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java index 03c566bc..8b73e8ea 100644 --- a/src/main/java/com/yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java +++ b/src/main/java/com/yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java @@ -26,7 +26,7 @@ public class CMMPTableAuditvalidator extends AbstractValidator { this.addErrorMessage(dataEntitie, String.format("部件详情第【"+seq+"】行未匹配【系统编码】，请重试！")); } boolean yem_isassatlasdet = dynamicObject.getBoolean("yem_isassatlasdet"); - if (!yemIsnormal) { + if (!yem_isassatlasdet) { this.addErrorMessage(dataEntitie, String.format("部件详情第【"+seq+"】行未匹配【图册明细】，请重试！")); } }