From aadd75ce14cfb855455a4c189a2fb49a2fdffd88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E8=B1=86=E8=B1=86?= <13356128+sunandmoon60@user.noreply.gitee.com> Date: Fri, 28 Nov 2025 17:53:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E8=A1=8C=E9=87=8D=E7=AE=97=E7=8E=B0?= =?UTF-8?q?=E8=BF=94=E8=B4=A7=E8=BF=94=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/pm/PurApplyBillPlugin.java | 1 - .../form/pm/PurSuggestRptFromPlugin.java | 210 +----------------- .../pm/PurorderEntryIntroPaybillPlugin.java | 4 +- 3 files changed, 5 insertions(+), 210 deletions(-) diff --git a/lc123/cloud/app/plugin/form/pm/PurApplyBillPlugin.java b/lc123/cloud/app/plugin/form/pm/PurApplyBillPlugin.java index 935c3ec..84e0279 100644 --- a/lc123/cloud/app/plugin/form/pm/PurApplyBillPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurApplyBillPlugin.java @@ -513,7 +513,6 @@ public class PurApplyBillPlugin extends AbstractBillPlugIn implements Plugin { model.setValue("materialname", tqq9_material.getString("name"), i);//物料名称 model.setValue("unit", tqq9_material.getDynamicObject("baseunit"), i);//计量单位 model.setValue("baseunit", tqq9_material.getDynamicObject("baseunit"), i);//基本单位 - model.setValue("baseunit", tqq9_material.getDynamicObject("baseunit"), i);//基本单位 model.setValue("rowclosestatus", "A", i);//行关闭状态 model.setValue("rowterminatestatus", "A", i);//行终止状态 model.setValue("entrypurog", LCJT, i);//分录采购组织(封存) diff --git a/lc123/cloud/app/plugin/form/pm/PurSuggestRptFromPlugin.java b/lc123/cloud/app/plugin/form/pm/PurSuggestRptFromPlugin.java index 01383cd..51d77d5 100644 --- a/lc123/cloud/app/plugin/form/pm/PurSuggestRptFromPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurSuggestRptFromPlugin.java @@ -150,6 +150,9 @@ public class PurSuggestRptFromPlugin extends AbstractFormPlugin implements Plugi //商城商品 String goodspackagesql = "/*dialect*/select t1.fid tqq9_sku,t1.fk_tqq9_isauto tqq9_isauto,t1.fk_tqq9_mater tqq9_material,t1.fk_tqq9_skuno tqq9_sku_lc,t1.fcreateorgid tqq9_org,\n" + "t1.fk_tqq9_purchaser tqq9_purchaser,t1.fk_tqq9_onsale tqq9_onsale ,t1.fk_tqq9_totalupstock tqq9_totalupstock from tk_tqq9_goodspackage t1 where fstatus ='C' \n"; + //物料 + String materialpackagesql = "/*dialect*/select t1.fid tqq9_sku,t1.fk_tqq9_isauto tqq9_isauto,t1.fk_tqq9_mater tqq9_material,t1.fk_tqq9_skuno tqq9_sku_lc,t1.fcreateorgid tqq9_org,\n" + + "t1.fk_tqq9_purchaser tqq9_purchaser,t1.fk_tqq9_onsale tqq9_onsale ,t1.fk_tqq9_totalupstock tqq9_totalupstock from tk_tqq9_goodspackage t1 where fstatus ='C' \n"; //即时库存表 String realbalancesql = "/*dialect*//*dialect*/select '1' tqq9_isauto,fmaterialid tqq9_material,forgid tqq9_org,sum(case when forgid=" + sh + " then fqty else 0 end) tqq9_shinventory, \n" + "sum(case when forgid=" + bj + " then fqty else 0 end) tqq9_bjinventory,sum(case when forgid=" + gz + " then fqty else 0 end) tqq9_gzinventory,\n" + @@ -211,9 +214,6 @@ public class PurSuggestRptFromPlugin extends AbstractFormPlugin implements Plugi DataSet onorder_shDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), onordersql_sh); DataSet onorder_bjDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), onordersql_bj); DataSet onorder_gzDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), onordersql_gz); -// DataSet range_shDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), range_sh); -// DataSet range_bjDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), range_bj); -// DataSet range_gzDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), range_gz); DataSet rangeDataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("lc"), rangesql); DataSet pendingSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("scm"), pendingsql); goodspackagDataSet = goodspackagDataSet.leftJoin(realbalanceDataSet).on("tqq9_material", "tqq9_material").on("tqq9_isauto", "tqq9_isauto").on("tqq9_org", "tqq9_org").select("tqq9_sku", "tqq9_org", "tqq9_isauto", "tqq9_material", "tqq9_sku_lc", "tqq9_purchaser", "tqq9_onsale", "tqq9_totalupstock", @@ -338,113 +338,6 @@ public class PurSuggestRptFromPlugin extends AbstractFormPlugin implements Plugi param.setCloseCallBack(new CloseCallBack(this, "pm_purapplybill")); param.getOpenStyle().setShowType(ShowType.Modal); this.getView().showForm(param); - //------------------------- -// DynamicObject purapplybill = BusinessDataServiceHelper.newDynamicObject("pm_purapplybill"); -// DynamicObjectCollection dynamicObjectCollection = purapplybill.getDynamicObjectCollection("billentry"); -// -// long currentUserId = UserServiceHelper.getCurrentUserId(); -// DynamicObject user = BusinessDataServiceHelper.loadSingle("bos_user", new QFilter[]{new QFilter("id", QCP.equals, currentUserId)}); -// DynamicObjectCollection entryentity = user.getDynamicObjectCollection("entryentity"); -// DynamicObject dept = null; -// for (DynamicObject dynamicObject : entryentity) { -// boolean ispartjob = dynamicObject.getBoolean("ispartjob"); -// if (!ispartjob) { -// dept = dynamicObject.getDynamicObject("dpt"); -// } -// } -// DynamicObject org = BusinessDataServiceHelper.loadSingle("bos_org", new QFilter[]{new QFilter("name", QCP.equals, "励齿集团")}); -// CodeRuleInfo vouCodeRule = CodeRuleServiceHelper.getCodeRule("pm_purapplybill", -// purapplybill, org.getString("id")); -// String billno = CodeRuleServiceHelper.getNumber(vouCodeRule, purapplybill);//采购申请单编号 -// DynamicObject currency = BusinessDataServiceHelper.loadSingle("bd_currency", -// new QFilter[]{new QFilter("number", QCP.equals, "CNY")});//币别 -// DynamicObject taxrate = BusinessDataServiceHelper.loadSingle("bd_taxrate", -// new QFilter[]{new QFilter("number", QCP.equals, "V13")});//税率 -// Date date = new Date(); -// int i = 0; -// for (DynamicObject dynamicObject : tqq9_pursuggestrptentry) { -// if (dynamicObject.getBoolean("tqq9_ischange")) { -// if (i == 0) { -// purapplybill.set("org", org);//申请组织 -// purapplybill.set("dept", dept);//申请部门 -// purapplybill.set("bizuser", user);//申请人 -// purapplybill.set("currency", currency);//币别 -// purapplybill.set("creator", user);//创建人 -// purapplybill.set("lastupdateuser", user);//修改人 -// purapplybill.set("lastupdatetime", date);//修改时间 -// purapplybill.set("billno", billno);//采购申请单编号 -// purapplybill.set("billtype", BILLTYPE);//单据类型 -// purapplybill.set("biztype", BIZTYPE);//业务类型 -// purapplybill.set("biztime", date);//申请日期 -// purapplybill.set("billstatus", "A");//单据状态 -// purapplybill.set("closestatus", "A");//关闭状态 -// purapplybill.set("cancelstatus", "A");//作废状态 -// purapplybill.set("changestatus", "A");//变更状态 -// purapplybill.set("subversion", "1");//子版本号 -// purapplybill.set("version", "1");//版本号 -// purapplybill.set("tqq9_sfsyhf_sh", "false");//是否使用货返 -// purapplybill.set("tqq9_hshfsysl_sh", taxrate);//含税货返使用税率 -// purapplybill.set("tqq9_sfsyxf_sh", "false");//是否使用现返 -// purapplybill.set("tqq9_hsxfsysl_sh", taxrate);//含税现返使用税率 -// purapplybill.set("tqq9_sfsyhf_bj", "false");//是否使用货返 -// purapplybill.set("tqq9_hshfsysl_bj", taxrate);//含税货返使用税率 -// purapplybill.set("tqq9_sfsyxf_bj", "false");//是否使用现返 -// purapplybill.set("tqq9_hsxfsysl_bj", taxrate);//含税现返使用税率 -// purapplybill.set("tqq9_sfsyhf_gz", "false");//是否使用货返 -// purapplybill.set("tqq9_hshfsysl_gz", taxrate);//含税货返使用税率 -// purapplybill.set("tqq9_sfsyxf_gz", "false");//是否使用现返 -// purapplybill.set("tqq9_hsxfsysl_gz", taxrate);//含税现返使用税率 -// } -// DynamicObject tqq9_org = dynamicObject.getDynamicObject("tqq9_org");//组织 -// DynamicObject tqq9_material = dynamicObject.getDynamicObject("tqq9_material");//物料 -// DynamicObject materialpurchaseinfo = BusinessDataServiceHelper.loadSingle("bd_materialpurchaseinfo", -// new QFilter[]{new QFilter("masterid", QCP.equals, tqq9_material.getLong("id"))});//物料采购信息 -// BigDecimal tqq9_saledates = dynamicObject.getBigDecimal("tqq9_saledates"); -// DynamicObject dynamicObject1 = dynamicObjectCollection.addNew(); -// dynamicObject1.set("seq", i + 1);//分录号 -// dynamicObject1.set("material", materialpurchaseinfo);//物料 -// dynamicObject1.set("materialname", tqq9_material.getString("name"));//物料名称 -// dynamicObject1.set("unit", tqq9_material.getDynamicObject("baseunit"));//计量单位 -// dynamicObject1.set("baseunit", tqq9_material.getDynamicObject("baseunit"));//基本单位 -// dynamicObject1.set("rowclosestatus", "A");//行关闭状态 -// dynamicObject1.set("rowterminatestatus", "A");//行终止状态 -// dynamicObject1.set("entryrecorg", tqq9_org);//收货组织 -// dynamicObject1.set("entryreqorg", tqq9_org);//需求组织 -// dynamicObject1.set("entryreqdept", dept);//需求部门 -// dynamicObject1.set("reqdate", date);//需求日期 -// dynamicObject1.set("purdate", date);//建议采购日期 -// dynamicObject1.set("deliverdate", date);//交货日期 -// dynamicObject1.set("bomtime", date);//展BOM时间 -// dynamicObject1.set("entrychangetype", "B");//变更方式 -// dynamicObject1.set("linetype", LINETYPE);//行类型 -// dynamicObject1.set("linetype", LINETYPE);//行类型 -// dynamicObject1.set("entrycreator", user);//创建人 -// dynamicObject1.set("entryrecdept", tqq9_org);//收货部门 -// dynamicObject1.set("entrypurdept", tqq9_org);//采购部门 -// dynamicObject1.set("entryoperatorgroup", tqq9_org);//采购组 -// dynamicObject1.set("tqq9_expectsaletime", tqq9_saledates);//预计销售时间(月) -// if (StringUtils.equals(tqq9_org.getString("number"), "SHLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_sh"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_sh"));//含税单价 -// } else if (StringUtils.equals(tqq9_org.getString("number"), "BJLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_bj"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_bj"));//含税单价 -// } else if (StringUtils.equals(tqq9_org.getString("number"), "GZLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_gz"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_gz"));//含税单价 -// } -// dynamicObjectCollection.set(i, dynamicObject1); -// i++; -// } -// } -// purapplybill.set("billentry", dynamicObjectCollection); -// SaveServiceHelper.save(new DynamicObject[]{purapplybill}); -// BillShowParameter billShowParameter = new BillShowParameter(); -// billShowParameter.getOpenStyle().setShowType(ShowType.Modal); -// billShowParameter.setFormId("pm_purapplybill"); -// DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(purapplybill.getLong("id"), "pm_purapplybill"); -// billShowParameter.setPkId(dynamicObject.get("id")); -// this.getView().showForm(billShowParameter); } else if (StringUtils.equals("tqq9_pushcgdd", itemKey)) { DynamicObjectCollection tqq9_pursuggestrptentry = dataEntity.getDynamicObjectCollection("tqq9_pursuggestrptentry"); DynamicObject dynamicObject = tqq9_pursuggestrptentry.get(0); @@ -459,103 +352,6 @@ public class PurSuggestRptFromPlugin extends AbstractFormPlugin implements Plugi param.setCloseCallBack(new CloseCallBack(this, "pm_purorderbill")); param.getOpenStyle().setShowType(ShowType.Modal); this.getView().showForm(param); - - //---------------------------- -// DynamicObject pm_purorderbill = BusinessDataServiceHelper.newDynamicObject("pm_purorderbill"); -// DynamicObjectCollection dynamicObjectCollection = pm_purorderbill.getDynamicObjectCollection("billentry"); -// -// long currentUserId = UserServiceHelper.getCurrentUserId(); -// DynamicObject user = BusinessDataServiceHelper.loadSingle("bos_user", new QFilter[]{new QFilter("id", QCP.equals, currentUserId)}); -// DynamicObjectCollection entryentity = user.getDynamicObjectCollection("entryentity"); -// DynamicObject dept = null; -// for (DynamicObject dynamicObject : entryentity) { -// boolean ispartjob = dynamicObject.getBoolean("ispartjob"); -// if (!ispartjob) { -// dept = dynamicObject.getDynamicObject("dpt"); -// } -// } -// DynamicObject dynamicObject2 = tqq9_pursuggestrptentry.get(0); -// DynamicObject org = dynamicObject2.getDynamicObject("tqq9_org");//组织 -// CodeRuleInfo vouCodeRule = CodeRuleServiceHelper.getCodeRule("pm_purorderbill", -// pm_purorderbill, org.getString("id")); -// String billno = String.valueOf(new Date().getTime());//采购申请单编号 -//// String billno = CodeRuleServiceHelper.getNumber(vouCodeRule, pm_purorderbill);//采购申请单编号 -// DynamicObject currency = BusinessDataServiceHelper.loadSingle("bd_currency", -// new QFilter[]{new QFilter("number", QCP.equals, "CNY")});//币别 -// DynamicObject taxrate = BusinessDataServiceHelper.loadSingle("bd_taxrate", -// new QFilter[]{new QFilter("number", QCP.equals, "V13")});//税率 -// Date date = new Date(); -// int i = 0; -// for (DynamicObject dynamicObject : tqq9_pursuggestrptentry) { -// org = dynamicObject2.getDynamicObject("tqq9_org");//组织 -// if (dynamicObject.getBoolean("tqq9_ischange")) { -// if (i == 0) { -// pm_purorderbill.set("org", org);//申请组织 -// pm_purorderbill.set("dept", dept);//申请部门 -// pm_purorderbill.set("currency", currency);//币别 -// pm_purorderbill.set("creator", user);//创建人 -// pm_purorderbill.set("lastupdateuser", user);//修改人 -// pm_purorderbill.set("lastupdatetime", date);//修改时间 -// pm_purorderbill.set("billno", billno);//采购订单编号 -// pm_purorderbill.set("billtype", BILLTYPE1);//单据类型 -// pm_purorderbill.set("biztype", BIZTYPE);//业务类型 -// pm_purorderbill.set("biztime", date);//申请日期 -// pm_purorderbill.set("billstatus", "A");//单据状态 -// pm_purorderbill.set("closestatus", "A");//关闭状态 -// pm_purorderbill.set("cancelstatus", "A");//作废状态 -// pm_purorderbill.set("changestatus", "A");//变更状态 -// pm_purorderbill.set("subversion", "1");//子版本号 -// pm_purorderbill.set("version", "1");//版本号 -// pm_purorderbill.set("tqq9_sfsyhf", "false");//是否使用货返 -// pm_purorderbill.set("tqq9_hshfsysl", taxrate);//含税货返使用税率 -// pm_purorderbill.set("tqq9_sfsyxf", "false");//是否使用现返 -// pm_purorderbill.set("tqq9_hsxfsysl", taxrate);//含税现返使用税率 -// } -// DynamicObject tqq9_material = dynamicObject.getDynamicObject("tqq9_material");//物料 -// DynamicObject materialpurchaseinfo = BusinessDataServiceHelper.loadSingle("bd_materialpurchaseinfo", -// new QFilter[]{new QFilter("masterid", QCP.equals, tqq9_material.getLong("id"))});//物料采购信息 -// BigDecimal tqq9_saledates = dynamicObject.getBigDecimal("tqq9_saledates"); -// DynamicObject dynamicObject1 = dynamicObjectCollection.addNew(); -// dynamicObject1.set("seq", i + 1);//分录号 -// dynamicObject1.set("material", materialpurchaseinfo);//物料 -// dynamicObject1.set("materialname", tqq9_material.getString("name"));//物料名称 -// dynamicObject1.set("unit", tqq9_material.getDynamicObject("baseunit"));//计量单位 -// dynamicObject1.set("baseunit", tqq9_material.getDynamicObject("baseunit"));//基本单位 -// dynamicObject1.set("tqq9_brand", tqq9_material.getDynamicObject("tqq9_brand"));//品牌 -// dynamicObject1.set("rowclosestatus", "A");//行关闭状态 -// dynamicObject1.set("rowterminatestatus", "A");//行终止状态 -// dynamicObject1.set("entryrecorg", org);//收货组织 -// dynamicObject1.set("entryreqorg", org);//需求组织 -// dynamicObject1.set("entryreqdept", dept);//需求部门 -// dynamicObject1.set("deliverdate", date);//交货日期 -// dynamicObject1.set("entrychangetype", "B");//变更方式 -// dynamicObject1.set("linetype", LINETYPE);//行类型 -// dynamicObject1.set("entrycreator", user);//创建人 -// dynamicObject1.set("entryrecdept", org);//收货部门 -// dynamicObject1.set("discounttype", "C");//折扣方式 -// dynamicObject1.set("tqq9_expectsaletime", tqq9_saledates);//预计销售时间(月) -// if (StringUtils.equals(org.getString("number"), "SHLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_sh"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_sh"));//含税单价 -// } else if (StringUtils.equals(org.getString("number"), "BJLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_bj"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_bj"));//含税单价 -// } else if (StringUtils.equals(org.getString("number"), "GZLC")) { -// dynamicObject1.set("tqq9_zgcgxj", tqq9_material.getBigDecimal("tqq9_maxprice_gz"));//最高采购限价 -// dynamicObject1.set("priceandtax", tqq9_material.getBigDecimal("tqq9_maxprice_gz"));//含税单价 -// } -// dynamicObjectCollection.set(i, dynamicObject1); -// i++; -// } -// } -// pm_purorderbill.set("billentry", dynamicObjectCollection); -// SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill}); -// BillShowParameter billShowParameter = new BillShowParameter(); -// billShowParameter.getOpenStyle().setShowType(ShowType.Modal); -// billShowParameter.setFormId("pm_purorderbill"); -// DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(pm_purorderbill.getLong("id"), "pm_purorderbill"); -// billShowParameter.setPkId(dynamicObject.get("id")); -// this.getView().showForm(billShowParameter); } diff --git a/lc123/cloud/app/plugin/form/pm/PurorderEntryIntroPaybillPlugin.java b/lc123/cloud/app/plugin/form/pm/PurorderEntryIntroPaybillPlugin.java index 7e87acf..63e41b0 100644 --- a/lc123/cloud/app/plugin/form/pm/PurorderEntryIntroPaybillPlugin.java +++ b/lc123/cloud/app/plugin/form/pm/PurorderEntryIntroPaybillPlugin.java @@ -269,12 +269,12 @@ public class PurorderEntryIntroPaybillPlugin extends AbstractBillPlugIn imple } JSONObject material = entry.getJSONObject("tqq9_material");//物料 - DynamicObject tqq9_material = BusinessDataServiceHelper.loadSingle(material.getLong("id"),"bd_material","id,taxrate,number,name,baseunit,tqq9_xsyj1,tqq9_amountfield1,tqq9_amountfield4,tqq9_maxprice_sh,tqq9_maxprice_bj,tqq9_maxprice_gz");//物料 + DynamicObject tqq9_material = BusinessDataServiceHelper.loadSingle(material.getLong("id"),"bd_material","id,taxrate,number,name,baseunit,tqq9_xsyj1,tqq9_amountfield1,tqq9_amountfield4,tqq9_maxprice_sh,tqq9_maxprice_bj,tqq9_maxprice_gz,tqq9_brand");//物料 DynamicObject taxrate1 = tqq9_material.getDynamicObject("taxrate"); BigDecimal taxrate2 = BigDecimal.ZERO; if(taxrate1!=null){ taxrate1 = BusinessDataServiceHelper.loadSingle(taxrate1.getPkValue(), taxrate1.getDynamicObjectType().getName()); - taxrate2 = taxrate1.getBigDecimal("taxrate"); + taxrate2 = taxrate1.getBigDecimal("taxrate"); } String number = org.getString("number"); DynamicObject materialpurchaseinfo = BusinessDataServiceHelper.loadSingle("bd_materialpurchaseinfo", new QFilter[]{new QFilter("masterid", QCP.equals, tqq9_material.getLong("id"))});//物料采购信息