1.修改产品操作日志表显示问题。
This commit is contained in:
parent
df9c5eb286
commit
1fd2fc139f
@ -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{
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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<BusinessObject> 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";
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user