From b85234b9993739a9b1d12d22384776ab66ae7601 Mon Sep 17 00:00:00 2001 From: violet Date: Tue, 7 Jan 2025 20:25:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E8=88=B1=E4=B8=8B=E6=8E=A8?= =?UTF-8?q?=E5=AF=84=E5=8D=95=E6=94=BE=E5=8D=95=EF=BC=8C=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StorgeTransToExportPresentConvert.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/convert/StorgeTransToExportPresentConvert.java b/src/main/java/com/yem/wm/es/storagetrans/convert/StorgeTransToExportPresentConvert.java index c21a7ee3..177947ee 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/convert/StorgeTransToExportPresentConvert.java +++ b/src/main/java/com/yem/wm/es/storagetrans/convert/StorgeTransToExportPresentConvert.java @@ -83,19 +83,20 @@ public class StorgeTransToExportPresentConvert extends AbstractConvertPlugIn DynamicObject[] shipBills = getShipBills(saleOrder, dataEntity, "A");//出运 DynamicObject[] payBills = getPayBills(saleOrder, dataEntity, "B");//收款单 DynamicObject thisShipDetail = null; - for (DynamicObject shippingDetailObj : shippingDetails) { - long pkValue = (long) shippingDetailObj.getPkValue(); - long sourcebillid = dataEntity.getLong("yem_sourcebillid"); - DynamicObject single = BusinessDataServiceHelper.loadSingle(sourcebillid, "yem_es_storagetrans" ,"id, billno, yem_sourcebillid"); - if (single == null) continue; - long shipDetailId = single.getLong("yem_sourcebillid"); - if (shipDetailId == pkValue) { - thisShipDetail = shippingDetailObj; - break; - } - } - if (thisShipDetail == null) continue; - BigDecimal thisRealityAmt = PaymentControlUtil.getThisRealityAmt(saleOrder, shipBills, payBills, thisShipDetail); +// for (DynamicObject shippingDetailObj : shippingDetails) { +// long pkValue = (long) shippingDetailObj.getPkValue(); +// long sourcebillid = dataEntity.getLong("yem_sourcebillid"); +// DynamicObject single = BusinessDataServiceHelper.loadSingle(sourcebillid, "yem_es_storagetrans" ,"id, billno, yem_sourcebillid"); +// if (single == null) continue; +// long shipDetailId = single.getLong("yem_sourcebillid"); +// if (shipDetailId == pkValue) { +// thisShipDetail = shippingDetailObj; +// break; +// } +// } +// thisShipDetail = BusinessDataServiceHelper.loadSingle() +// if (shippingDetail == null) continue; + BigDecimal thisRealityAmt = PaymentControlUtil.getThisRealityAmt(saleOrder, shipBills, payBills, shippingDetail); addNew.set("yem_debtamt", thisRealityAmt.setScale(2, RoundingMode.HALF_UP));//欠款金额 } }