diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java index 30b1e44..7cfd87c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java @@ -60,7 +60,7 @@ import kd.ec.material.formplugin.materialout.PoundAutoFetchBiz; import kd.ec.material.utils.UnitProjectUtil; /** - * 出库单扩展系统代码:修改领料人必填逻辑 + * 出库单扩展系统代码:修改领料人和合同编号必填逻辑 */ public class MaterialOutBillEditPluginExt extends AbstractEcmaBillPlugin implements BeforeF7SelectListener, HyperLinkClickListener { private static final String PROJECT = "project"; @@ -605,7 +605,8 @@ public class MaterialOutBillEditPluginExt extends AbstractEcmaBillPlugin impleme BasedataEdit contract = (BasedataEdit) this.getControl("contract"); BasedataEdit labour = (BasedataEdit) this.getControl("labour"); if (StringUtils.equals(costType, "b")) { - contract.setMustInput(true); +// contract.setMustInput(true);//系统代码 + contract.setMustInput(false);//二开替代 labour.setMustInput(true); this.getView().setVisible(true, new String[]{"labour"}); } else { @@ -696,14 +697,16 @@ public class MaterialOutBillEditPluginExt extends AbstractEcmaBillPlugin impleme reqPersonCombo.setMustInput(false); BasedataEdit reqPersonF71 = (BasedataEdit) this.getControl("requestperson"); this.getView().setVisible(true, new String[]{"requestperson"}); - reqPersonF71.setMustInput(true); +// reqPersonF71.setMustInput(true);//系统代码 + reqPersonF71.setMustInput(false);//二开替代 } else if ("02".equals(team)) { reqPersonF7 = (BasedataEdit) this.getControl("requestperson"); this.getView().setVisible(false, new String[]{"requestperson"}); reqPersonF7.setMustInput(false); ComboEdit reqPersonCombo = (ComboEdit) this.getControl("reqpersonname"); this.getView().setVisible(true, new String[]{"reqpersonname"}); - reqPersonCombo.setMustInput(true); +// reqPersonCombo.setMustInput(true);//系统代码 + reqPersonCombo.setMustInput(false);//二开替代 DynamicObjectCollection personEntryEntitys = labour.getDynamicObjectCollection("entryentity"); ArrayList comboList = new ArrayList(); if (personEntryEntitys != null && personEntryEntitys.size() > 0) {