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 9892917..faaa63f 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 @@ -116,18 +116,19 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement long zcgj_bigintfield = returnData.getLong("zcgj_bigintfield");//采购申请单id QFilter filter = new QFilter("purchaseentry.id", QCP.equals, zcgj_bigintfield); DynamicObjectCollection purchaseApply = QueryServiceHelper.query("ecma_purchaseapply", - "purchaseentry,purchaseentry.material,purchaseentry.purchaseqty,purchaseentry.entrytaxrate,purchaseentry.price,purchaseentry.id,purchaseentry.remarks", + "purchaseentry,purchaseentry.material,purchaseentry.purchaseqty,purchaseentry.entrytaxrate,purchaseentry.price,purchaseentry.id,purchaseentry.remarks,purchaseentry.zcgj_incount", new QFilter[]{filter});//采购申请单 long material = purchaseApply.get(0).getLong("purchaseentry.material");//采购申请分录-资源编码 - Object purchaseQty = purchaseApply.get(0).get("purchaseentry.purchaseqty");//采购申请分录-采购数量 + BigDecimal purchaseQty = (BigDecimal) purchaseApply.get(0).get("purchaseentry.purchaseqty");//采购申请分录-采购数量 + BigDecimal zcgj_inCount = (BigDecimal) purchaseApply.get(0).get("purchaseentry.zcgj_incount");//采购申请分录-已入库数量 Object entryTaxRate = purchaseApply.get(0).get("purchaseentry.entrytaxrate");//采购申请分录-税率 Object price = purchaseApply.get(0).get("purchaseentry.price");//采购申请分录-预估单价 Object purchaseEntryId = purchaseApply.get(0).get("purchaseentry.id");//采购申请分录-预估单价 Object remarks = purchaseApply.get(0).get("purchaseentry.remarks");//采购申请分录-备注 this.getModel().setValue("material", material, curIndex);//资源编码 this.getModel().setValue("entrytaxrate", entryTaxRate, curIndex);//税率名称 - this.getModel().setValue("qty", purchaseQty, curIndex);//数量 + this.getModel().setValue("qty", purchaseQty.subtract(zcgj_inCount), curIndex);//数量 this.getModel().setValue("price", price, curIndex);//入库单价 this.getModel().setValue("listingid", purchaseEntryId, curIndex);//合同清单id this.getModel().setValue("note", remarks, curIndex);//备注 diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PurchaseApplyEntryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PurchaseApplyEntryPlugin.java index 8eaa173..27ff15c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PurchaseApplyEntryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PurchaseApplyEntryPlugin.java @@ -10,6 +10,7 @@ import kd.bos.form.plugin.AbstractFormPlugin; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.sdk.plugin.Plugin; +import java.math.BigDecimal; import java.util.EventObject; import java.util.List; import java.util.Map; @@ -69,6 +70,7 @@ public class PurchaseApplyEntryPlugin extends AbstractFormPlugin implements Plug entryEntityNew.set("zcgj_modelnum", purchaseEntry.getDynamicObject("material").get("model"));//规格型号 entryEntityNew.set("zcgj_measureunit", purchaseEntry.get("unit"));//计量单位 entryEntityNew.set("zcgj_qty", purchaseEntry.get("purchaseqty"));//数量 + entryEntityNew.set("zcgj_incount", purchaseEntry.get("zcgj_incount"));//已入库数量 entryEntityNew.set("zcgj_price", purchaseEntry.get("oftaxprice"));//合同单价(含税) entryEntityNew.set("zcgj_oftaxamt", purchaseEntry.get("oftaxamount"));//本次订单金额(含税) entryEntityNew.set("zcgj_description", purchaseEntry.get("remarks"));//备注