From c0233e4e77ca1881d9d88fd52ed4a9ccc34a9aed Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 21 Feb 2025 10:25:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B7=9F=E5=8D=95=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placeexamine/op/AlaceexamineSubmitOp.java | 8 --- .../AlaceexamineSubmitOpSubmitvalidatox.java | 38 ------------- .../TracktaskconsoleSubmitvalidator.java | 54 ++++++++----------- 3 files changed, 23 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/com/yem/wm/im/placeexamine/vaildator/AlaceexamineSubmitOpSubmitvalidatox.java diff --git a/src/main/java/com/yem/wm/im/placeexamine/op/AlaceexamineSubmitOp.java b/src/main/java/com/yem/wm/im/placeexamine/op/AlaceexamineSubmitOp.java index 0bd0027c..b9d345d0 100644 --- a/src/main/java/com/yem/wm/im/placeexamine/op/AlaceexamineSubmitOp.java +++ b/src/main/java/com/yem/wm/im/placeexamine/op/AlaceexamineSubmitOp.java @@ -1,9 +1,7 @@ package com.yem.wm.im.placeexamine.op; -import com.yem.wm.im.placeexamine.vaildator.AlaceexamineSubmitOpSubmitvalidatox; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.entity.plugin.AbstractOperationServicePlugIn; -import kd.bos.entity.plugin.AddValidatorsEventArgs; import kd.bos.entity.plugin.PreparePropertysEventArgs; import kd.bos.entity.plugin.args.AfterOperationArgs; import kd.bos.servicehelper.BusinessDataServiceHelper; @@ -31,10 +29,4 @@ public class AlaceexamineSubmitOp extends AbstractOperationServicePlugIn } } } - - @Override - public void onAddValidators(AddValidatorsEventArgs e) { - super.onAddValidators(e); - e.addValidator(new AlaceexamineSubmitOpSubmitvalidatox()); - } } diff --git a/src/main/java/com/yem/wm/im/placeexamine/vaildator/AlaceexamineSubmitOpSubmitvalidatox.java b/src/main/java/com/yem/wm/im/placeexamine/vaildator/AlaceexamineSubmitOpSubmitvalidatox.java deleted file mode 100644 index f9cbf9f1..00000000 --- a/src/main/java/com/yem/wm/im/placeexamine/vaildator/AlaceexamineSubmitOpSubmitvalidatox.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yem.wm.im.placeexamine.vaildator; - -import kd.bos.dataentity.entity.DynamicObject; -import kd.bos.dataentity.entity.DynamicObjectCollection; -import kd.bos.entity.ExtendedDataEntity; -import kd.bos.entity.validate.AbstractValidator; - -public class AlaceexamineSubmitOpSubmitvalidatox extends AbstractValidator { - @Override - public void validate() { - ExtendedDataEntity[] dataEntities = this.getDataEntities(); - for (ExtendedDataEntity dataEntitie : dataEntities) { - DynamicObject dataEntity = dataEntitie.getDataEntity(); - DynamicObjectCollection yem_es_materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); - for (int i = 0; i < yem_es_materialinfo.size(); i++) { - DynamicObject materialinfo = yem_es_materialinfo.get(i); - int yem_nqty = materialinfo.getInt("yem_nqty"); - //商品信息第**行[**物料编码] 末备料数量[*]大于0，请执行备料! - if (yem_nqty > 0) { - DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); - if (yem_materiel != null) { - int seq = i + 1; - String materiel = yem_materiel.getString("number"); - this.addErrorMessage(dataEntitie, String.format("商品信息第" + seq + "行[" + materiel + "] 末备料数量[" + yem_nqty + "]大于0，请执行备料!")); - } - } - if (yem_nqty < 0) { - DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); - if (yem_materiel != null) { - int seq = i + 1; - String materiel = yem_materiel.getString("number"); - this.addErrorMessage(dataEntitie, String.format("商品信息第" + seq + "行[" + materiel + "] 末备料数量[" + yem_nqty + "]小于0，提交失败!")); - } - } - } - } - } -} diff --git a/src/main/java/com/yem/wm/im/tracktaskconsole/validator/TracktaskconsoleSubmitvalidator.java b/src/main/java/com/yem/wm/im/tracktaskconsole/validator/TracktaskconsoleSubmitvalidator.java index 66a9740e..8c34d36d 100644 --- a/src/main/java/com/yem/wm/im/tracktaskconsole/validator/TracktaskconsoleSubmitvalidator.java +++ b/src/main/java/com/yem/wm/im/tracktaskconsole/validator/TracktaskconsoleSubmitvalidator.java @@ -21,34 +21,26 @@ public class TracktaskconsoleSubmitvalidator extends AbstractValidator { ExtendedDataEntity[] dataEntities = this.getDataEntities(); for (ExtendedDataEntity dataEntitie : dataEntities) { DynamicObject dataEntity = dataEntitie.getDataEntity(); - yemIsvmi(dataEntity,dataEntitie); - DynamicObject yemBilltype = dataEntity.getDynamicObject("yem_billtype"); - String typeNumber = ""; - if(yemBilltype != null){ - typeNumber = yemBilltype.getString("number"); - } - //排除下单审批中的备料处理 - if(!"yem_placeexamine_".equals(typeNumber)){ - DynamicObjectCollection yem_es_materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); - for (int i = 0; i < yem_es_materialinfo.size(); i++) { - DynamicObject materialinfo = yem_es_materialinfo.get(i); - int yem_nqty = materialinfo.getInt("yem_nqty"); - //商品信息第**行[**物料编码] 末备料数量[*]大于0，请执行备料! - if(yem_nqty>0){ - DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); - if(yem_materiel!=null){ - int seq = i+1; - String materiel = yem_materiel.getString("number"); - this.addErrorMessage(dataEntitie,String.format("商品信息第"+seq+"行["+materiel+"] 末备料数量["+yem_nqty+"]大于0，请执行备料!")); - } + yemIsvmi(dataEntity, dataEntitie); + DynamicObjectCollection yem_es_materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); + for (int i = 0; i < yem_es_materialinfo.size(); i++) { + DynamicObject materialinfo = yem_es_materialinfo.get(i); + int yem_nqty = materialinfo.getInt("yem_nqty"); + //商品信息第**行[**物料编码] 末备料数量[*]大于0，请执行备料! + if (yem_nqty > 0) { + DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); + if (yem_materiel != null) { + int seq = i + 1; + String materiel = yem_materiel.getString("number"); + this.addErrorMessage(dataEntitie, String.format("商品信息第" + seq + "行[" + materiel + "] 末备料数量[" + yem_nqty + "]大于0，请执行备料!")); } - if(yem_nqty<0){ - DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); - if(yem_materiel!=null){ - int seq = i+1; - String materiel = yem_materiel.getString("number"); - this.addErrorMessage(dataEntitie,String.format("商品信息第"+seq+"行["+materiel+"] 末备料数量["+yem_nqty+"]小于0，提交失败!")); - } + } + if (yem_nqty < 0) { + DynamicObject yem_materiel = materialinfo.getDynamicObject("yem_materiel"); + if (yem_materiel != null) { + int seq = i + 1; + String materiel = yem_materiel.getString("number"); + this.addErrorMessage(dataEntitie, String.format("商品信息第" + seq + "行[" + materiel + "] 末备料数量[" + yem_nqty + "]小于0，提交失败!")); } } } @@ -84,14 +76,14 @@ public class TracktaskconsoleSubmitvalidator extends AbstractValidator { private void yemIsvmi(DynamicObject dataEntity, ExtendedDataEntity dataEntities) { DynamicObjectCollection yemEsSalesorderR = dataEntity.getDynamicObjectCollection("yem_es_salesorder_r"); - if (yemEsSalesorderR!=null){ + if (yemEsSalesorderR != null) { for (DynamicObject dynamicObject : yemEsSalesorderR) { String yemStockway = dynamicObject.getString("yem_stockway"); - if ("E".equals(yemStockway)){ + if ("E".equals(yemStockway)) { String yemIsvmi = dynamicObject.getString("yem_isvmi"); int seq = dynamicObject.getInt("seq"); - if ("".equals(yemIsvmi)){ - this.addErrorMessage(dataEntities,"备料（生产、采购）信息 第"+seq+"行 仓库类型未填写，请填写后提交！！！"); + if ("".equals(yemIsvmi)) { + this.addErrorMessage(dataEntities, "备料（生产、采购）信息 第" + seq + "行 仓库类型未填写，请填写后提交！！！"); } } }