From 384e827700c64f86eea8311a7396a48d6c9ab604 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Tue, 18 Mar 2025 17:32:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E8=AE=A2=E5=8D=95=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=9C=80=E6=B1=82=E5=8D=95-=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=EF=BC=8C=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E4=BC=A0CMMP=E6=98=AF=E4=BC=A0=E7=9A=84=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BC=A0=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E9=87=87=E8=B4=AD=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/wm/syn/cmmp/addnew/OrderProReqBill.java | 13 +++++-------- .../yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java | 11 +++++------ .../wm/syn/cmmp/addnew/OrderProReqBillWMI.java | 15 ++++++++++----- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java index e1b381ad..ed9a47cc 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java @@ -3,7 +3,6 @@ package com.yem.wm.syn.cmmp.addnew; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.yem.wm.syn.eas.YemOrderproreqbillWGService; import com.yem.wm.syn.utils.HttpClient; import com.yem.wm.utils.RequestCmmp; import kd.bos.dataentity.entity.DynamicObject; @@ -13,13 +12,10 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs; import kd.bos.entity.plugin.args.AfterOperationArgs; import kd.bos.entity.validate.ErrorLevel; import kd.bos.entity.validate.ValidationErrorInfo; -import kd.bos.exception.KDBizException; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; -import kd.bos.sdk.util.KHttpClientUtils; -import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; @@ -27,10 +23,8 @@ import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @author 涛 @@ -166,9 +160,8 @@ public class OrderProReqBill extends AbstractOperationServicePlugIn { for (DynamicObject esMaterial: yemEsMaterialcoll) { JSONObject entry = new JSONObject(); DynamicObject yemMateriel = esMaterial.getDynamicObject("yem_materiel"); + DynamicObject yemRealpurmateriel = esMaterial.getDynamicObject("yem_realpurmateriel"); if (yemMateriel!=null){ - //物料代码 - entry.put("mater_code",yemMateriel.getString("number")); //物料名称 entry.put("mater_name",yemMateriel.getString("name")); //id @@ -181,6 +174,10 @@ public class OrderProReqBill extends AbstractOperationServicePlugIn { entry.put("unit_fid",dynamicObject.getString("yem_easid")); } } + if (yemRealpurmateriel!=null){ + //物料代码 + entry.put("mater_code",yemRealpurmateriel.getString("number")); + } entry.put("plmcreator",creator.getString("number")); entry.put("plmcreatedate",localDateTime); //需求数量 diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java index a56afc07..5f2db3bd 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java @@ -12,12 +12,10 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs; import kd.bos.entity.plugin.args.AfterOperationArgs; import kd.bos.entity.validate.ErrorLevel; import kd.bos.entity.validate.ValidationErrorInfo; -import kd.bos.exception.KDBizException; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; -import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; @@ -27,7 +25,6 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @author 涛 @@ -129,11 +126,9 @@ public class OrderProReqBillCG extends AbstractOperationServicePlugIn { entry.put("need_code",dataEntity.getString("billno")); - + DynamicObject yemRealpurmateriel = esMaterial.getDynamicObject("yem_realpurmateriel"); DynamicObject yemMateriel = esMaterial.getDynamicObject("yem_materiel"); if (yemMateriel!=null){ - //物料代码 - entry.put("mater_code",yemMateriel.getString("number")); //物料名称 entry.put("mater_name",yemMateriel.getString("name")); DynamicObject baseunit = yemMateriel.getDynamicObject("baseunit"); @@ -144,6 +139,10 @@ public class OrderProReqBillCG extends AbstractOperationServicePlugIn { //规格型号 entry.put("specification",yemMateriel.getString("modelnum")); } + if (yemRealpurmateriel!=null){ + //物料代码 + entry.put("mater_code",yemRealpurmateriel.getString("number")); + } //需求数量 entry.put("need_num",esMaterial.getString("yem_qty")); //提交数量 diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java index 4f3c284c..60f59f5a 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java @@ -15,7 +15,6 @@ import kd.bos.entity.plugin.args.AfterOperationArgs; import kd.bos.entity.property.ComboProp; import kd.bos.entity.validate.ErrorLevel; import kd.bos.entity.validate.ValidationErrorInfo; -import kd.bos.exception.KDBizException; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; @@ -28,7 +27,10 @@ import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * @author 涛 @@ -206,9 +208,8 @@ public class OrderProReqBillWMI extends AbstractOperationServicePlugIn { } DynamicObject yemMateriel = esMaterial.getDynamicObject("yem_materiel"); + DynamicObject yemRealpurmateriel = esMaterial.getDynamicObject("yem_realpurmateriel"); if (yemMateriel!=null){ - //物料代码 - entry.put("mater_code",yemMateriel.getString("number")); //物料名称 entry.put("mater_name",yemMateriel.getString("name")); entry.put("mater_fid",yemMateriel.getString("yem_easid")); @@ -220,7 +221,11 @@ public class OrderProReqBillWMI extends AbstractOperationServicePlugIn { entry.put("unit_fid",dynamicObject.getString("yem_easid")); } //规格型号 - entry.put("specification",yemMateriel.getString("modelnum")); + entry.put("specification",yemMateriel.getString("modelnum")); + } + if (yemRealpurmateriel!=null){ + //物料代码 + entry.put("mater_code",yemRealpurmateriel.getString("number")); } //需求数量 entry.put("order_num",esMaterial.getString("yem_qty"));