diff --git a/lc123/cloud/app/plugin/form/im/OtherOutApplyBillPlugin.java b/lc123/cloud/app/plugin/form/im/OtherOutApplyBillPlugin.java index 7158d55..a6445be 100644 --- a/lc123/cloud/app/plugin/form/im/OtherOutApplyBillPlugin.java +++ b/lc123/cloud/app/plugin/form/im/OtherOutApplyBillPlugin.java @@ -7,64 +7,56 @@ import kd.bos.dataentity.utils.StringUtils; import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.events.ChangeData; import kd.bos.entity.datamodel.events.PropertyChangedArgs; -import kd.bos.form.FormShowParameter; -import kd.bos.form.events.AfterDoOperationEventArgs; import kd.bos.form.field.BasedataEdit; -import kd.bos.form.field.events.BeforeF7SelectEvent; -import kd.bos.form.field.events.BeforeF7SelectListener; -import kd.bos.list.ListShowParameter; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; -import kd.bos.servicehelper.operation.SaveServiceHelper; import java.math.BigDecimal; -import java.util.Date; import java.util.EventObject; -import java.util.HashMap; /** * 其他出库申请界面插件 */ -public class OtherOutApplyBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener { +public class OtherOutApplyBillPlugin extends AbstractBillPlugIn { @Override public void registerListener(EventObject e) { super.registerListener(e); this.addItemClickListeners("tbmain"); BasedataEdit control = this.getControl("tqq9_lot"); - control.addBeforeF7SelectListener(this); +// control.addBeforeF7SelectListener(this); // this.addClickListeners("tqq9_xsddh"); } - /** - * 出库批号根据了做筛选 - */ +// /** +// * 出库批号根据了做筛选 +// */ - @Override - public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { - int index = this.getModel().getEntryCurrentRowIndex("entryentity"); - DynamicObjectCollection entryentity = this.getModel().getDataEntity(true).getDynamicObjectCollection("entryentity"); - DynamicObject dynamicObject = entryentity.get(index); - DynamicObject tqq9_materiel = dynamicObject.getDynamicObject("tqq9_materiel"); - if (tqq9_materiel == null) { - beforeF7SelectEvent.setCancel(true); - this.getView().showMessage("请先填物料信息"); - } else { - DynamicObject materiel = tqq9_materiel.getDynamicObject("masterid");//物料 - Boolean enablelot = tqq9_materiel.getBoolean("enablelot");//是否启用批号管理 - if (enablelot) { - ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - QFilter qF1 = new QFilter("material.number", QCP.equals, materiel.getString("number")); - param.getListFilterParameter().getQFilters().add(qF1); - } else { - beforeF7SelectEvent.setCancel(true); - this.getView().showMessage("该物料未启用批号管理"); - } - - } - } +// @Override +// public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { +// int index = this.getModel().getEntryCurrentRowIndex("entryentity"); +// DynamicObjectCollection entryentity = this.getModel().getDataEntity(true).getDynamicObjectCollection("entryentity"); +// DynamicObject dynamicObject = entryentity.get(index); +// DynamicObject tqq9_materiel = dynamicObject.getDynamicObject("tqq9_materiel"); +// if (tqq9_materiel == null) { +// beforeF7SelectEvent.setCancel(true); +// this.getView().showMessage("请先填物料信息"); +// } else { +// DynamicObject materiel = tqq9_materiel.getDynamicObject("masterid");//物料 +// Boolean enablelot = tqq9_materiel.getBoolean("enablelot");//是否启用批号管理 +// if (enablelot) { +// ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); +// QFilter qF1 = new QFilter("material.number", QCP.equals, materiel.getString("number")); +// param.getListFilterParameter().getQFilters().add(qF1); +// } else { +// beforeF7SelectEvent.setCancel(true); +// this.getView().showMessage("该物料未启用批号管理"); +// } +// +// } +// } /** @@ -126,114 +118,114 @@ public class OtherOutApplyBillPlugin extends AbstractBillPlugIn implements Befor - /** - * 点击退出回传其他出库单编号 - * - * @param afterDoOperationEventArgs - */ - @Override - public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs) { - super.afterDoOperation(afterDoOperationEventArgs); - String itemKey = afterDoOperationEventArgs.getOperateKey(); - if (StringUtils.equals("donothing", itemKey)) { - Object billno = this.getModel().getValue("billno"); - HashMap map = new HashMap<>(); - map.put("billno", billno); - this.getView().returnDataToParent(map); - this.getView().close(); - }else if(StringUtils.equals("submit", itemKey)){ - DynamicObject dataEntity = this.getModel().getDataEntity(true); - DynamicObjectCollection entryentity = dataEntity.getDynamicObjectCollection("entryentity"); - for (DynamicObject dynamicObject : entryentity) { - String tqq9_lotnumber = dynamicObject.getString("tqq9_lotnumber");//批号 - DynamicObject bd_lot= BusinessDataServiceHelper.loadSingle("bd_lot", new QFilter[]{new QFilter("number", QCP.equals, tqq9_lotnumber)}); - dynamicObject.set("tqq9_lot",bd_lot); - SaveServiceHelper.save(new DynamicObject[]{dataEntity}); - this.getView().updateView(); +// /** +// * 点击退出回传其他出库单编号 +// * +// * @param afterDoOperationEventArgs +// */ +// @Override +// public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs) { +// super.afterDoOperation(afterDoOperationEventArgs); +// String itemKey = afterDoOperationEventArgs.getOperateKey(); +// if (StringUtils.equals("donothing", itemKey)) { +// Object billno = this.getModel().getValue("billno"); +// HashMap map = new HashMap<>(); +// map.put("billno", billno); +// this.getView().returnDataToParent(map); +// this.getView().close(); +// }else if(StringUtils.equals("submit", itemKey)){ +// DynamicObject dataEntity = this.getModel().getDataEntity(true); +// DynamicObjectCollection entryentity = dataEntity.getDynamicObjectCollection("entryentity"); +// for (DynamicObject dynamicObject : entryentity) { +// String tqq9_lotnumber = dynamicObject.getString("tqq9_lotnumber");//批号 +// DynamicObject bd_lot= BusinessDataServiceHelper.loadSingle("bd_lot", new QFilter[]{new QFilter("number", QCP.equals, tqq9_lotnumber)}); +// dynamicObject.set("tqq9_lot",bd_lot); +// SaveServiceHelper.save(new DynamicObject[]{dataEntity}); +// this.getView().updateView(); +// +// +// } +// } +// } - } - } - } - - - /** - * 采购退货未异地退货保存跳转到其他出库申请 - */ - @Override - public void afterCreateNewData(EventObject e) { - super.afterCreateNewData(e); - FormShowParameter formShowParameter = this.getView().getFormShowParameter(); - String billno = formShowParameter.getCustomParam("tqq9_otheroutapplybillno"); - if (StringUtils.isNotBlank(billno)) { - DynamicObject pm_purrefundapplybill = BusinessDataServiceHelper.loadSingle("pm_purrefundapplybill", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); - DynamicObject org = pm_purrefundapplybill.getDynamicObject("org");//采购组织 - DynamicObjectCollection billentry = pm_purrefundapplybill.getDynamicObjectCollection("billentry");//采购退货分录 - DynamicObject dataEntity = this.getModel().getDataEntity(true); - //业务类型 - DynamicObject bd_biztype = BusinessDataServiceHelper.loadSingle("bd_biztype", new QFilter[]{new QFilter("number", QCP.equals, "612")}); - dataEntity.set("tqq9_biztype", bd_biztype); - //库存事务 - DynamicObject im_invscheme = BusinessDataServiceHelper.loadSingle("im_invscheme", new QFilter[]{new QFilter("number", QCP.equals, "612.1")}); - dataEntity.set("tqq9_kcsw", im_invscheme); - //业务日期 - Date date = new Date(); - dataEntity.set("tqq9_bizdate", date); - dataEntity.set("tqq9_dblx", "A");//调拨类型 - dataEntity.set("tqq9_dbckfl", "G");//调拨出库分类 - dataEntity.set("org", org);//组织 - dataEntity.set("tqq9_dczz1", org);//调出组织 - dataEntity.set("tqq9_drck2", org);//调入组织 - DynamicObjectCollection entryentity = dataEntity.getDynamicObjectCollection("entryentity"); - entryentity.clear(); - - //库存类型-普通 - DynamicObject bd_invtype = BusinessDataServiceHelper.loadSingle("bd_invtype", new QFilter[]{new QFilter("number", QCP.equals, "110")}); - //库存类型-普通 - DynamicObject bd_invstatus = BusinessDataServiceHelper.loadSingle("bd_invstatus", new QFilter[]{new QFilter("number", QCP.equals, "110")}); - //出库货主类型 - String tqq9_outownertype = "bos_org"; - //出库保管者类型 - String tqq9_outkeepertype = "bos_org"; - for (DynamicObject entry : billentry) { - DynamicObject dynamicObject = entryentity.addNew(); - dynamicObject.set("tqq9_linetype", entry.getDynamicObject("linetype"));//行类型 - DynamicObject material = entry.getDynamicObject("material");//物料采购信息 - if (material != null) { - DynamicObject masterid = material.getDynamicObject("masterid");//物料信息 - //物料库存信息 - DynamicObject bd_materialinventoryinfo = BusinessDataServiceHelper.loadSingle("bd_materialinventoryinfo", new QFilter[]{new QFilter("masterid", QCP.equals, masterid.getLong("id"))}); - //商城商品 - DynamicObject tqq9_goodspackage = BusinessDataServiceHelper.loadSingle("tqq9_goodspackage", new QFilter[]{new QFilter("tqq9_mater.id", QCP.equals, masterid.getLong("id"))}); - dynamicObject.set("tqq9_materiel", bd_materialinventoryinfo);//物料库存信息 - dynamicObject.set("tqq9_goods", tqq9_goodspackage);//商城商品 - dynamicObject.set("tqq9_materialname", masterid.getString("name"));//物料名称 - dynamicObject.set("tqq9_unit", masterid.getDynamicObject("baseunit"));//计量单位 - dynamicObject.set("tqq9_baseunit", masterid.getDynamicObject("baseunit"));//基本单位 - } - dynamicObject.set("tqq9_dczz", org);//调出组织 - dynamicObject.set("tqq9_drzz", org);//调入组织 - dynamicObject.set("tqq9_zczh", entry.getDynamicObject("tqq9_registration"));//注册证号 - dynamicObject.set("tqq9_licenseno", entry.getString("tqq9_licenseno"));//许可证号 - dynamicObject.set("tqq9_producedate", entry.getDate("tqq9_createdate"));//生产日期 - dynamicObject.set("tqq9_expirydate", entry.getDate("tqq9_deadline"));//到期日期 - dynamicObject.set("tqq9_drck", entry.getDynamicObject("tqq9_thck"));//退货仓库 - dataEntity.set("tqq9_basedatafield1", entry.getDynamicObject("tqq9_thck"));//退货仓库 - dynamicObject.set("tqq9_lot", entry.getDynamicObject("tqq9_ph"));//批号 - dynamicObject.set("tqq9_qty", entry.getBigDecimal("qty"));//数量 - dynamicObject.set("tqq9_baseqty", entry.getBigDecimal("qty"));//数量 - dynamicObject.set("tqq9_price", entry.getBigDecimal("price"));//单价 - dynamicObject.set("tqq9_amount", entry.getBigDecimal("amount"));//金额 - dynamicObject.set("tqq9_outinvtype", bd_invtype);//出库库存类型 - dynamicObject.set("tqq9_outinvstatus", bd_invstatus);//出库库存状态 - dynamicObject.set("tqq9_outownertype", tqq9_outownertype);//出库货主类型 - dynamicObject.set("tqq9_outkeepertype", tqq9_outkeepertype);//出库保管者类型 - dynamicObject.set("tqq9_outowner", org);//出库货主 - dynamicObject.set("tqq9_outkeeper", org);//出库保管者 - } - this.getView().setVisible(true, "tqq9_confirm"); - this.getView().setVisible(false, "bar_close"); - } - } +// /** +// * 采购退货未异地退货保存跳转到其他出库申请 +// */ +// @Override +// public void afterCreateNewData(EventObject e) { +// super.afterCreateNewData(e); +// FormShowParameter formShowParameter = this.getView().getFormShowParameter(); +// String billno = formShowParameter.getCustomParam("tqq9_otheroutapplybillno"); +// if (StringUtils.isNotBlank(billno)) { +// DynamicObject pm_purrefundapplybill = BusinessDataServiceHelper.loadSingle("pm_purrefundapplybill", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); +// DynamicObject org = pm_purrefundapplybill.getDynamicObject("org");//采购组织 +// DynamicObjectCollection billentry = pm_purrefundapplybill.getDynamicObjectCollection("billentry");//采购退货分录 +// DynamicObject dataEntity = this.getModel().getDataEntity(true); +// //业务类型 +// DynamicObject bd_biztype = BusinessDataServiceHelper.loadSingle("bd_biztype", new QFilter[]{new QFilter("number", QCP.equals, "612")}); +// dataEntity.set("tqq9_biztype", bd_biztype); +// //库存事务 +// DynamicObject im_invscheme = BusinessDataServiceHelper.loadSingle("im_invscheme", new QFilter[]{new QFilter("number", QCP.equals, "612.1")}); +// dataEntity.set("tqq9_kcsw", im_invscheme); +// //业务日期 +// Date date = new Date(); +// dataEntity.set("tqq9_bizdate", date); +// dataEntity.set("tqq9_dblx", "A");//调拨类型 +// dataEntity.set("tqq9_dbckfl", "G");//调拨出库分类 +// dataEntity.set("org", org);//组织 +// dataEntity.set("tqq9_dczz1", org);//调出组织 +// dataEntity.set("tqq9_drck2", org);//调入组织 +// DynamicObjectCollection entryentity = dataEntity.getDynamicObjectCollection("entryentity"); +// entryentity.clear(); +// +// //库存类型-普通 +// DynamicObject bd_invtype = BusinessDataServiceHelper.loadSingle("bd_invtype", new QFilter[]{new QFilter("number", QCP.equals, "110")}); +// //库存类型-普通 +// DynamicObject bd_invstatus = BusinessDataServiceHelper.loadSingle("bd_invstatus", new QFilter[]{new QFilter("number", QCP.equals, "110")}); +// //出库货主类型 +// String tqq9_outownertype = "bos_org"; +// //出库保管者类型 +// String tqq9_outkeepertype = "bos_org"; +// for (DynamicObject entry : billentry) { +// DynamicObject dynamicObject = entryentity.addNew(); +// dynamicObject.set("tqq9_linetype", entry.getDynamicObject("linetype"));//行类型 +// DynamicObject material = entry.getDynamicObject("material");//物料采购信息 +// if (material != null) { +// DynamicObject masterid = material.getDynamicObject("masterid");//物料信息 +// //物料库存信息 +// DynamicObject bd_materialinventoryinfo = BusinessDataServiceHelper.loadSingle("bd_materialinventoryinfo", new QFilter[]{new QFilter("masterid", QCP.equals, masterid.getLong("id"))}); +// //商城商品 +// DynamicObject tqq9_goodspackage = BusinessDataServiceHelper.loadSingle("tqq9_goodspackage", new QFilter[]{new QFilter("tqq9_mater.id", QCP.equals, masterid.getLong("id"))}); +// dynamicObject.set("tqq9_materiel", bd_materialinventoryinfo);//物料库存信息 +// dynamicObject.set("tqq9_goods", tqq9_goodspackage);//商城商品 +// dynamicObject.set("tqq9_materialname", masterid.getString("name"));//物料名称 +// dynamicObject.set("tqq9_unit", masterid.getDynamicObject("baseunit"));//计量单位 +// dynamicObject.set("tqq9_baseunit", masterid.getDynamicObject("baseunit"));//基本单位 +// } +// dynamicObject.set("tqq9_dczz", org);//调出组织 +// dynamicObject.set("tqq9_drzz", org);//调入组织 +// dynamicObject.set("tqq9_zczh", entry.getDynamicObject("tqq9_registration"));//注册证号 +// dynamicObject.set("tqq9_licenseno", entry.getString("tqq9_licenseno"));//许可证号 +// dynamicObject.set("tqq9_producedate", entry.getDate("tqq9_createdate"));//生产日期 +// dynamicObject.set("tqq9_expirydate", entry.getDate("tqq9_deadline"));//到期日期 +// dynamicObject.set("tqq9_drck", entry.getDynamicObject("tqq9_thck"));//退货仓库 +// dataEntity.set("tqq9_basedatafield1", entry.getDynamicObject("tqq9_thck"));//退货仓库 +// dynamicObject.set("tqq9_lot", entry.getDynamicObject("tqq9_ph"));//批号 +// dynamicObject.set("tqq9_qty", entry.getBigDecimal("qty"));//数量 +// dynamicObject.set("tqq9_baseqty", entry.getBigDecimal("qty"));//数量 +// dynamicObject.set("tqq9_price", entry.getBigDecimal("price"));//单价 +// dynamicObject.set("tqq9_amount", entry.getBigDecimal("amount"));//金额 +// dynamicObject.set("tqq9_outinvtype", bd_invtype);//出库库存类型 +// dynamicObject.set("tqq9_outinvstatus", bd_invstatus);//出库库存状态 +// dynamicObject.set("tqq9_outownertype", tqq9_outownertype);//出库货主类型 +// dynamicObject.set("tqq9_outkeepertype", tqq9_outkeepertype);//出库保管者类型 +// dynamicObject.set("tqq9_outowner", org);//出库货主 +// dynamicObject.set("tqq9_outkeeper", org);//出库保管者 +// } +// this.getView().setVisible(true, "tqq9_confirm"); +// this.getView().setVisible(false, "bar_close"); +// } +// } } \ No newline at end of file diff --git a/lc123/cloud/app/plugin/form/pm/PurOrderCloseBillPlugin.java b/lc123/cloud/app/plugin/form/pm/PurOrderCloseBillPlugin.java index 1dcd207..d321604 100644 --- a/lc123/cloud/app/plugin/form/pm/PurOrderCloseBillPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurOrderCloseBillPlugin.java @@ -1,32 +1,21 @@ package tqq9.lc123.cloud.app.plugin.form.pm; -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; import kd.bos.bill.AbstractBillPlugIn; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.utils.StringUtils; -import kd.bos.form.ConfirmCallBackListener; -import kd.bos.form.ConfirmTypes; -import kd.bos.form.MessageBoxOptions; -import kd.bos.form.MessageBoxResult; -import kd.bos.form.control.events.ItemClickEvent; -import kd.bos.form.events.MessageBoxClosedEvent; +import kd.bos.entity.operate.result.OperationResult; +import kd.bos.form.events.AfterDoOperationEventArgs; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.sdk.plugin.Plugin; -import tqq9.lc123.cloud.app.plugin.utils.HttpRequestUtils; -import java.io.IOException; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.EventObject; -import java.util.HashMap; /** - * 单据界面插件 + * 采购订单关闭推送返利系统 */ public class PurOrderCloseBillPlugin extends AbstractBillPlugIn implements Plugin { private final static Log logger = LogFactory.getLog(PurOrderCloseBillPlugin.class); @@ -47,77 +36,90 @@ public class PurOrderCloseBillPlugin extends AbstractBillPlugIn implements Plugi FLXT_TOKEN = token != null ? token.getString("name") : null; } - @Override - public void itemClick(ItemClickEvent evt) { - super.itemClick(evt); - String itemKey = evt.getItemKey(); - DynamicObject dataEntity = this.getModel().getDataEntity(); - Boolean tqq9_isrebatecalculate = dataEntity.getBoolean("tqq9_isrebatecalculate");//是否使用返利 - if (StringUtils.equals("close", itemKey)&& tqq9_isrebatecalculate) { - ConfirmCallBackListener confirmCallBacks = new ConfirmCallBackListener("isrebate", this); - // 设置回调提示 - String confirmTip = "关闭时是否释放返利金额"; - this.getView().showConfirm(confirmTip, MessageBoxOptions.OKCancel, ConfirmTypes.Default, confirmCallBacks); - } +// @Override +// public void itemClick(ItemClickEvent evt) { +// super.itemClick(evt); +// String itemKey = evt.getItemKey(); +// DynamicObject dataEntity = this.getModel().getDataEntity(); +// Boolean tqq9_isrebatecalculate = dataEntity.getBoolean("tqq9_isrebatecalculate");//是否使用返利 +// if (StringUtils.equals("close", itemKey)&& tqq9_isrebatecalculate) { +// ConfirmCallBackListener confirmCallBacks = new ConfirmCallBackListener("isrebate", this); +// // 设置回调提示 +// String confirmTip = "关闭时是否释放返利金额"; +// this.getView().showConfirm(confirmTip, MessageBoxOptions.OKCancel, ConfirmTypes.Default, confirmCallBacks); +// } +// +// } - } @Override - public void confirmCallBack(MessageBoxClosedEvent messageBoxClosedEvent) { - // 回调标识正确，并且点击了确认 - if (StringUtils.equals(messageBoxClosedEvent.getCallBackId(), "isrebate") && messageBoxClosedEvent.getResult() == MessageBoxResult.Yes) { - DynamicObject dataEntity = this.getModel().getDataEntity(); - // todo 在此添加业务逻辑 - BigDecimal tqq9_hshfsyje = dataEntity.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额 - BigDecimal tqq9_hsxfsyje = dataEntity.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额 - String tqq9_hfid = dataEntity.getString("tqq9_hfid");//货返id - String tqq9_xfid = dataEntity.getString("tqq9_xfid");//现返id - String billno = dataEntity.getString("tqqbillno9_xfid");//单据编号 - BigDecimal oneHundred = new BigDecimal(100); - HashMap tokenMap = new HashMap(); - tokenMap.put("Authorization", FLXT_TOKEN); + public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs) { + super.afterDoOperation(afterDoOperationEventArgs); + String operateKey = afterDoOperationEventArgs.getOperateKey(); + OperationResult operationResult = afterDoOperationEventArgs.getOperationResult(); + if(StringUtils.equals("bizclose",operateKey)&&operationResult.isSuccess()){ +// afterDoOperationEventArgs.getSource() + - if (tqq9_hshfsyje.compareTo(BigDecimal.ZERO) > 0) { - BigDecimal notaxamount = tqq9_hshfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP); - BigDecimal taxamount = tqq9_hshfsyje.subtract(notaxamount);//税额 - JSONObject bodyMap = new JSONObject(); - bodyMap.put("id", tqq9_hfid); - bodyMap.put("lockMoney", tqq9_hshfsyje); - bodyMap.put("lockTaxAmount", taxamount); - Gson gson = new Gson(); - try { - String bodyString = HttpRequestUtils.postJson(URL ,bodyMap.toString(), tokenMap); - HashMap map = gson.fromJson(bodyString, HashMap.class); - Boolean data = (Boolean) map.get("data"); - if (!data) { - this.getView().showErrorNotification("采购订单:" + billno + ",释放返利金额成功"); - } - } catch (IOException ex) { - throw new RuntimeException(ex); - } - //现返审核 - } else if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0) { - BigDecimal notaxamount = tqq9_hsxfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP); - BigDecimal taxamount = tqq9_hsxfsyje.subtract(notaxamount);//税额 - JSONObject bodyMap = new JSONObject(); - bodyMap.put("id", tqq9_xfid); - bodyMap.put("lockMoney", tqq9_hsxfsyje); - bodyMap.put("lockTaxAmount", taxamount); - Gson gson = new Gson(); - try { - String bodyString = HttpRequestUtils.postJson(URL, bodyMap.toString(), tokenMap); - HashMap map = gson.fromJson(bodyString, HashMap.class); - Boolean data = (Boolean) map.get("data"); - if (!data) { - this.getView().showErrorNotification("采购订单:" + billno + ",释放返利金额成功"); - } - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } -// this.getView().showSuccessNotification("confirm call back success"); } - - } + +// @Override +// public void confirmCallBack(MessageBoxClosedEvent messageBoxClosedEvent) { +// // 回调标识正确，并且点击了确认 +// if (StringUtils.equals(messageBoxClosedEvent.getCallBackId(), "isrebate") && messageBoxClosedEvent.getResult() == MessageBoxResult.Yes) { +// DynamicObject dataEntity = this.getModel().getDataEntity(); +// // todo 在此添加业务逻辑 +// BigDecimal tqq9_hshfsyje = dataEntity.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额 +// BigDecimal tqq9_hsxfsyje = dataEntity.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额 +// String tqq9_hfid = dataEntity.getString("tqq9_hfid");//货返id +// String tqq9_xfid = dataEntity.getString("tqq9_xfid");//现返id +// String billno = dataEntity.getString("tqqbillno9_xfid");//单据编号 +// BigDecimal oneHundred = new BigDecimal(100); +// HashMap tokenMap = new HashMap(); +// tokenMap.put("Authorization", FLXT_TOKEN); +// +// if (tqq9_hshfsyje.compareTo(BigDecimal.ZERO) > 0) { +// BigDecimal notaxamount = tqq9_hshfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP); +// BigDecimal taxamount = tqq9_hshfsyje.subtract(notaxamount);//税额 +// JSONObject bodyMap = new JSONObject(); +// bodyMap.put("id", tqq9_hfid); +// bodyMap.put("lockMoney", tqq9_hshfsyje); +// bodyMap.put("lockTaxAmount", taxamount); +// Gson gson = new Gson(); +// try { +// String bodyString = HttpRequestUtils.postJson(URL ,bodyMap.toString(), tokenMap); +// HashMap map = gson.fromJson(bodyString, HashMap.class); +// Boolean data = (Boolean) map.get("data"); +// if (!data) { +// this.getView().showErrorNotification("采购订单:" + billno + ",释放返利金额成功"); +// } +// } catch (IOException ex) { +// throw new RuntimeException(ex); +// } +// //现返审核 +// } else if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0) { +// BigDecimal notaxamount = tqq9_hsxfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP); +// BigDecimal taxamount = tqq9_hsxfsyje.subtract(notaxamount);//税额 +// JSONObject bodyMap = new JSONObject(); +// bodyMap.put("id", tqq9_xfid); +// bodyMap.put("lockMoney", tqq9_hsxfsyje); +// bodyMap.put("lockTaxAmount", taxamount); +// Gson gson = new Gson(); +// try { +// String bodyString = HttpRequestUtils.postJson(URL, bodyMap.toString(), tokenMap); +// HashMap map = gson.fromJson(bodyString, HashMap.class); +// Boolean data = (Boolean) map.get("data"); +// if (!data) { +// this.getView().showErrorNotification("采购订单:" + billno + ",释放返利金额成功"); +// } +// } catch (IOException ex) { +// throw new RuntimeException(ex); +// } +// } +//// this.getView().showSuccessNotification("confirm call back success"); +// } +// +// +// } } \ No newline at end of file diff --git a/lc123/cloud/app/plugin/form/pm/PurRefundApplyBillPlugin.java b/lc123/cloud/app/plugin/form/pm/PurRefundApplyBillPlugin.java index 599d842..24ca98d 100644 --- a/lc123/cloud/app/plugin/form/pm/PurRefundApplyBillPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurRefundApplyBillPlugin.java @@ -1,45 +1,16 @@ package tqq9.lc123.cloud.app.plugin.form.pm; -import kd.bos.algo.DataSet; import kd.bos.bill.AbstractBillPlugIn; -import kd.bos.bill.BillShowParameter; -import kd.bos.dataentity.OperateOption; -import kd.bos.dataentity.entity.DynamicObject; -import kd.bos.dataentity.entity.DynamicObjectCollection; -import kd.bos.dataentity.utils.StringUtils; -import kd.bos.db.DB; -import kd.bos.db.DBRoute; -import kd.bos.entity.datamodel.IDataModel; -import kd.bos.entity.datamodel.events.ChangeData; -import kd.bos.entity.datamodel.events.PropertyChangedArgs; -import kd.bos.entity.operate.result.OperationResult; -import kd.bos.form.CloseCallBack; -import kd.bos.form.ShowType; -import kd.bos.form.events.BeforeDoOperationEventArgs; -import kd.bos.form.events.ClosedCallBackEvent; import kd.bos.form.field.BasedataEdit; -import kd.bos.form.field.events.BeforeF7SelectEvent; -import kd.bos.form.field.events.BeforeF7SelectListener; -import kd.bos.form.operate.FormOperate; -import kd.bos.list.ListShowParameter; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; -import kd.bos.orm.ORM; -import kd.bos.orm.query.QCP; -import kd.bos.orm.query.QFilter; -import kd.bos.servicehelper.BusinessDataServiceHelper; -import kd.bos.servicehelper.operation.OperationServiceHelper; -import kd.bos.servicehelper.operation.SaveServiceHelper; -import tqq9.lc123.cloud.app.api.utils.Constants; -import java.math.BigDecimal; import java.util.EventObject; -import java.util.HashMap; /** * 采购退货界面插件 */ -public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener { +public class PurRefundApplyBillPlugin extends AbstractBillPlugIn { private final static Log logger = LogFactory.getLog(PurorderEntryIntroPaybillPlugin.class); @Override @@ -47,126 +18,125 @@ public class PurRefundApplyBillPlugin extends AbstractBillPlugIn implements Befo super.registerListener(e); this.addItemClickListeners("tbmain"); BasedataEdit tqq9_ph = this.getControl("tqq9_ph"); - tqq9_ph.addBeforeF7SelectListener(this); +// tqq9_ph.addBeforeF7SelectListener(this); } - @Override - public void closedCallBack(ClosedCallBackEvent closedCallBackEvent) { - super.closedCallBack(closedCallBackEvent); - String actionId = closedCallBackEvent.getActionId(); - Object returnData = closedCallBackEvent.getReturnData(); - if (StringUtils.equals("tqq9_otheroutapply", actionId) && returnData != null) { - String billno = ((HashMap) returnData).get("billno").toString(); - DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); - this.getModel().setValue("tqq9_yythbillno", tqq9_otheroutapply); - SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity(true)}); - this.getView().updateView(); - } - } +// @Override +// public void closedCallBack(ClosedCallBackEvent closedCallBackEvent) { +// super.closedCallBack(closedCallBackEvent); +// String actionId = closedCallBackEvent.getActionId(); +// Object returnData = closedCallBackEvent.getReturnData(); +// if (StringUtils.equals("tqq9_otheroutapply", actionId) && returnData != null) { +// String billno = ((HashMap) returnData).get("billno").toString(); +// DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); +// this.getModel().setValue("tqq9_yythbillno", tqq9_otheroutapply); +// SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity(true)}); +// this.getView().updateView(); +// } +// } - /** - * 异地退货返回事件 - */ +// /** +// * 异地退货返回事件 +// */ +// +// +// @Override +// public void beforeDoOperation(BeforeDoOperationEventArgs args) { +// super.beforeDoOperation(args); +// FormOperate Operate = (FormOperate) args.getSource(); +// Boolean tqq9_isydth = (Boolean) this.getModel().getValue("tqq9_isydth");//是否异地退货 +// DynamicObject tqq9_yythbillno = (DynamicObject) this.getModel().getValue("tqq9_yythbillno");//异地退货单号 +// String tqq9_ydthno = null; +// if (tqq9_yythbillno != null) { +// tqq9_ydthno = tqq9_yythbillno.getString("billno"); +// } +// if (StringUtils.equals("save", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isBlank(tqq9_ydthno)) { +// BillShowParameter param = new BillShowParameter(); +// param.setFormId("tqq9_otheroutapply"); +// param.setCustomParam("tqq9_otheroutapplybillno", this.getModel().getValue("billno"));//采购退货申请单号 +// param.setCloseCallBack(new CloseCallBack(this, "tqq9_otheroutapply")); +// param.getOpenStyle().setShowType(ShowType.Modal); +// this.getView().showForm(param); +// } else if (StringUtils.equals("submit", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isNotBlank(tqq9_ydthno)) { +// DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, tqq9_ydthno)}); +// if (StringUtils.equals(tqq9_otheroutapply.getString("billstatus"), "A")) { +// args.setCancel(true); +// String billno = this.getModel().getValue("billno").toString(); +// this.getView().showErrorNotification("采购退货单:" + billno + ",对应的异地退货单号：" + tqq9_ydthno + "未提交"); +// } +// } else if (StringUtils.equals("audit", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isNotBlank(tqq9_ydthno)) { +// DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, tqq9_ydthno)}); +// String billstatus = tqq9_otheroutapply.getString("billstatus"); +// if (StringUtils.equals("B", billstatus)) { +// OperateOption operateOption = OperateOption.create(); +// OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, "tqq9_otheroutapply", new DynamicObject[]{tqq9_otheroutapply}, operateOption); +// if (auditResult.isSuccess()) { +// this.getView().showMessage("异地退货审核成功"); +// } +// } +// } +// } - @Override - public void beforeDoOperation(BeforeDoOperationEventArgs args) { - super.beforeDoOperation(args); - FormOperate Operate = (FormOperate) args.getSource(); - Boolean tqq9_isydth = (Boolean) this.getModel().getValue("tqq9_isydth");//是否异地退货 - DynamicObject tqq9_yythbillno = (DynamicObject) this.getModel().getValue("tqq9_yythbillno");//异地退货单号 - String tqq9_ydthno = null; - if (tqq9_yythbillno != null) { - tqq9_ydthno = tqq9_yythbillno.getString("billno"); - } - if (StringUtils.equals("save", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isBlank(tqq9_ydthno)) { - BillShowParameter param = new BillShowParameter(); - param.setFormId("tqq9_otheroutapply"); - param.setCustomParam("tqq9_otheroutapplybillno", this.getModel().getValue("billno"));//采购退货申请单号 - param.setCloseCallBack(new CloseCallBack(this, "tqq9_otheroutapply")); - param.getOpenStyle().setShowType(ShowType.Modal); - this.getView().showForm(param); - } else if (StringUtils.equals("submit", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isNotBlank(tqq9_ydthno)) { - DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, tqq9_ydthno)}); - if (StringUtils.equals(tqq9_otheroutapply.getString("billstatus"), "A")) { - args.setCancel(true); - String billno = this.getModel().getValue("billno").toString(); - this.getView().showErrorNotification("采购退货单:" + billno + ",对应的异地退货单号：" + tqq9_ydthno + "未提交"); - } - } else if (StringUtils.equals("audit", Operate.getOperateKey()) && tqq9_isydth && StringUtils.isNotBlank(tqq9_ydthno)) { - DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle("tqq9_otheroutapply", new QFilter[]{new QFilter("billno", QCP.equals, tqq9_ydthno)}); - String billstatus = tqq9_otheroutapply.getString("billstatus"); - if (StringUtils.equals("B", billstatus)) { - OperateOption operateOption = OperateOption.create(); - OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, "tqq9_otheroutapply", new DynamicObject[]{tqq9_otheroutapply}, operateOption); - if (auditResult.isSuccess()) { - this.getView().showMessage("异地退货审核成功"); - } - } - } - } +// /** +// * 出库批号根据了做筛选 +// */ +// +// @Override +// public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { +// String name = beforeF7SelectEvent.getProperty().getName(); +// if (StringUtils.equals("tqq9_ph", name)) { +// int index = this.getModel().getEntryCurrentRowIndex("billentry"); +// DynamicObjectCollection entryentity = this.getModel().getDataEntity(true).getDynamicObjectCollection("billentry"); +// DynamicObject dynamicObject = entryentity.get(index); +// DynamicObject material = dynamicObject.getDynamicObject("material");//物料采购信息 +// if (material == null) { +// beforeF7SelectEvent.setCancel(true); +// this.getView().showMessage("请先填物料信息"); +// } else { +// DynamicObject masterid = material.getDynamicObject("masterid");//物料 +// DynamicObject bd_materialinventoryinfo = BusinessDataServiceHelper.loadSingle("bd_materialinventoryinfo", new QFilter[]{new QFilter("masterid", QCP.equals, masterid.getLong("id"))}); +// +// Boolean enablelot = bd_materialinventoryinfo.getBoolean("enablelot");//是否启用批号管理 +// if (enablelot) { +// ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); +// QFilter qF1 = new QFilter("material.number", QCP.equals, masterid.getString("number")); +// param.getListFilterParameter().getQFilters().add(qF1); +// +// } else { +// beforeF7SelectEvent.setCancel(true); +// this.getView().showMessage("该物料未启用批号管理"); +// } +// } +// } +// } - - /** - * 出库批号根据了做筛选 - */ - - @Override - public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { - String name = beforeF7SelectEvent.getProperty().getName(); - if (StringUtils.equals("tqq9_ph", name)) { - int index = this.getModel().getEntryCurrentRowIndex("billentry"); - DynamicObjectCollection entryentity = this.getModel().getDataEntity(true).getDynamicObjectCollection("billentry"); - DynamicObject dynamicObject = entryentity.get(index); - DynamicObject material = dynamicObject.getDynamicObject("material");//物料采购信息 - if (material == null) { - beforeF7SelectEvent.setCancel(true); - this.getView().showMessage("请先填物料信息"); - } else { - DynamicObject masterid = material.getDynamicObject("masterid");//物料 - DynamicObject bd_materialinventoryinfo = BusinessDataServiceHelper.loadSingle("bd_materialinventoryinfo", new QFilter[]{new QFilter("masterid", QCP.equals, masterid.getLong("id"))}); - - Boolean enablelot = bd_materialinventoryinfo.getBoolean("enablelot");//是否启用批号管理 - if (enablelot) { - ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - QFilter qF1 = new QFilter("material.number", QCP.equals, masterid.getString("number")); - param.getListFilterParameter().getQFilters().add(qF1); - - } else { - beforeF7SelectEvent.setCancel(true); - this.getView().showMessage("该物料未启用批号管理"); - } - } - } - } - - @Override - public void propertyChanged(PropertyChangedArgs e) { - super.propertyChanged(e); - String name = e.getProperty().getName(); - if (StringUtils.equals("tqq9_ph", name)) { - ChangeData changeData = e.getChangeSet()[0]; - int rowIndex = changeData.getRowIndex(); - IDataModel model = this.getModel(); - DynamicObject material = (DynamicObject) model.getValue("material", rowIndex);//物料采购信息 - DynamicObject tqq9_ph = (DynamicObject) model.getValue("tqq9_ph", rowIndex);//批号 - if (material != null && tqq9_ph != null) { - DynamicObject masterid = material.getDynamicObject("masterid");//物料 - if (masterid != null) { - String id = masterid.getString("id"); - String tqq9_phno = tqq9_ph.getString("number");//批号 - String sql = "/*dialect*/ select sum(fbaseqty) useqty from t_im_inv_realbalance where fmaterialid ='" + id + "' and flotnum ='" + tqq9_phno + "'"; - DataSet pzDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("scm"), sql); - DataSet copy = pzDataSet.copy(); - DynamicObjectCollection dynamicObjects = ORM.create().toPlainDynamicObjectCollection(copy); - if (dynamicObjects.size() > 0) { - BigDecimal useqty = dynamicObjects.get(0).getBigDecimal("useqty"); - model.setValue("tqq9_pckyamount", useqty, rowIndex); - this.getView().updateView(); - } - } - - } - } - } +// @Override +// public void propertyChanged(PropertyChangedArgs e) { +// super.propertyChanged(e); +// String name = e.getProperty().getName(); +// if (StringUtils.equals("tqq9_ph", name)) { +// ChangeData changeData = e.getChangeSet()[0]; +// int rowIndex = changeData.getRowIndex(); +// IDataModel model = this.getModel(); +// DynamicObject material = (DynamicObject) model.getValue("material", rowIndex);//物料采购信息 +// DynamicObject tqq9_ph = (DynamicObject) model.getValue("tqq9_ph", rowIndex);//批号 +// if (material != null && tqq9_ph != null) { +// DynamicObject masterid = material.getDynamicObject("masterid");//物料 +// if (masterid != null) { +// String id = masterid.getString("id"); +// String tqq9_phno = tqq9_ph.getString("number");//批号 +// String sql = "/*dialect*/ select sum(fbaseqty) useqty from t_im_inv_realbalance where fmaterialid ='" + id + "' and flotnum ='" + tqq9_phno + "'"; +// DataSet pzDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("scm"), sql); +// DataSet copy = pzDataSet.copy(); +// DynamicObjectCollection dynamicObjects = ORM.create().toPlainDynamicObjectCollection(copy); +// if (dynamicObjects.size() > 0) { +// BigDecimal useqty = dynamicObjects.get(0).getBigDecimal("useqty"); +// model.setValue("tqq9_pckyamount", useqty, rowIndex); +// this.getView().updateView(); +// } +// } +// } +// } +// } } \ No newline at end of file diff --git a/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java index 96c375c..af72ed9 100644 --- a/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java +++ b/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java @@ -166,7 +166,7 @@ public class SaleOutBillConvertPlugin extends AbstractConvertPlugIn implements P billentry_lk.clear(); BigDecimal amount = entry.getBigDecimal("amount");//金额 BigDecimal taxamount = entry.getBigDecimal("taxamount");//税额 - BigDecimal amountandtax = entry.getBigDecimal("amountandtax");//税额 + BigDecimal amountandtax = entry.getBigDecimal("amountandtax");//价税合计 amount=amount.multiply(quantity).divide(qty); taxamount=taxamount.multiply(quantity).divide(qty); amountandtax=amountandtax.multiply(quantity).divide(qty); diff --git a/lc123/cloud/app/plugin/operate/pm/PurOrderBillRebatePlugin.java b/lc123/cloud/app/plugin/operate/pm/PurOrderBillRebatePlugin.java index b0fc800..515545a 100644 --- a/lc123/cloud/app/plugin/operate/pm/PurOrderBillRebatePlugin.java +++ b/lc123/cloud/app/plugin/operate/pm/PurOrderBillRebatePlugin.java @@ -150,7 +150,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",保存时占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -181,7 +181,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",保存时占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -236,7 +236,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",保存时占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -265,7 +265,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, false, queryMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时撤销占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",撤销占用金额失败"); } else { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, true, queryMap.toString(), bodyString); } @@ -291,7 +291,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",保存时占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -340,7 +340,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, false, queryMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时撤销占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",撤销占用金额失败"); } else { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, true, queryMap.toString(), bodyString); } @@ -368,7 +368,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, false, queryMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时撤销占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",撤销占用金额失败"); } else { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, true, queryMap.toString(), bodyString); } @@ -417,7 +417,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, false, queryMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时撤销占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",撤销占用金额失败"); } else { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, true, queryMap.toString(), bodyString); } @@ -449,7 +449,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时占用原返利金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用原返利金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -478,7 +478,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, false, queryMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时撤销占用金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",撤销占用金额失败"); } else { lcLogService.savelog("FL-解锁返利金额", Cancel_URL, false, true, queryMap.toString(), bodyString); } @@ -510,7 +510,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp lcLogService.savelog("FL-锁定返利金额", Create_URL, true, true, bodyMap.toString(), bodyString); } else { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",删除时占用原返利金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",占用原返利金额失败"); } } catch (IOException ex) { lcLogService.savelog("FL-锁定返利金额", Create_URL, true, false, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); @@ -561,7 +561,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",审核时扣除订单金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",扣除订单金额失败"); } else { dataEntity.set("tqq9_isrebatecalculate", true); lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString); @@ -590,7 +590,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp Boolean data = map.getBoolean("data"); if (data == null || !data) { lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString); - this.getOperationResult().setMessage("采购订单:" + billno + ",审核时扣除订单金额失败"); + this.getOperationResult().setMessage("采购订单:" + billno + ",扣除订单金额失败"); } else { dataEntity.set("tqq9_isrebatecalculate", true); lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString);