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+"】行未匹配【图册明细】,请重试!")); } } 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; 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"); } }