From 58a1161cb85e00000c5d3d3d85e3b71863934e22 Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 3 Jan 2025 20:07:52 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=9F=E6=88=90=E8=B4=B7=E8=AE=B0=E5=8D=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/DebCredNewUnAuditValidator.java | 10 +++++----- .../im/delivernotice/op/DeliverNoticeNewAuditOp.java | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java index 8a0beb93..72dec668 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java @@ -19,10 +19,10 @@ public class DebCredNewUnAuditValidator extends AbstractValidator { @Override public void validate() { ExtendedDataEntity[] dataEntities = this.getDataEntities(); - for(ExtendedDataEntity dataEntitie : dataEntities){ + for (ExtendedDataEntity dataEntitie : dataEntities) { DynamicObject dataEntity = dataEntitie.getDataEntity(); String billno = dataEntity.getString("billno"); - if (billno.length()>4){ + if (billno.length() > 4) { BigDecimal bigDecimal = BigDecimal.ZERO; String modifiedString = billno.substring(0, billno.length() - 4); String substringed = billno.substring(billno.length() - 4); @@ -31,13 +31,13 @@ public class DebCredNewUnAuditValidator extends AbstractValidator { String dynamicObjectString = dynamicObject.getString("billno"); String substring = dynamicObjectString.substring(dynamicObjectString.length() - 4); BigDecimal decimal = BigDecimal.valueOf(Double.parseDouble(substring)); - if (decimal.compareTo(bigDecimal)>0){ + if (decimal.compareTo(bigDecimal) > 0) { bigDecimal = decimal; } } BigDecimal decimal = BigDecimal.valueOf(Double.parseDouble(substringed)); - if (decimal.compareTo(bigDecimal)!=0){ - this.addMessage(dataEntitie,"当前单不是最大单号，请从最大单号开始删除！！！"); + if (bigDecimal.compareTo(BigDecimal.ZERO) != 0 && decimal.compareTo(bigDecimal) != 0) { + this.addMessage(dataEntitie, "当前单不是最大单号，请从最大单号开始删除！！！"); } } } diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java index eec6c9f2..dc01b82c 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java @@ -112,6 +112,11 @@ public class DeliverNoticeNewAuditOp extends AbstractOperationServicePlugIn { QFilter qFilter1 = new QFilter("number", QCP.equals, "JDJLX-0002"); DynamicObject Object = BusinessDataServiceHelper.loadSingle("yem_bd_debcredtype", "id,number,name", qFilter1.toArray()); debCredNote.set("yem_credittype", Object); + if (yem_es_salesorder!=null){ + debCredNote.set("yem_accessories", yem_es_salesorder.getString("yem_accessories")); + debCredNote.set("yem_wholemachine", yem_es_salesorder.getString("yem_wholemachine")); + debCredNote.set("yem_sale_type",yem_es_salesorder.getString("yem_sale_type"));//出口 + } String debCredNoteNumber = debCredNote.getDynamicObjectType().getName(); OperationResult save = OperationServiceHelper.executeOperate("save", debCredNoteNumber, new DynamicObject[]{debCredNote}, OperateOption.create()); if (save.isSuccess()) {