diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MainMaterialCostBillPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MainMaterialCostBillPluginExt.java index 4da823e..2587a01 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MainMaterialCostBillPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MainMaterialCostBillPluginExt.java @@ -21,6 +21,9 @@ import kd.bos.form.field.BasedataPropEdit; import kd.ec.basedata.common.utils.OpenPageUtils; import kd.ec.cost.formplugin.MaterialCostBillPlugin; +/** + * 材料成本核算系统代码二开 + */ public class MainMaterialCostBillPluginExt extends MaterialCostBillPluginExt { private static final String PROJECT = "project"; private static final String EC_PROJECT = "ec_project"; diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java index 870e5d5..79c3f03 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java @@ -69,6 +69,9 @@ import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +/** + * 材料成本核算系统代码二开继承父类 + */ public class MaterialCostBillPluginExt extends AbstractEccoBillPlugin implements BeforeF7SelectListener, HyperLinkClickListener { private static Log logger = LogFactory.getLog(MaterialCostBillPluginExt.class); private static final String ECCO_MAINMATCOST = "ecco_mainmatcost"; @@ -730,6 +733,13 @@ public class MaterialCostBillPluginExt extends AbstractEccoBillPlugin implements this.loadItemInfo(materialInfo, entryRow, splitAmount, index); stdCurrency.set("splitamount", splitAmount); stdCurrency.set("unsplitamount", unSplitAmt); + //二开添加↓ + if (source.equals("OUT")){ + //出库单导入 + stdCurrency.set("zcgj_costtype", materialInfo.get("costtype"));//费用类型 + stdCurrency.set("zcgj_shebei", entryRow.get("zcgj_shebei"));//使用设备 + } + //二开添加↑ } } } @@ -810,7 +820,8 @@ public class MaterialCostBillPluginExt extends AbstractEccoBillPlugin implements protected DynamicObject[] getOutMaterialInfo(QFilter qFilter) { QFilter[] qFilters = this.getOutwareFilter(qFilter); - String selectPro = "billno,billname,ismulticurrency,unitprojectpro,currency,stdcurrency,exchangerate,exratetable,transtype.impactcost,costtype,project,period,entryentity.material,entryentity.lot,entryentity.lotid,entryentity.modelnum,entryentity.measureunit,entryentity.amount,entryentity.ismainmaterial,entryentity.procbs,entryentity.ca,entryentity.proboq,entryentity.unitproject,entryentity.qty,entryentity.price"; + String selectPro = "billno,billname,ismulticurrency,unitprojectpro,currency,stdcurrency,exchangerate,exratetable,transtype.impactcost,costtype,project,period,entryentity.material,entryentity.lot,entryentity.lotid,entryentity.modelnum,entryentity.measureunit,entryentity.amount,entryentity.ismainmaterial,entryentity.procbs,entryentity.ca,entryentity.proboq,entryentity.unitproject,entryentity.qty,entryentity.price," + + "entryentity.zcgj_shebei";//entryentity.zcgj_shebei为二开添加 return BusinessDataServiceHelper.load("ecma_materialoutbill", selectPro, qFilters); }