diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java index 257f9b4..bad7c1f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java @@ -43,6 +43,7 @@ import java.util.stream.Collectors; * 3:采购申请字段过滤逻辑加仓库修改后清空采购申请字段 * 4:申请人部门根据物资申请人过滤部门 * 5:申请人部门赋值逻辑 + * 6:合同编码字段赋值 */ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implements Plugin, BeforeF7SelectListener { @Override @@ -95,14 +96,21 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement DynamicObject purchaseApply = (DynamicObject) newValue; QFilter[] qFilter = new QFilter[]{new QFilter("id", QCP.equals, purchaseApply.getPkValue())}; DynamicObject ecma_purchaseApply = BusinessDataServiceHelper.loadSingle("ecma_purchaseapply", - "applyer,zcgj_persondepart", qFilter);//采购申请单 + "applyer,zcgj_persondepart,zcgj_iscontract,zcgj_contract", qFilter);//采购申请单 if (ecma_purchaseApply != null) { - this.getModel().setValue("zcgj_reqperson", ecma_purchaseApply.get("applyer"));//物料申请人 - this.getModel().setValue("zcgj_applidepart", ecma_purchaseApply.get("zcgj_persondepart"));//申请人部门 + this.getModel().setValue("zcgj_reqperson", ecma_purchaseApply.get("applyer"));// 采购申请单-物料申请人 + this.getModel().setValue("zcgj_applidepart", ecma_purchaseApply.get("zcgj_persondepart"));// 采购申请单-申请人部门 + boolean zcgj_iscontract = ecma_purchaseApply.getBoolean("zcgj_iscontract");// 采购申请单-无合同 + boolean zcgj_iscontract1 = (boolean) this.getModel().getValue("zcgj_iscontract");//无合同 + if (zcgj_iscontract || zcgj_iscontract1) { + return; + } + this.getModel().setValue("contract", ecma_purchaseApply.get("zcgj_contract"));//项目 ← 采购申请单-物资采购合同 } } else { this.getModel().setValue("zcgj_reqperson", null);//清空物料申请人字段 this.getModel().setValue("zcgj_applidepart", null);//清空申请人部门字段 + this.getModel().setValue("contract", null);//清空物资采购合同字段 } } else if ("warehouse".equals(key)) { //仓库