From 1aa265b1857b13cefcb06d06839207a47515597c Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Thu, 6 Mar 2025 11:22:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix=EF=BC=9A=20=E8=8E=B7=E5=8F=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E4=BB=B7=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/clientdemand/utils/ClientUtils.java | 65 ++++++++++++++----- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 493759d7..371bd0bb 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -53,19 +53,21 @@ public class ClientUtils { if (!yem_linetype.equals("add")) { boolean tor = true; DynamicObjectCollection yemMulticonfig = temp.getDynamicObjectCollection("yem_multiconfig"); - if (!yemMulticonfig.isEmpty()){ + if (!yemMulticonfig.isEmpty()) { for (DynamicObject dynamicObject : yemMulticonfig) { String yemLinetypes = dynamicObject.getString("yem_linetypes"); - if ("add".equals(yemLinetypes)){ - tor= false; + if ("add".equals(yemLinetypes)) { + tor = false; } } } - if (tor){ + if (tor) { rowInfo++; continue; } } + } else { + yem_linetype = "add"; } //多功能配置分录行获取 DynamicObjectCollection multiconfig = null; @@ -158,19 +160,21 @@ public class ClientUtils { } } } - if ("yem_es_xsalesorder".equals(models.getDataEntityType().getName())){ + if ("yem_es_xsalesorder".equals(models.getDataEntityType().getName())) { int multiconfigIndex = 0; if (!multiconfig.isEmpty()) { for (DynamicObject dc : multiconfig) { - if ("add".equals(dc.getString("yem_linetypes"))){ + if ("add".equals(dc.getString("yem_linetypes"))) { long configentryid = dc.getLong("yem_configentryid"); BigDecimal configentry = dataMap.get(configentryid) == null ? BigDecimal.ZERO : dataMap.get(configentryid).setScale(2); models.setValue("yem_marketraisepribase", configentry, multiconfigIndex, rowInfo); multiconfigIndex++; + } else { + multiconfigIndex++; } } } - }else { + } else { setPriceNow(multiconfig, dataMap, rowInfo, models); } } @@ -202,7 +206,7 @@ public class ClientUtils { else if (("yem_im_clientdeman_zj".equals(yem_billtype) || "yem_im_inclientdeman_zj".equals(yem_billtype) || ("yem_es_salesorder_ZJ".equals(yem_billtype)) || "yem_es_salesorder_nmzj".equals(yem_billtype) || "yem_es_xsalesorder_zj".equals(yem_billtype) || "yem_es_xsalesorder_nmzj".equals(yem_billtype)) - && "P".equals(businesssort) && !yem_linetype.equals("add")) { + && "P".equals(businesssort) && yem_linetype.equals("add")) { // else if (("yem_im_clientdeman_zj".equals(yem_billtype) || "yem_im_inclientdeman_zj".equals(yem_billtype) || ("yem_es_salesorder_ZJ".equals(yem_billtype)) || "yem_es_salesorder_nmzj".equals(yem_billtype)) && "P".equals(businesssort)) { pjFindPrice(yem_exrate, info, pjDatas, rowInfo, list, materials, models, yemBdProductsid); } @@ -212,7 +216,7 @@ public class ClientUtils { else if (("yem_im_clientdema_pj".equals(yem_billtype) || "yem_im_inclientdema_pj".equals(yem_billtype) || "yem_es_salesorder_PJ".equals(yem_billtype) || "yem_es_salesorder_nmpj".equals(yem_billtype) || "yem_es_xsalesorder_pj".equals(yem_billtype) || "yem_es_xsalesorder_nmpj".equals(yem_billtype)) - && "P".equals(businesssort)&& !yem_linetype.equals("add")) { + && "P".equals(businesssort) && yem_linetype.equals("add")) { pjFindPrice(yem_exrate, info, pjDatas, rowInfo, list, materials, models, yemBdProductsid); } rowInfo++; @@ -366,7 +370,15 @@ public class ClientUtils { * 获取标准价中 给当前行标准销售加价赋值 */ public static void setPriceNow(DynamicObjectCollection multiconfig, Map dataMap, int rowInfo, IDataModel models) { - + int multiconfigIndex = 0; + if (!multiconfig.isEmpty()) { + for (DynamicObject dc : multiconfig) { + long configentryid = dc.getLong("yem_configentryid"); + BigDecimal configentry = dataMap.get(configentryid) == null ? BigDecimal.ZERO : dataMap.get(configentryid).setScale(2); + models.setValue("yem_marketraisepribase", configentry, multiconfigIndex, rowInfo); + multiconfigIndex++; + } + } } /** @@ -1489,22 +1501,39 @@ public class ClientUtils { private static void doCalculateBankInterestCharges(int rowIdx, IDataModel model) { BigDecimal safobprice = (BigDecimal) model.getValue("yem_safobprice", rowIdx);//销售FOB单价 BigDecimal seafreight = (BigDecimal) model.getValue("yem_e_seafreight", rowIdx);//海运费 + BigDecimal yemELandcarrycost = (BigDecimal) model.getValue("yem_e_landcarrycost", rowIdx);//国际陆运费 + BigDecimal yemEAirliftcost = (BigDecimal) model.getValue("yem_e_airliftcost", rowIdx);//空运费 + BigDecimal yemPortamt = (BigDecimal) model.getValue("yem_portamt", rowIdx);//港杂费 + BigDecimal yemInlandtransportation = (BigDecimal) model.getValue("yem_inlandtransportation", rowIdx);//内陆运输费 + BigDecimal yemEBankcost = (BigDecimal) model.getValue("yem_e_bankcost", rowIdx);//报关费 + BigDecimal yemEElsecost = (BigDecimal) model.getValue("yem_e_elsecost", rowIdx);//其他费用 + BigDecimal yemCostsinclude = (BigDecimal) model.getValue("yem_costsinclude", rowIdx);//费用包干 BigDecimal marinsupreamt = (BigDecimal) model.getValue("yem_e_marinsupreamt", rowIdx);//保险费 BigDecimal interestrate = (BigDecimal) model.getValue("yem_e_interestrate", rowIdx);//利息率% interestrate = BigDecimalUtils.div(interestrate, new BigDecimal("100"), 10); BigDecimal calculate = BigDecimal.ZERO; + BigDecimal interestdays = BigDecimal.ZERO; int rowCount = model.getEntryRowCount("yem_es_salescontrac_s"); for (int i = 0; i < rowCount; i++) { String issinosure = (String) model.getValue("yem_issinosure", i); if ("A".equals(issinosure)) { BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比% - BigDecimal interestdays = (BigDecimal) model.getValue("yem_interestdays", i);//利息天数 - raprate = BigDecimalUtils.div(raprate, new BigDecimal("100"), 10); - BigDecimal multiply = BigDecimalUtils.div(safobprice.add(seafreight).add(marinsupreamt).multiply(raprate).multiply(interestrate), new BigDecimal("360"), 10).multiply(interestdays); - calculate = calculate.add(multiply); + interestdays = interestdays.add((BigDecimal) model.getValue("yem_interestdays", i));//利息天数 +// raprate = BigDecimalUtils.div(raprate, new BigDecimal("100"), 10); +// BigDecimal multiply = BigDecimalUtils.div(safobprice.add(seafreight).add(marinsupreamt).multiply(raprate).multiply(interestrate), new BigDecimal("360"), 10).multiply(interestdays); + calculate = calculate.add(raprate); } } - model.setValue("yem_e_interestamt", calculate.setScale(0, RoundingMode.UP), rowIdx); + BigDecimal yem_e_interestamt = seafreight.add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt) + .add(yemInlandtransportation).add(yemEBankcost).add(yemEElsecost).add(yemCostsinclude).add(marinsupreamt); +// yem_e_interestamt = yem_e_interestamt.multiply(calculate).multiply(interestdays).multiply(interestrate.divide(new BigDecimal("100"),10).divide(new BigDecimal("360"),10)); + BigDecimal multiply = BigDecimalUtils.multiply(yem_e_interestamt, calculate, 10); + multiply = BigDecimalUtils.multiply(multiply, interestdays, 10); + multiply = BigDecimalUtils.multiply(multiply, interestrate, 10); + multiply = BigDecimalUtils.div(multiply, 100, 10); + multiply = BigDecimalUtils.div(multiply, 360, 10); +// BigDecimalUtils.div(yem_e_interestamt, new BigDecimal("100"), 10); + model.setValue("yem_e_interestamt", multiply.setScale(0, RoundingMode.UP), rowIdx); } /** @@ -1999,13 +2028,13 @@ public class ClientUtils { int rowCount = model.getEntryRowCount("yem_es_materialinfo"); for (int i = 0; i < rowCount; i++) { DynamicObject d = c.get(i); - if (string.equals("yem_es_xsalesorder")){ + if (string.equals("yem_es_xsalesorder")) { String yemLinetype = d.getString("yem_linetype"); - if (!"add".equals(yemLinetype)){ + if (!"add".equals(yemLinetype)) { continue; } } - if (!"Z".equals(d.getString("yem_businesssort"))){ + if (!"Z".equals(d.getString("yem_businesssort"))) { continue; } DynamicObjectCollection subC = d.getDynamicObjectCollection("yem_multiconfig"); From 674a1ed3c72ab19bf73e7f4c6a8d0ce97ca62d66 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Sat, 8 Mar 2025 11:35:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=201.=E4=BC=A0EAS=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/syn/eas/YemDelivernoticeService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java index c1b9ab3f..320b1097 100644 --- a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java +++ b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java @@ -3,6 +3,7 @@ package com.yem.wm.syn.eas; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.yem.wm.utils.BigDecimalUtils; import com.yem.wm.utils.RequestEAS; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; @@ -316,11 +317,13 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn { //实际含税单价 json.put("price", materialentry.getBigDecimal("yem_priceandtax")); //金额 - json.put("nonTaxAmount", materialentry.getBigDecimal("yem_amt")); + BigDecimal yemAmt = materialentry.getBigDecimal("yem_amt"); + json.put("nonTaxAmount", BigDecimalUtils.div(yemAmt,1,4)); //金额本位币 json.put("localNonTaxAmount", materialentry.getBigDecimal("yem_locamt")); //税额 - json.put("tax", materialentry.getBigDecimal("yem_taxamount")); + BigDecimal yemTaxamount = materialentry.getBigDecimal("yem_taxamount"); + json.put("tax", BigDecimalUtils.div(yemTaxamount,1,4)); //税额本位币 json.put("localTax", materialentry.getBigDecimal("yem_curtaxamount")); //价税合计 From 1c7a4b429934171334df7fdf3b3625631062626a Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Sat, 8 Mar 2025 16:52:07 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=201.=E4=BC=A0EAS=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?2=202.=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=88=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductsGroup/op/ProductsGroupSave.java | 21 ++++++++++++++++ .../validator/BomChangeSavevalidatorEdit.java | 24 +++++++++++++++++++ .../wm/syn/eas/YemDelivernoticeService.java | 4 ++-- src/main/java/kd/cosmic/Application.java | 18 +++++++------- 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/yem/em/bd/ProductsGroup/op/ProductsGroupSave.java create mode 100644 src/main/java/com/yem/em/bd/ProductsGroup/validator/BomChangeSavevalidatorEdit.java diff --git a/src/main/java/com/yem/em/bd/ProductsGroup/op/ProductsGroupSave.java b/src/main/java/com/yem/em/bd/ProductsGroup/op/ProductsGroupSave.java new file mode 100644 index 00000000..e30d3c43 --- /dev/null +++ b/src/main/java/com/yem/em/bd/ProductsGroup/op/ProductsGroupSave.java @@ -0,0 +1,21 @@ +package com.yem.em.bd.ProductsGroup.op; + +import com.yem.em.bd.ProductsGroup.validator.BomChangeSavevalidatorEdit; +import kd.bos.entity.plugin.AbstractOperationServicePlugIn; +import kd.bos.entity.plugin.AddValidatorsEventArgs; +import kd.bos.entity.plugin.PreparePropertysEventArgs; + +public class ProductsGroupSave extends AbstractOperationServicePlugIn { + + @Override + public void onPreparePropertys(PreparePropertysEventArgs e) { + super.onPreparePropertys(e); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); + } + + @Override + public void onAddValidators(AddValidatorsEventArgs e) { + super.onAddValidators(e); + e.addValidator(new BomChangeSavevalidatorEdit()); + } +} diff --git a/src/main/java/com/yem/em/bd/ProductsGroup/validator/BomChangeSavevalidatorEdit.java b/src/main/java/com/yem/em/bd/ProductsGroup/validator/BomChangeSavevalidatorEdit.java new file mode 100644 index 00000000..1beefabd --- /dev/null +++ b/src/main/java/com/yem/em/bd/ProductsGroup/validator/BomChangeSavevalidatorEdit.java @@ -0,0 +1,24 @@ +package com.yem.em.bd.ProductsGroup.validator; + +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.entity.ExtendedDataEntity; +import kd.bos.entity.validate.AbstractValidator; +import kd.bos.orm.query.QCP; +import kd.bos.orm.query.QFilter; +import kd.bos.servicehelper.BusinessDataServiceHelper; + +public class BomChangeSavevalidatorEdit extends AbstractValidator { + @Override + public void validate() { + ExtendedDataEntity[] dataEntities = this.getDataEntities(); + for (ExtendedDataEntity dataEntitie : dataEntities) { + DynamicObject dataEntity = dataEntitie.getDataEntity(); + long aLong = dataEntity.getLong("id"); + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(dataEntity.getDataEntityType().getName() + , "id,parent", new QFilter[]{new QFilter("parent.id", QCP.equals, aLong)}); + if (dynamicObject != null) { + this.addMessage(dataEntitie, "当前单有下级，不允许删除！！！"); + } + } + } +} diff --git a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java index 320b1097..b00342d4 100644 --- a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java +++ b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java @@ -318,12 +318,12 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn { json.put("price", materialentry.getBigDecimal("yem_priceandtax")); //金额 BigDecimal yemAmt = materialentry.getBigDecimal("yem_amt"); - json.put("nonTaxAmount", BigDecimalUtils.div(yemAmt,1,4)); + json.put("nonTaxAmount", BigDecimalUtils.div(yemAmt,1,2)); //金额本位币 json.put("localNonTaxAmount", materialentry.getBigDecimal("yem_locamt")); //税额 BigDecimal yemTaxamount = materialentry.getBigDecimal("yem_taxamount"); - json.put("tax", BigDecimalUtils.div(yemTaxamount,1,4)); + json.put("tax", BigDecimalUtils.div(yemTaxamount,1,2)); //税额本位币 json.put("localTax", materialentry.getBigDecimal("yem_curtaxamount")); //价税合计 diff --git a/src/main/java/kd/cosmic/Application.java b/src/main/java/kd/cosmic/Application.java index b30a4f27..da9708ed 100644 --- a/src/main/java/kd/cosmic/Application.java +++ b/src/main/java/kd/cosmic/Application.java @@ -17,17 +17,17 @@ public class Application { cosmic.setWebPath("E:/Cosmic/Comics_YXZG/YXZG-server/webapp"); ////152 - cosmic.setClusterNumber("yxzg-topview-dev"); - cosmic.setTenantNumber("yxzg-topview-dev"); - cosmic.setServerIP("10.64.112.152"); - cosmic.setFileServerPathIPAndPort("", ""); - cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); +// cosmic.setClusterNumber("yxzg-topview-dev"); +// cosmic.setTenantNumber("yxzg-topview-dev"); +// cosmic.setServerIP("10.64.112.152"); +// cosmic.setFileServerPathIPAndPort("", ""); +// cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); System.setProperty("mq.debug.queue.tag", "wrxtest"); ////134 -// cosmic.setClusterNumber("yxzg-prod"); -// cosmic.setTenantNumber("yxzg-prod"); -// cosmic.setServerIP("10.64.111.134"); -// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); + cosmic.setClusterNumber("yxzg-prod"); + cosmic.setTenantNumber("yxzg-prod"); + cosmic.setServerIP("10.64.111.134"); + cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); cosmic.setStartWithQing(false); cosmic.start(); From 03d34d9e7943cdc932627bff6add0a57b461242d Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Thu, 6 Mar 2025 11:29:16 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=201.=E8=AE=A1=E7=AE=97=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E5=88=A9=E6=81=AF=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 371bd0bb..c1f2902e 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1524,7 +1524,7 @@ public class ClientUtils { calculate = calculate.add(raprate); } } - BigDecimal yem_e_interestamt = seafreight.add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt) + BigDecimal yem_e_interestamt = safobprice.add(seafreight).add(yemELandcarrycost).add(yemEAirliftcost).add(yemPortamt) .add(yemInlandtransportation).add(yemEBankcost).add(yemEElsecost).add(yemCostsinclude).add(marinsupreamt); // yem_e_interestamt = yem_e_interestamt.multiply(calculate).multiply(interestdays).multiply(interestrate.divide(new BigDecimal("100"),10).divide(new BigDecimal("360"),10)); BigDecimal multiply = BigDecimalUtils.multiply(yem_e_interestamt, calculate, 10); From a93df406cf85c17bf514b91bb1b2250248e182c9 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Thu, 6 Mar 2025 14:22:52 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=201.=E9=93=B6=E8=A1=8C=E5=88=A9?= =?UTF-8?q?=E6=81=AF=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2=EF=BC=89*=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BF=A1=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94%*=E5=88=A9=E6=81=AF=E7=8E=87/100/36?= =?UTF-8?q?0*=E5=88=A9=E6=81=AF=E5=A4=A9=E6=95=B0=20=20=20=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2+=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=88=A9=E6=81=AF=E8=B4=B9=EF=BC=89*=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94%*=E4=BF=A1=E4=BF=9D=E8=B4=B9=E7=8E=87/100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/im/clientdemand/utils/ClientUtils.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index c1f2902e..b159cfa6 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1513,12 +1513,14 @@ public class ClientUtils { interestrate = BigDecimalUtils.div(interestrate, new BigDecimal("100"), 10); BigDecimal calculate = BigDecimal.ZERO; BigDecimal interestdays = BigDecimal.ZERO; + BigDecimal yem_sinosurerate = BigDecimal.ZERO; int rowCount = model.getEntryRowCount("yem_es_salescontrac_s"); for (int i = 0; i < rowCount; i++) { String issinosure = (String) model.getValue("yem_issinosure", i); if ("A".equals(issinosure)) { BigDecimal raprate = (BigDecimal) model.getValue("yem_raprate", i);//收汇百分比% interestdays = interestdays.add((BigDecimal) model.getValue("yem_interestdays", i));//利息天数 + yem_sinosurerate = yem_sinosurerate.add((BigDecimal) model.getValue("yem_sinosurerate", i));//利息天数 // raprate = BigDecimalUtils.div(raprate, new BigDecimal("100"), 10); // BigDecimal multiply = BigDecimalUtils.div(safobprice.add(seafreight).add(marinsupreamt).multiply(raprate).multiply(interestrate), new BigDecimal("360"), 10).multiply(interestdays); calculate = calculate.add(raprate); @@ -1533,7 +1535,12 @@ public class ClientUtils { multiply = BigDecimalUtils.div(multiply, 100, 10); multiply = BigDecimalUtils.div(multiply, 360, 10); // BigDecimalUtils.div(yem_e_interestamt, new BigDecimal("100"), 10); - model.setValue("yem_e_interestamt", multiply.setScale(0, RoundingMode.UP), rowIdx); + BigDecimal setScale = multiply.setScale(0, RoundingMode.UP); + model.setValue("yem_e_interestamt", setScale, rowIdx); + BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); + yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); + yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, 100,10); + model.setValue("yem_e_creditamt", yem_e_creditamt, rowIdx); } /** From 6392122aeb0ac8a32e4e9aab6e2f4bcb42dbc99e Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Mon, 10 Mar 2025 09:55:40 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=201.=E9=93=B6=E8=A1=8C=E5=88=A9?= =?UTF-8?q?=E6=81=AF=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2=EF=BC=89*=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BF=A1=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94%*=E5=88=A9=E6=81=AF=E7=8E=87/100/36?= =?UTF-8?q?0*=E5=88=A9=E6=81=AF=E5=A4=A9=E6=95=B0=20=20=20=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2+=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=88=A9=E6=81=AF=E8=B4=B9=EF=BC=89*=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94%*=E4=BF=A1=E4=BF=9D=E8=B4=B9=E7=8E=87/100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index b159cfa6..29c0289a 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1532,14 +1532,14 @@ public class ClientUtils { BigDecimal multiply = BigDecimalUtils.multiply(yem_e_interestamt, calculate, 10); multiply = BigDecimalUtils.multiply(multiply, interestdays, 10); multiply = BigDecimalUtils.multiply(multiply, interestrate, 10); - multiply = BigDecimalUtils.div(multiply, 100, 10); - multiply = BigDecimalUtils.div(multiply, 360, 10); + multiply = BigDecimalUtils.div(multiply, new BigDecimal(100), 10); + multiply = BigDecimalUtils.div(multiply, new BigDecimal(360), 10); // BigDecimalUtils.div(yem_e_interestamt, new BigDecimal("100"), 10); BigDecimal setScale = multiply.setScale(0, RoundingMode.UP); model.setValue("yem_e_interestamt", setScale, rowIdx); BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); - yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, 100,10); + yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10); model.setValue("yem_e_creditamt", yem_e_creditamt, rowIdx); } From e9fd2dfdf2c2bce78159124bbeeff151f11d6e29 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Mon, 10 Mar 2025 12:04:40 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=201.=E9=93=B6=E8=A1=8C=E5=88=A9?= =?UTF-8?q?=E6=81=AF=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2=EF=BC=89*=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BF=A1=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94%*=E5=88=A9=E6=81=AF=E7=8E=87/100/36?= =?UTF-8?q?0*=E5=88=A9=E6=81=AF=E5=A4=A9=E6=95=B0=20=20=20=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E8=B4=B9=3D=EF=BC=88=E3=80=90=EF=BC=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=BA=E5=9E=8B+=E9=80=89=E9=85=8D=EF=BC=89?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E4=BB=B7=EF=BC=88=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=B8=81=E5=88=AB=EF=BC=89=E3=80=91+=E6=B5=B7=E8=BF=90?= =?UTF-8?q?=E8=B4=B9+=E5=9B=BD=E9=99=85=E9=99=86=E8=BF=90=E8=B4=B9+?= =?UTF-8?q?=E7=A9=BA=E8=BF=90=E8=B4=B9+=E4=BF=9D=E9=99=A9=E8=B4=B9+?= =?UTF-8?q?=E6=B8=AF=E6=9D=82=E8=B4=B9+=E5=86=85=E9=99=86=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E8=B4=B9+=E5=8D=95=E8=AF=81=E5=8F=8A=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E8=B4=B9+=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8+?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8C=85=E5=B9=B2+=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=88=A9=E6=81=AF=E8=B4=B9=EF=BC=89*=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=E7=9A=84=E6=98=AF=E5=90=A6=E4=BF=A1?= =?UTF-8?q?=E4=BF=9D=E4=B8=BA=E6=98=AF=E7=9A=84=E6=94=B6=E6=B1=87=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94%*=E4=BF=A1=E4=BF=9D=E8=B4=B9=E7=8E=87/100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/es/salesorder/from/SalesOrderZJEdit.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index 3006e899..6719802d 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -371,7 +371,16 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 break; - + case"yem_e_landcarrycost": + case"yem_e_airliftcost": + case"yem_portamt": + case"yem_inlandtransportation": + case"yem_e_bankcost": + case"yem_e_elsecost": + case"yem_costsinclude": + case"yem_e_interestrate": + ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 + break; case "yem_onecarsum": ClientUtils.countFrontDisPrice(model, rowIndex);//折扣前单价 // ClientUtils.totalSaFobAmount(model, "yem_es_materialinfo", "yem_ifgift", "yem_onecarsum", "yem_sumcost");//单车总费用 汇总表头 总费用 @@ -525,9 +534,6 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 break; - case "yem_e_interestrate"://利息率% - ClientUtils.calculateBankInterestCharges(rowIndex, model);//银行利息费 - break; case "yem_e_interestamt"://银行利息费 ClientUtils.calculateCreditAmount(rowIndex, model);//信保费 break; From 362aefb41dfdf97bbc67b9e9732cc60ff3f82dba Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Mon, 10 Mar 2025 15:10:04 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=201.=E4=BF=A1=E4=BF=9D=E8=B4=B9?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 29c0289a..99a827d8 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1540,6 +1540,7 @@ public class ClientUtils { BigDecimal yem_e_creditamt = BigDecimalUtils.multiply(yem_e_interestamt,calculate,10); yem_e_creditamt= BigDecimalUtils.multiply(yem_e_creditamt,yem_sinosurerate,10); yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10); + yem_e_creditamt = BigDecimalUtils.div(yem_e_creditamt, new BigDecimal(100),10); model.setValue("yem_e_creditamt", yem_e_creditamt, rowIdx); } From 7d76821cfa1c744344d97994b8ca6b4e16ab4a72 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Tue, 11 Mar 2025 20:11:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=201.=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=AE=A1=E6=A0=B8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../es/salesorder/from/SalesOrderPJEdit.java | 12 +++---- .../op/DeliverNoticeAssAuditOpEdit.java | 32 +++++++++++-------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java index 67122577..202530f5 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java @@ -283,7 +283,7 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.countFrontDisAmt(model, rowIndex);//折扣前金额 ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 ClientUtils.countAfterFrontPrice(model, rowIndex);//折扣后销售单价 - calculateCostSharing(model); +// calculateCostSharing(model); break; case "yem_fobprice": ClientUtils.countFobAmt(model, rowIndex);//fob金额 @@ -381,11 +381,11 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo // calculateCostSharing(model); ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 break; - case "yem_sharethecost": - case "yem_sumedamount": -// - calculateCostSharing(model); - break; +// case "yem_sharethecost": +// case "yem_sumedamount": +//// +//// calculateCostSharing(model); +// break; } } diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java index 7a0dbf3d..3738ce38 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java @@ -93,7 +93,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn String yemVehicleno = salesorder_z.getString("yem_vehicleno"); if (map.size() > 0) { if (map.get(yemVehicleno) == null) { - DynamicObject adddevicefiles = adddevicefiles(dataEntitie,materialinfo, salesorder_z); + DynamicObject adddevicefiles = adddevicefiles(dataEntitie, materialinfo, salesorder_z); OperationResult Operate = OperationServiceHelper.executeOperate("save", adddevicefiles.getDynamicObjectType().getName(), new DynamicObject[]{adddevicefiles}, OperateOption.create()); if (Operate.isSuccess()) { @@ -101,7 +101,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn } } } else { - DynamicObject adddevicefiles = adddevicefiles(dataEntitie,materialinfo, salesorder_z); + DynamicObject adddevicefiles = adddevicefiles(dataEntitie, materialinfo, salesorder_z); OperationResult Operate = OperationServiceHelper.executeOperate("save", adddevicefiles.getDynamicObjectType().getName(), new DynamicObject[]{adddevicefiles}, OperateOption.create()); if (Operate.isSuccess()) { @@ -113,7 +113,7 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn SaveServiceHelper.save(new DynamicObject[]{dataEntitie}); } - public DynamicObject adddevicefiles(DynamicObject dataEntitie,DynamicObject materialinfo, DynamicObject submaterialinfo) { + public DynamicObject adddevicefiles(DynamicObject dataEntitie, DynamicObject materialinfo, DynamicObject submaterialinfo) { String yem_vehicleno = submaterialinfo.getString("yem_vehicleno"); String yem_conbillnumber = materialinfo.getString("yem_conbillnumber");//合同编号 BigDecimal yem_qty = materialinfo.getBigDecimal("yem_qty"); @@ -233,11 +233,14 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn public Date Getmachinedata(String yem_framenumber, DynamicObject yemResourcescode) { String Queryfield = AtlasUtils.Queryfield("PLAN_PIN", "INSTRUCTION_CODE", "JOB_TIME", "INSTRUCTION_NAME"); String sql = "select distinct " + Queryfield + " from VIEW_PLAN_JOB_WM where INSTRUCTION_NAME='上线' and PLAN_PIN='" + yem_framenumber + "'";//where TO_CHAR (enable_time, 'yyyy-mm-dd') >= '2023-01-01' - List fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemResourcescode.getDynamicObject("yem_productsgroup").getLong("id")); - if (fromCmmp.size() > 0) { - Map map = fromCmmp.get(0); - Date job_time = (Date) map.get("job_time"); - return job_time; + DynamicObject yemProductsgroup = yemResourcescode.getDynamicObject("yem_productsgroup"); + if (yemProductsgroup != null) { + List fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemProductsgroup.getLong("id")); + if (fromCmmp.size() > 0) { + Map map = fromCmmp.get(0); + Date job_time = (Date) map.get("job_time"); + return job_time; + } } return null; } @@ -246,11 +249,14 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn public static Date Getanalysistdate(String yem_framenumber, DynamicObject yemResourcescode) { String Queryfield = AtlasUtils.Queryfield("plmlastupdate"); String sql = "select distinct " + Queryfield + " from VIEW_ANALYZE_TIME_WM where plan_pin='" + yem_framenumber + "'";//where TO_CHAR (enable_time, 'yyyy-mm-dd') >= '2023-01-01' - List fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemResourcescode.getDynamicObject("yem_productsgroup").getLong("id")); - if (fromCmmp.size() > 0) { - Map map = fromCmmp.get(0); - Date job_time = (Date) map.get("plmlastupdate"); - return job_time; + DynamicObject yemProductsgroup = yemResourcescode.getDynamicObject("yem_productsgroup"); + if (yemProductsgroup != null) { + List fromCmmp = RequestCmmp.getFromCmmp(0L, sql, yemProductsgroup.getLong("id")); + if (fromCmmp.size() > 0) { + Map map = fromCmmp.get(0); + Date job_time = (Date) map.get("plmlastupdate"); + return job_time; + } } return null; }