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] =?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; }