From 1fd2fc139f14d346805b7447bad7bc5b31aa1e02 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 29 Aug 2018 20:23:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductConfig/ProductCatalogInfo.jsp | 2 +- .../ProductConfig/ProductViewTree.jsp | 2 +- .../app/als/prd/manager/ProductManager.java | 15 +++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/WebContent/ProductManage/ProductConfig/ProductCatalogInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductCatalogInfo.jsp index 9f2be315a..6d5fa1fb7 100644 --- a/WebContent/ProductManage/ProductConfig/ProductCatalogInfo.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductCatalogInfo.jsp @@ -29,7 +29,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%> function saveRecord(){ var catalogName = getItemValue(0, getRow(), "CatalogName"); if(catalogName != null && catalogName != ""){ - var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","addProductCatalog","catalogName="+catalogName + ",usesrId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"); + var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","addProductCatalog","catalogName="+catalogName + ",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"); if(res == "true"){ alert("新增成功"); }else{ diff --git a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp index 75b73a53a..e3f32b7fa 100644 --- a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp @@ -74,7 +74,7 @@ if(confirm("确定要删除此产品？")){ var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","isCatalog","productID="+typeNo); if(res == "true"){ - var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","deleteCatalog","catalogNo="+typeNo + ",usesrId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"); + var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","deleteCatalog","catalogNo="+typeNo + ",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"); if(res == "true"){ alert("删除成功"); reloadSelf(); diff --git a/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java b/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java index 90b03b19a..1c7934f4c 100644 --- a/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java +++ b/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java @@ -149,6 +149,12 @@ public class ProductManager{ String productNameByID = (bo==null)?"":bo.getAttribute("TYPENAME").getString(); return productNameByID; } + public String getProductCatalogNameByCatalogNo(String catalogNo) throws JBOException{ + BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"TYPENO=:catalogNo") + .setParameter("catalogNo",catalogNo).getSingleResult(false); + String catalogNoByNo = (bo==null)?"":bo.getAttribute("TYPENAME").getString(); + return catalogNoByNo; + } public String addProductDataLog(JBOTransaction tx, String name, String operation, String opNumber, String target, String userId, String orgid, String productName) throws Exception { //增加产品编辑日志 BizObjectManager bomPL = JBOFactory.getBizObjectManager(PRODUCT_LOG.CLASS_NAME, tx); @@ -479,21 +485,21 @@ public class ProductManager{ if(catalog != null) bomanager.deleteBusinessObject(catalog); List btList = bomanager.loadBusinessObjects(BUSINESS_TYPE.CLASS_NAME, "SortNo like :SortNo and TypeNo <> :TypeNo", "SortNo", catalog.getString("SortNo")+"%", "TypeNo", catalogNo); - for(BusinessObject bo : btList){ + for(BusinessObject bo : btList){ String typeNo = bo.getAttribute("typeno").getString(); bomPSL.createQuery("delete from O where businesstype = '" + typeNo + "'").executeUpdate(); bomPS.createQuery("delete from O where prd_id = '" + typeNo + "'").executeUpdate(); bomPN.createQuery("delete from O where prdid = '" + typeNo + "'").executeUpdate(); bomLPI.createQuery("delete from O where product_id = '" + typeNo + "'").executeUpdate(); bomanager.deleteBusinessObject(bo); - + String productName = getProductNameByProductID(typeNo); //增加产品编辑日志 addProductDataLog(tx, typeNo, "D", "D", "data", userId, orgId,productName); } bomanager.updateDB(); - + String catalogName = getProductCatalogNameByCatalogNo(catalogNo); //增加产品编辑日志 - addProductDataLog(tx, catalogNo, "D", "D", "catalog", userId, orgId,productName); + addProductDataLog(tx, catalogNo, "D", "D", "catalog", userId, orgId,catalogName); return "true"; } @@ -586,6 +592,7 @@ public class ProductManager{ //增加产品编辑日志 addProductDataLog(tx, id, "A", "A", "data", userId, orgId,productName); + addProductDataLog(tx, id, "A", "A", "data", userId, orgId,catalogName); return "SUCCESS"; }