From da4684ccdb1427e05fe1dba6d8d885eb5ca93d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=B4=B5=E5=BC=BA?= Date: Thu, 22 May 2025 17:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=90=BA=E5=B8=A6=E4=BA=8C?= =?UTF-8?q?=E5=BC=80=E5=B1=9E=E6=80=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialSaveCarryNumberPlugin.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/main/java/shkd/repc/recon/formplugin/MaterialSaveCarryNumberPlugin.java b/main/java/shkd/repc/recon/formplugin/MaterialSaveCarryNumberPlugin.java index 8e76afc..d4c3b2d 100644 --- a/main/java/shkd/repc/recon/formplugin/MaterialSaveCarryNumberPlugin.java +++ b/main/java/shkd/repc/recon/formplugin/MaterialSaveCarryNumberPlugin.java @@ -84,13 +84,13 @@ public class MaterialSaveCarryNumberPlugin extends AbstractBillPlugIn implements for (int i = 0; i < entryEntity.size(); i++) { DynamicObject material = entryEntity.get(i).getDynamicObject(materialIdLogotype);//物料-基础资料 String type = entryEntity.get(i).getString("qeug_materialtypeid.name");//物料分类 - if (type==null||"".equals(type)){ + if ((type==null||"".equals(type))&&"qeug_orderformentry".equals(entryLogotype)){ type=this.getMapBillMaterialTypeName(); } String model = entryEntity.get(i).getString("qeug_importmodel");//规格型号 - String unit = entryEntity.get(i).getString("qeug_importunit");//规格型号 - String brand = entryEntity.get(i).getString("qeug_brand");//规格型号 - String extModel = entryEntity.get(i).getString("qeug_model");//规格型号 + String unit = entryEntity.get(i).getString("qeug_importunit");//单位 + String brand = entryEntity.get(i).getString("qeug_brand");//品牌 + String extModel = entryEntity.get(i).getString("qeug_model");//型号 Long id; if (material==null){ String name = entryEntity.get(i).getString(materialNameLogotype); @@ -223,6 +223,8 @@ public class MaterialSaveCarryNumberPlugin extends AbstractBillPlugIn implements this.carryMaterialAttribute(pkValue,name,"qeug_orderformentry","qeug_material","qeug_materialnames"); }else if ("repe_orderform".equals(name)){ this.carryMaterialAttribute(pkValue,name,"orderformentry","material","qeug_materialnames"); + }else if ("recon_settleplanbill".equals(name)){ + this.carryMaterialAttribute(pkValue,name,"qeug_cgxqentry","qeug_materialmasterid","qeug_materialname"); } } @@ -281,6 +283,18 @@ public class MaterialSaveCarryNumberPlugin extends AbstractBillPlugIn implements if (StringUtils.isNotEmpty(queryExtModel)){ entry.set("qeug_model",queryExtModel); } } + + //物料分类-基础资料 + DynamicObject materialTypeId = entry.getDynamicObject("qeug_materialtypeid"); + if (materialTypeId==null){ + DynamicObject groupStandard = BusinessDataServiceHelper.loadSingle("bd_materialgroupdetail", new QFilter("material.id", QCP.equals, queryMaterial.getPkValue()).toArray()); + if (groupStandard != null) { + DynamicObject group = groupStandard.getDynamicObject("group"); + if (group != null) { + entry.set("qeug_materialtypeid",group); + } + } + } } } }