diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class index ed151b8e..14df813b 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class index 6dae146f..acda4b54 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class index 861a0a0b..5e86e83f 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/VisitAccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/VisitAccountAction.class deleted file mode 100644 index 5bb75485..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/VisitAccountAction.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class index d5d145cd..ef1d51d1 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class b/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class index ec96dce3..f77afd36 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class and b/WebRoot/WEB-INF/classes/com/jsh/base/BaseDAO.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountDAO.class deleted file mode 100644 index ef02a03f..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountDAO.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountIDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountIDAO.class deleted file mode 100644 index 255ffb96..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountIDAO.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.class index 91735dc3..47082cb2 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.class and b/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml index 19a0d8e8..4b947e83 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml @@ -1,39 +1,59 @@ - - - - - - - - - - - - - - 名称 - - - - - 型号 - - - - - 颜色 - - - - - 单位 - - - - - 备注 - - - - + + + + + + + + + + + + + + 名称 + + + + + 型号 + + + + + 颜色 + + + + + 单位 + + + + + 零售价 + + + + + 最低售价 + + + + + 预设售价一 + + + + + 预设售价二 + + + + + 备注 + + + + diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.class index 652c71c5..18f3f212 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.class and b/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml index f08bf17d..c4410ec7 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml @@ -1,49 +1,69 @@ - - - - - - - - - - - 供应商名称 - - - - - 类型 - - - - - 联系人 - - - - - 联系电话 - - - - - 电子邮箱 - - - - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 启用 - - - - \ No newline at end of file + + + + + + + + + + + 供应商名称 + + + + + 类型 + + + + + 联系人 + + + + + 联系电话 + + + + + 电子邮箱 + + + + + 期初应收 + + + + + 期初应付 + + + + + 累计应收 + + + + + 累计应付 + + + + + + + + 是否系统自带 0==系统 1==非系统 + + + + + 启用 + + + + diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.class deleted file mode 100644 index 9ea7bf58..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.hbm.xml deleted file mode 100644 index fb1bfab5..00000000 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.hbm.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - 楼号 - - - - - 户号 - - - - - 回访情况 - - - - - 落实情况 - - - - - 住户姓名 - - - - - 电话 - - - - - 时间 - - - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/SupplierModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/SupplierModel.class index dc865b6f..23d269a9 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/SupplierModel.class and b/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/SupplierModel.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountModel.class deleted file mode 100644 index a3ccb9de..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountModel.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountShowModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountShowModel.class deleted file mode 100644 index 358d1083..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountShowModel.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/MaterialModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/MaterialModel.class index bae6887c..d523944b 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/MaterialModel.class and b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/MaterialModel.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountIService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountIService.class deleted file mode 100644 index 0cf8fca1..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountIService.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountService.class deleted file mode 100644 index dcadb735..00000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountService.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml b/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml index 3b9d97da..f81441d0 100644 --- a/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml +++ b/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml @@ -33,7 +33,6 @@ - diff --git a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml index 98711663..cfe6e2f1 100644 --- a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml @@ -238,18 +238,6 @@ - - - - - - - - - - - - @@ -262,7 +250,7 @@ - + @@ -272,9 +260,9 @@ - + - + @@ -284,7 +272,7 @@ - + diff --git a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml index cdd3f46d..39317180 100644 --- a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml @@ -34,8 +34,6 @@ - - diff --git a/WebRoot/WEB-INF/classes/struts2/visitAccount-struts.xml b/WebRoot/WEB-INF/classes/struts2/visitAccount-struts.xml deleted file mode 100644 index 8f9046dd..00000000 --- a/WebRoot/WEB-INF/classes/struts2/visitAccount-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/WebRoot/js/HoorayOS_mini/img/wallpaper/wallpaper.jpg b/WebRoot/js/HoorayOS_mini/img/wallpaper/wallpaper.jpg index e7becba8..ae25fc36 100644 Binary files a/WebRoot/js/HoorayOS_mini/img/wallpaper/wallpaper.jpg and b/WebRoot/js/HoorayOS_mini/img/wallpaper/wallpaper.jpg differ diff --git a/WebRoot/pages/log/home.jsp b/WebRoot/pages/log/home.jsp deleted file mode 100644 index 4382ea85..00000000 --- a/WebRoot/pages/log/home.jsp +++ /dev/null @@ -1,76 +0,0 @@ -<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - - - - - - - - 首页说明 - - - - - - - - - - - - - -
-    - 日志管理 -
-

-      - 日志管理是记录资产管理系统增删改查操作明细，包括资产管理、系统管理等操作信息，通过日志管理，可以记录平时资产管理系统操作明细信息。日志管理主要以搜索操作信息为主。 -

- - \ No newline at end of file diff --git a/WebRoot/pages/log/operatelog.jsp b/WebRoot/pages/log/operatelog.jsp index 311cfae6..030cee10 100644 --- a/WebRoot/pages/log/operatelog.jsp +++ b/WebRoot/pages/log/operatelog.jsp @@ -28,26 +28,26 @@ 操作模块： - +     操作人员： -     操作IP： - +     操作状态： - @@ -57,27 +57,25 @@ 开始时间： - +     结束时间： - +     操作详情： - - + +   -   -   - + 查询 重置 - + diff --git a/WebRoot/pages/manage/app.jsp b/WebRoot/pages/manage/app.jsp index 076fab7d..60cf1af4 100644 --- a/WebRoot/pages/manage/app.jsp +++ b/WebRoot/pages/manage/app.jsp @@ -28,13 +28,13 @@ 名称： - +     种类： - +     diff --git a/WebRoot/pages/manage/functions.jsp b/WebRoot/pages/manage/functions.jsp index 7b2d79f6..27f4ef82 100644 --- a/WebRoot/pages/manage/functions.jsp +++ b/WebRoot/pages/manage/functions.jsp @@ -28,16 +28,19 @@ 名称： - +     类型:   - + + +     @@ -128,7 +131,6 @@ //iconCls:'icon-save', //width:700, height:heightInfo, - nowrap: false, rownumbers: false, //动画效果 animate:false, @@ -148,14 +150,14 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '编号 ',field: 'Number',width:100}, - { title: '名称',field: 'Name',width:200}, - { title: '上级编号',field: 'PNumber',width:100}, - { title: '链接',field: 'URL',width:200}, + { title: '编号 ',field: 'Number',width:60}, + { title: '名称',field: 'Name',width:80}, + { title: '上级编号',field: 'PNumber',width:60}, + { title: '链接',field: 'URL',width:120}, { title: '排序',field: 'Sort',width:50}, { title: '收缩',field: 'State',width:50}, { title: '启用',field: 'Enabled',width:50}, - { title: '类型',field: 'Type',width:100}, + { title: '类型',field: 'Type',width:50}, { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) { var str = ''; diff --git a/WebRoot/pages/manage/vendor.jsp b/WebRoot/pages/manage/vendor.jsp index 67db05b5..9f60eba7 100644 --- a/WebRoot/pages/manage/vendor.jsp +++ b/WebRoot/pages/manage/vendor.jsp @@ -8,7 +8,7 @@ - 供应商信息 + 单位信息 @@ -71,7 +71,7 @@ -
+
电子邮箱  
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
@@ -154,7 +171,7 @@ function initTableData() { $('#tableData').datagrid({ - //title:'供应商列表', + //title:'单位列表', //iconCls:'icon-save', //width:700, height:heightInfo, @@ -180,18 +197,18 @@ pageList: initPageNum, columns:[[ { field: 'id',width:35,align:"center",checkbox:true}, - { title: '名称',field: 'supplier',width:200}, - { title: '联系人', field: 'contacts',width:100,align:"center"}, - { title: '联系电话', field: 'phonenum',width:115,align:"center"}, - { title: '电子邮箱',field: 'email',width:180,align:"center"}, - //{ title: '是否系统',field: 'isystem',width:70,align:"center"}, - { title: '描述',field: 'description',width:100}, - { title: '类型',field: 'type',width:100}, - { title: '启动',field: 'enabled',width:100}, + { title: '名称',field: 'supplier',width:120}, + { title: '联系人', field: 'contacts',width:50,align:"center"}, + { title: '联系电话', field: 'phonenum',width:60,align:"center"}, + { title: '电子邮箱',field: 'email',width:80,align:"center"}, + { title: '累计应收',field: 'AllNeedGet',width:70,align:"center"}, + { title: '累计应付',field: 'AllNeedPay',width:70,align:"center"}, + { title: '类型',field: 'type',width:50}, + { title: '启动',field: 'enabled',width:40}, { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) { var str = ''; - var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled; + var rowInfo = rec.id + 'AaBb' + rec.supplier +'AaBb' + rec.contacts + 'AaBb'+ rec.phonenum + 'AaBb'+ rec.email + 'AaBb'+ rec.BeginNeedGet + 'AaBb'+ rec.BeginNeedPay + 'AaBb'+ rec.AllNeedGet + 'AaBb'+ rec.AllNeedPay + 'AaBb' + rec.isystem + 'AaBb' + rec.description+ 'AaBb' + rec.type+ 'AaBb' + rec.enabled; if(1 == value) { str += ' 编辑  '; @@ -278,10 +295,10 @@ } } - //删除供应商信息 + //删除单位信息 function deleteSupplier(supplierInfo) { - $.messager.confirm('删除确认','确定要删除此供应商信息吗？',function(r) + $.messager.confirm('删除确认','确定要删除此单位信息吗？',function(r) { if (r) { @@ -302,12 +319,12 @@ //加载完以后重新初始化 $("#searchBtn").click(); else - $.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error'); + $.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error'); }, //此处添加错误处理 error:function() { - $.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error'); + $.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error'); return; } }); @@ -315,7 +332,7 @@ }); } - //批量删除供应商 + //批量删除单位 function batDeleteSupplier() { var row = $('#tableData').datagrid('getChecked'); @@ -326,7 +343,7 @@ } if(row.length > 0) { - $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条供应商信息吗？',function(r) + $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单位信息吗？',function(r) { if (r) { @@ -359,12 +376,12 @@ $(":checkbox").attr("checked",false); } else - $.messager.alert('删除提示','删除供应商信息失败，请稍后再试！','error'); + $.messager.alert('删除提示','删除单位信息失败，请稍后再试！','error'); }, //此处添加错误处理 error:function() { - $.messager.alert('删除提示','删除供应商信息异常，请稍后再试！','error'); + $.messager.alert('删除提示','删除单位信息异常，请稍后再试！','error'); return; } }); @@ -373,7 +390,7 @@ } } - //增加供应商 + //增加单位 var url; var supplierID = 0; //保存编辑前的名称 @@ -381,7 +398,7 @@ function addSuppler() { - $('#supplierDlg').dialog('open').dialog('setTitle',' 增加供应商'); + $('#supplierDlg').dialog('open').dialog('setTitle',' 增加单位信息'); $(".window-mask").css({ width: webW ,height: webH}); $('#supplierFM').form('clear'); @@ -396,7 +413,7 @@ url = '<%=path %>/supplier/create.action'; } - //保存供应商信息 + //保存单位信息 $("#saveSupplier").unbind().bind({ click:function() { @@ -425,15 +442,12 @@ { $.messager.show({ title: '错误提示', - msg: '保存供应商信息失败，请稍后重试!' + msg: '保存单位信息失败，请稍后重试!' }); } else { $('#supplierDlg').dialog('close'); - //$('#tableData').datagrid('reload'); - //加载完以后重新初始化 - //$("#searchBtn").click(); var opts = $("#tableData").datagrid('options'); showSupplierDetails(opts.pageNumber,opts.pageSize); } @@ -442,7 +456,7 @@ } }); - //编辑供应商信息 + //编辑单位信息 function editSupplier(supplierTotalInfo) { var supplierInfo = supplierTotalInfo.split("AaBb"); @@ -451,13 +465,17 @@ contacts : supplierInfo[2], phonenum : supplierInfo[3], email : supplierInfo[4], - description : supplierInfo[6], - type : supplierInfo[7], - enabled : supplierInfo[8], + BeginNeedGet : supplierInfo[5], + BeginNeedPay : supplierInfo[6], + AllNeedGet : supplierInfo[7], + AllNeedPay : supplierInfo[8], + description : supplierInfo[10], + type : supplierInfo[11], + enabled : supplierInfo[12], clientIp:'<%=clientIp %>' }; orgSupplier = supplierInfo[1]; - $('#supplierDlg').dialog('open').dialog('setTitle',' 编辑供应商信息'); + $('#supplierDlg').dialog('open').dialog('setTitle',' 编辑单位信息'); $(".window-mask").css({ width: webW ,height: webH}); $('#supplierFM').form('load',row); supplierID = supplierInfo[0]; @@ -466,11 +484,8 @@ url = '<%=path %>/supplier/update.action?supplierID=' + supplierInfo[0]; } - //$("#supplier").unbind().bind({ - //blur:checkSupplierName - //}); - //检查供应商 名称是否存在 ++ 重名无法提示问题需要跟进 + //检查单位名称是否存在 ++ 重名无法提示问题需要跟进 function checkSupplierName() { var supplierName = $.trim($("#supplier").val()); @@ -493,16 +508,14 @@ flag = tipInfo; if(tipInfo) { - $.messager.alert('提示','供应商名称已经存在','info'); - //alert("供应商名称已经存在"); - //$("#supplier").val(""); + $.messager.alert('提示','单位名称已经存在','info'); return; } }, //此处添加错误处理 error:function() { - $.messager.alert('提示','检查供应商名称是否存在异常，请稍后再试！','error'); + $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error'); return; } }); diff --git a/WebRoot/pages/materials/allocation_in_list.jsp b/WebRoot/pages/materials/allocation_in_list.jsp index 4adfe2e0..93482014 100644 --- a/WebRoot/pages/materials/allocation_in_list.jsp +++ b/WebRoot/pages/materials/allocation_in_list.jsp @@ -27,7 +27,7 @@
- + @@ -80,7 +80,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -828,7 +828,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/allocation_out_list.jsp b/WebRoot/pages/materials/allocation_out_list.jsp index 24922fbf..8c22af32 100644 --- a/WebRoot/pages/materials/allocation_out_list.jsp +++ b/WebRoot/pages/materials/allocation_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库： 对方店面：对方仓库： 对方店面：对方仓库：
- + @@ -80,7 +80,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -872,7 +872,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_allocation_out_list.jsp b/WebRoot/pages/materials/audit_allocation_out_list.jsp index 169680ff..4bd55216 100644 --- a/WebRoot/pages/materials/audit_allocation_out_list.jsp +++ b/WebRoot/pages/materials/audit_allocation_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库： 对方店面：对方仓库： 对方店面：对方仓库：
- + @@ -78,7 +78,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -912,7 +912,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_consuming_out_list.jsp b/WebRoot/pages/materials/audit_consuming_out_list.jsp index 9f5dfcf1..82743cbf 100644 --- a/WebRoot/pages/materials/audit_consuming_out_list.jsp +++ b/WebRoot/pages/materials/audit_consuming_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库： 对方店面：对方仓库： 对方店面：对方仓库：
- + @@ -963,7 +963,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_lease_in_list.jsp b/WebRoot/pages/materials/audit_lease_in_list.jsp index 74a795a1..cab1e9d2 100644 --- a/WebRoot/pages/materials/audit_lease_in_list.jsp +++ b/WebRoot/pages/materials/audit_lease_in_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -913,7 +913,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_purchase_in_list.jsp b/WebRoot/pages/materials/audit_purchase_in_list.jsp index 0a8883d7..478a1ce7 100644 --- a/WebRoot/pages/materials/audit_purchase_in_list.jsp +++ b/WebRoot/pages/materials/audit_purchase_in_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -923,7 +923,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_return_out_list.jsp b/WebRoot/pages/materials/audit_return_out_list.jsp index fff8217c..e2dd0d3b 100644 --- a/WebRoot/pages/materials/audit_return_out_list.jsp +++ b/WebRoot/pages/materials/audit_return_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -909,7 +909,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_sale_out_list.jsp b/WebRoot/pages/materials/audit_sale_out_list.jsp index e0a4ee52..dddb0dd3 100644 --- a/WebRoot/pages/materials/audit_sale_out_list.jsp +++ b/WebRoot/pages/materials/audit_sale_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -121,7 +121,7 @@ closed="true" modal="true" cache="false" collapsible="false" closable="true">
店面：仓库：
- + @@ -963,7 +963,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/audit_supply_in_list.jsp b/WebRoot/pages/materials/audit_supply_in_list.jsp index f1c8bcde..b62291d9 100644 --- a/WebRoot/pages/materials/audit_supply_in_list.jsp +++ b/WebRoot/pages/materials/audit_supply_in_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -906,7 +906,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/building.jsp b/WebRoot/pages/materials/building.jsp index f572c6f8..2782ea72 100644 --- a/WebRoot/pages/materials/building.jsp +++ b/WebRoot/pages/materials/building.jsp @@ -71,7 +71,7 @@ - \ No newline at end of file + diff --git a/WebRoot/pages/materials/materialcategory.jsp b/WebRoot/pages/materials/materialcategory.jsp index c97e48d9..91c383d5 100644 --- a/WebRoot/pages/materials/materialcategory.jsp +++ b/WebRoot/pages/materials/materialcategory.jsp @@ -8,7 +8,7 @@ - 物料类别管理 + 商品类别管理 @@ -44,7 +44,7 @@ -
+
店面：仓库：
@@ -116,7 +116,7 @@ var msgTip = systemInfo.showModel.msgTip; if(msgTip == "exceptoin") { - $.messager.alert('提示','查找物料类别异常,请与管理员联系！','error'); + $.messager.alert('提示','查找商品类别异常,请与管理员联系！','error'); return; } } @@ -229,7 +229,7 @@ function initTableData() { $('#tableData').datagrid({ - //title:'物料类别列表', + //title:'商品类别列表', //iconCls:'icon-save', //width:700, height:heightInfo, @@ -341,10 +341,10 @@ } } - //删除物料类别信息 + //删除商品类别信息 function deleteMaterialCategory(materialCategoryID) { - $.messager.confirm('删除确认','确定要删除此物料类别信息吗？',function(r) + $.messager.confirm('删除确认','确定要删除此商品类别信息吗？',function(r) { if (r) { @@ -365,12 +365,12 @@ $("#searchBtn").click(); } else - $.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error'); + $.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error'); }, //此处添加错误处理 error:function() { - $.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error'); + $.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error'); return; } }); @@ -378,7 +378,7 @@ }); } - //批量删除物料类别 + //批量删除商品类别 function batDeleteMaterialCategory() { var row = $('#tableData').datagrid('getChecked'); @@ -389,7 +389,7 @@ } if(row.length > 0) { - $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料类别信息吗？',function(r) + $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品类别信息吗？',function(r) { if (r) { @@ -423,12 +423,12 @@ $(":checkbox").attr("checked",false); } else - $.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error'); + $.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error'); }, //此处添加错误处理 error:function() { - $.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error'); + $.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error'); return; } }); @@ -447,7 +447,7 @@ { $("#clientIp").val('<%=clientIp %>'); $('#materialCategoryFM').form('clear'); - $('#materialCategoryDlg').dialog('open').dialog('setTitle',' 增加物料类别信息'); + $('#materialCategoryDlg').dialog('open').dialog('setTitle',' 增加商品类别信息'); $(".window-mask").css({ width: webW ,height: webH}); $("#Name").val("").focus(); @@ -497,14 +497,14 @@ { $.messager.show({ title: '错误提示', - msg: '保存物料类别信息失败，请稍后重试!' + msg: '保存商品类别信息失败，请稍后重试!' }); } }, //此处添加错误处理 error:function() { - $.messager.alert('提示','保存物料类别信息异常，请稍后再试！','error'); + $.messager.alert('提示','保存商品类别信息异常，请稍后再试！','error'); return; } }); @@ -523,7 +523,7 @@ $("#Name").val(materialCategoryInfo[3]); //orgMaterialCategory = materialCategoryInfo[1]; - $('#materialCategoryDlg').dialog('open').dialog('setTitle',' 编辑物料类别信息'); + $('#materialCategoryDlg').dialog('open').dialog('setTitle',' 编辑商品类别信息'); $(".window-mask").css({ width: webW ,height: webH}); materialCategoryID = materialCategoryInfo[0]; //焦点在名称输入框==定焦在输入文字后面 diff --git a/WebRoot/pages/materials/other_out_list.jsp b/WebRoot/pages/materials/other_out_list.jsp index 862dd47c..e20bc147 100644 --- a/WebRoot/pages/materials/other_out_list.jsp +++ b/WebRoot/pages/materials/other_out_list.jsp @@ -27,7 +27,7 @@
- + @@ -859,7 +859,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/person.jsp b/WebRoot/pages/materials/person.jsp index 4e29512b..daffebea 100644 --- a/WebRoot/pages/materials/person.jsp +++ b/WebRoot/pages/materials/person.jsp @@ -26,7 +26,7 @@
店面：仓库：
- + @@ -60,7 +60,7 @@
店面：仓库：
- + @@ -184,7 +184,7 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '店面',field: 'ProjectName',width:180}, + { title: '仓库',field: 'ProjectName',width:180}, { title: '类型',field: 'Type',width:180}, { title: '经手人',field: 'Name',width:180}, { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) diff --git a/WebRoot/pages/materials/purchase_in_list.jsp b/WebRoot/pages/materials/purchase_in_list.jsp index 89ec580e..72a8d3a6 100644 --- a/WebRoot/pages/materials/purchase_in_list.jsp +++ b/WebRoot/pages/materials/purchase_in_list.jsp @@ -27,25 +27,25 @@
店面仓库
- +
店面：仓库： - + 单据号： - + 入库时间： - + - - + 状态： - @@ -408,8 +408,8 @@ { title: '入库时间 ',field: 'OperTime',width:100}, { title: '创建时间',field: 'CreateTime',width:100}, { title: '操作员',field: 'OperPersonName',width:100}, - { title: '备注',field: 'Remark',width:200}, - { title: '状态',field: 'State',width:100}, + { title: '备注',field: 'Remark',width:100}, + { title: '状态',field: 'State',width:50}, { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec) { var str = ''; @@ -881,7 +881,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/recover_in_list.jsp b/WebRoot/pages/materials/recover_in_list.jsp index 15a47e91..232b2b55 100644 --- a/WebRoot/pages/materials/recover_in_list.jsp +++ b/WebRoot/pages/materials/recover_in_list.jsp @@ -27,7 +27,7 @@
- + @@ -863,7 +863,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/return_out_list.jsp b/WebRoot/pages/materials/return_out_list.jsp index 3b6eb3bd..0217ac9e 100644 --- a/WebRoot/pages/materials/return_out_list.jsp +++ b/WebRoot/pages/materials/return_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -869,7 +869,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/sale_out_list.jsp b/WebRoot/pages/materials/sale_out_list.jsp index 10a6e199..46782fed 100644 --- a/WebRoot/pages/materials/sale_out_list.jsp +++ b/WebRoot/pages/materials/sale_out_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -868,7 +868,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/materials/supply_in_list.jsp b/WebRoot/pages/materials/supply_in_list.jsp index 680aeff6..d44e6841 100644 --- a/WebRoot/pages/materials/supply_in_list.jsp +++ b/WebRoot/pages/materials/supply_in_list.jsp @@ -27,7 +27,7 @@
店面：仓库：
- + @@ -866,7 +866,7 @@ { if($("#searchProjectId").val()=="") { - $.messager.alert('查询提示','请选择一个店面！','info'); + $.messager.alert('查询提示','请选择一个仓库！','info'); } else { diff --git a/WebRoot/pages/personnel/j.jsp b/WebRoot/pages/personnel/j.jsp deleted file mode 100644 index e69de29b..00000000 diff --git a/WebRoot/pages/user/user.jsp b/WebRoot/pages/user/user.jsp index d1d74641..065858ea 100644 --- a/WebRoot/pages/user/user.jsp +++ b/WebRoot/pages/user/user.jsp @@ -31,14 +31,13 @@ - + + diff --git a/WebRoot/pages/visit/visitAccount.jsp b/WebRoot/pages/visit/visitAccount.jsp deleted file mode 100644 index 2f7a215a..00000000 --- a/WebRoot/pages/visit/visitAccount.jsp +++ /dev/null @@ -1,533 +0,0 @@ -<%@page import="com.jsh.util.common.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> -<% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getCurrentUserIP(); -%> - - - - 回访管理 - - - - - - - - - - - - - - - - - -
-
店面：仓库：
用户名称： - -     登录名称： - +    
- - - - - - - - - - -
店面： - - 楼号： - -     - 查询   - 重置 -
-
- - -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
店面 - -
楼号
户号
回访情况
落实情况
住户姓名
电话
- - -
-
- 保存 - 取消 -
- - - - \ No newline at end of file diff --git a/WebRoot/plugin/jQuery带日期的指针时钟.rar b/WebRoot/plugins/jQuery带日期的指针时钟.rar similarity index 100% rename from WebRoot/plugin/jQuery带日期的指针时钟.rar rename to WebRoot/plugins/jQuery带日期的指针时钟.rar diff --git a/WebRoot/plugin/万年历.rar b/WebRoot/plugins/万年历.rar similarity index 100% rename from WebRoot/plugin/万年历.rar rename to WebRoot/plugins/万年历.rar diff --git a/WebRoot/plugin/事件提醒_jquery.rar b/WebRoot/plugins/事件提醒_jquery.rar similarity index 100% rename from WebRoot/plugin/事件提醒_jquery.rar rename to WebRoot/plugins/事件提醒_jquery.rar diff --git a/WebRoot/plugin/代办事项.rar b/WebRoot/plugins/代办事项.rar similarity index 100% rename from WebRoot/plugin/代办事项.rar rename to WebRoot/plugins/代办事项.rar diff --git a/WebRoot/plugin/带闹钟时尚数字时钟.rar b/WebRoot/plugins/带闹钟时尚数字时钟.rar similarity index 100% rename from WebRoot/plugin/带闹钟时尚数字时钟.rar rename to WebRoot/plugins/带闹钟时尚数字时钟.rar diff --git a/WebRoot/upload/images/deskIcon/0000000022.png b/WebRoot/upload/images/deskIcon/0000000022.png index 11e34aae..60272742 100644 Binary files a/WebRoot/upload/images/deskIcon/0000000022.png and b/WebRoot/upload/images/deskIcon/0000000022.png differ diff --git a/WebRoot/upload/images/deskIcon/Thumbs.db b/WebRoot/upload/images/deskIcon/Thumbs.db deleted file mode 100644 index ae0aa0c3..00000000 Binary files a/WebRoot/upload/images/deskIcon/Thumbs.db and /dev/null differ diff --git a/config/hibernate/hibernate.cfg.xml b/config/hibernate/hibernate.cfg.xml index 3b9d97da..f81441d0 100644 --- a/config/hibernate/hibernate.cfg.xml +++ b/config/hibernate/hibernate.cfg.xml @@ -33,7 +33,6 @@ - diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml index 98711663..cfe6e2f1 100644 --- a/config/spring/basic-applicationContext.xml +++ b/config/spring/basic-applicationContext.xml @@ -238,18 +238,6 @@ - - - - - - - - - - - - @@ -262,7 +250,7 @@ - + @@ -272,9 +260,9 @@ - + - + @@ -284,7 +272,7 @@ - + diff --git a/config/spring/dao-applicationContext.xml b/config/spring/dao-applicationContext.xml index cdd3f46d..39317180 100644 --- a/config/spring/dao-applicationContext.xml +++ b/config/spring/dao-applicationContext.xml @@ -34,8 +34,6 @@ - - diff --git a/config/struts2/visitAccount-struts.xml b/config/struts2/visitAccount-struts.xml deleted file mode 100644 index 8f9046dd..00000000 --- a/config/struts2/visitAccount-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index 9eb3c120..96d3cd98 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -382,7 +382,7 @@ INSERT INTO `jsh_assetname` VALUES ('1','联想Y450','17','1','','1'), ('2','惠 INSERT INTO `jsh_depot` VALUES ('1','上海花边店','1',''); INSERT INTO `jsh_depothead` VALUES ('29','入库','采购','1','1234','李四','2016-11-08 22:14:37','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('30','入库','采购','1','1235','李四','2016-11-08 22:15:16','2016-11-08 00:00:00','1','2','1','记账',NULL,NULL,'','草稿',NULL,NULL), ('31','出库','销售','1','123A','李四','2016-11-08 22:16:11','2016-11-08 00:00:00','2',NULL,'1','',NULL,NULL,'','草稿',NULL,NULL), ('32','入库','采购','1','ww123','季圣华','2016-11-25 22:14:46','2016-11-25 00:00:00','1','2','1','现金',NULL,NULL,'','草稿',NULL,NULL); INSERT INTO `jsh_depotitem` VALUES ('1014','29','485','300','0.4',NULL,'',''), ('1015','29','487','200','0.2',NULL,'',''), ('1016','30','498','432','0.5',NULL,'',''), ('1017','31','485','100','0.6',NULL,'',''), ('1018','32','487','1','0.9',NULL,'',''); -INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','','0010','','电脑版'), ('2','01','基础数据','0','','','0020','','电脑版'), ('3','02','物资管理','0','','','0030','','电脑版'), ('10','09','留言管理','0','','\0','0100','','手机版'), ('11','0001','系统管理','00','','\0','0110','','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','','电脑版'), ('14','000103','用户管理','0001','../user/user.jsp','\0','0140','','电脑版'), ('15','000104','日志管理','0001','../log/operatelog.jsp','\0','0160','','电脑版'), ('16','000105','功能管理','0001','../manage/functions.jsp','\0','0135','','电脑版'), ('21','0101','物料管理','01','','\0','0220','','电脑版'), ('22','010101','物料类别管理','0101','../materials/materialcategory.jsp','\0','0230','','电脑版'), ('23','010102','物料档案管理','0101','../materials/material.jsp','\0','0240','','电脑版'), ('24','0102','公司数据管理','01','','\0','0250','','电脑版'), ('25','010201','单位信息','0102','../manage/vendor.jsp','\0','0260','','电脑版'), ('26','010202','部门管理','0102','../manage/depot.jsp','\0','0270','','电脑版'), ('30','0201','其他管理','02','','\0','0310','','电脑版'), ('31','020101','经手人管理','0201','../materials/person.jsp','\0','0312','','电脑版'), ('32','0202','入库管理','02','','\0','0330','','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','','电脑版'), ('34','020202','甲供入库','0202','../materials/supply_in_list.jsp','\0','0350','','电脑版'), ('35','020203','租赁入库','0202','../materials/lease_in_list.jsp','\0','0360','','电脑版'), ('36','020204','回收入库','0202','../materials/recover_in_list.jsp','\0','0370','','电脑版'), ('37','020205','调拨入库','0202','../materials/allocation_in_list.jsp','\0','0380','','电脑版'), ('38','0203','出库管理','02','','\0','0390','','电脑版'), ('39','020301','领用出库','0203','../materials/consuming_out_list.jsp','\0','0400','','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0410','','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0420','','电脑版'), ('42','020304','退还出库','0203','../materials/return_out_list.jsp','\0','0430','','电脑版'), ('43','020305','报废出库','0203','../materials/other_out_list.jsp','\0','0430','','电脑版'), ('44','0204','财务管理','02','','\0','0450','','电脑版'), ('45','020401','单据审核','0204','','','0460','','电脑版'), ('46','02040101','采购入库审核','020401','../materials/audit_purchase_in_list.jsp','\0','0470','','电脑版'), ('47','02040102','甲供入库审核','020401','../materials/audit_supply_in_list.jsp','\0','0480','','电脑版'), ('48','02040103','租赁入库审核','020401','../materials/audit_lease_in_list.jsp','\0','0490','','电脑版'), ('49','02040104','调拨出库审核','020401','../materials/audit_allocation_out_list.jsp','\0','0500','','电脑版'), ('50','02040105','领用出库审核','020401','../materials/audit_consuming_out_list.jsp','\0','0510','','电脑版'), ('51','02040106','退还出库审核','020401','../materials/audit_return_out_list.jsp','\0','0520','','电脑版'), ('52','020402','采购定价','0204','../materials/fix_purchase_in_list.jsp','\0','0530','','电脑版'), ('53','020403','租赁定价','0204','../materials/fix_lease_in_list.jsp','\0','0540','','电脑版'), ('54','020404','调拨定价','0204','../materials/fix_allocation_out_list.jsp','\0','0550','','电脑版'), ('55','020405','销售定价','0204','../materials/fix_sale_out_list.jsp','\0','0560','','电脑版'), ('58','0205','报表中心','02','','\0','0590','','电脑版'), ('59','020501','项目进销存报表','0205','../reports/in_out_stock_report.jsp','\0','0600','','电脑版'), ('193','02040107','销售出库审核','020401','../materials/audit_sale_out_list.jsp','\0','0525','','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','','电脑版'); +INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','','0010','','电脑版'), ('2','01','基础数据','0','','','0020','','电脑版'), ('3','02','物资管理','0','','','0030','','电脑版'), ('10','09','留言管理','0','','\0','0100','','手机版'), ('11','0001','系统管理','00','','\0','0110','','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','','电脑版'), ('14','000103','用户管理','0001','../user/user.jsp','\0','0140','','电脑版'), ('15','000104','日志管理','0001','../log/operatelog.jsp','\0','0160','','电脑版'), ('16','000105','功能管理','0001','../manage/functions.jsp','\0','0135','','电脑版'), ('21','0101','商品管理','01','','\0','0220','','电脑版'), ('22','010101','商品类别管理','0101','../materials/materialcategory.jsp','\0','0230','','电脑版'), ('23','010102','商品档案管理','0101','../materials/material.jsp','\0','0240','','电脑版'), ('24','0102','公司数据管理','01','','\0','0250','','电脑版'), ('25','010201','单位信息','0102','../manage/vendor.jsp','\0','0260','','电脑版'), ('26','010202','部门管理','0102','../manage/depot.jsp','\0','0270','','电脑版'), ('30','0201','其他管理','02','','\0','0310','','电脑版'), ('31','020101','经手人管理','0201','../materials/person.jsp','\0','0312','','电脑版'), ('32','0202','入库管理','02','','\0','0330','','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','','电脑版'), ('34','020202','甲供入库','0202','../materials/supply_in_list.jsp','\0','0350','','电脑版'), ('35','020203','租赁入库','0202','../materials/lease_in_list.jsp','\0','0360','','电脑版'), ('36','020204','回收入库','0202','../materials/recover_in_list.jsp','\0','0370','','电脑版'), ('37','020205','调拨入库','0202','../materials/allocation_in_list.jsp','\0','0380','','电脑版'), ('38','0203','出库管理','02','','\0','0390','','电脑版'), ('39','020301','领用出库','0203','../materials/consuming_out_list.jsp','\0','0400','','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0410','','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0420','','电脑版'), ('42','020304','退还出库','0203','../materials/return_out_list.jsp','\0','0430','','电脑版'), ('43','020305','报废出库','0203','../materials/other_out_list.jsp','\0','0430','','电脑版'), ('44','0204','财务管理','02','','\0','0450','','电脑版'), ('45','020401','单据审核','0204','','','0460','','电脑版'), ('46','02040101','采购入库审核','020401','../materials/audit_purchase_in_list.jsp','\0','0470','','电脑版'), ('47','02040102','甲供入库审核','020401','../materials/audit_supply_in_list.jsp','\0','0480','','电脑版'), ('48','02040103','租赁入库审核','020401','../materials/audit_lease_in_list.jsp','\0','0490','','电脑版'), ('49','02040104','调拨出库审核','020401','../materials/audit_allocation_out_list.jsp','\0','0500','','电脑版'), ('50','02040105','领用出库审核','020401','../materials/audit_consuming_out_list.jsp','\0','0510','','电脑版'), ('51','02040106','退还出库审核','020401','../materials/audit_return_out_list.jsp','\0','0520','','电脑版'), ('52','020402','采购定价','0204','../materials/fix_purchase_in_list.jsp','\0','0530','','电脑版'), ('53','020403','租赁定价','0204','../materials/fix_lease_in_list.jsp','\0','0540','','电脑版'), ('54','020404','调拨定价','0204','../materials/fix_allocation_out_list.jsp','\0','0550','','电脑版'), ('55','020405','销售定价','0204','../materials/fix_sale_out_list.jsp','\0','0560','','电脑版'), ('58','0205','报表中心','02','','\0','0590','','电脑版'), ('59','020501','项目进销存报表','0205','../reports/in_out_stock_report.jsp','\0','0600','','电脑版'), ('193','02040107','销售出库审核','020401','../materials/audit_sale_out_list.jsp','\0','0525','','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','','电脑版'); INSERT INTO `jsh_inoutitem` VALUES ('1','山山水水','支出','yyyy'), ('5','啊啊啊','收入','ttttttt'), ('7','44454','收入','33333'); INSERT INTO `jsh_log` VALUES ('1722','63','登录系统','192.168.1.104','2016-11-27 13:17:17','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1723','63','登录系统','192.168.1.104','2016-11-27 13:17:30','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1724','63','退出系统','192.168.1.104','2016-11-27 13:17:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1725','65','登录系统','192.168.1.104','2016-11-27 13:17:52','0','管理用户：ls 登录系统','ls 登录系统'), ('1726','65','退出系统','192.168.1.104','2016-11-27 13:18:18','0','管理用户：ls 退出系统','ls 退出系统'), ('1727','63','登录系统','192.168.1.104','2016-11-27 13:18:22','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1728','63','更新UserBusiness','192.168.1.104','2016-11-27 13:18:44','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1729','63','退出系统','192.168.1.104','2016-11-27 13:18:48','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1730','65','登录系统','192.168.1.104','2016-11-27 13:18:53','0','管理用户：ls 登录系统','ls 登录系统'); INSERT INTO `jsh_material` VALUES ('485','1','棉线','A21-4321','米色','码',''), ('487','1','网布','12343','红色','码',''), ('498','2','蕾丝','B123','蓝色','码',''); diff --git a/src/com/jsh/action/basic/AppAction.java b/src/com/jsh/action/basic/AppAction.java index 46e49710..fd9e3f35 100644 --- a/src/com/jsh/action/basic/AppAction.java +++ b/src/com/jsh/action/basic/AppAction.java @@ -1,6 +1,4 @@ package com.jsh.action.basic; - - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -29,7 +27,6 @@ import com.jsh.model.vo.basic.AppModel; import com.jsh.service.basic.AppIService; import com.jsh.service.basic.UserBusinessIService; import com.jsh.util.common.PageUtil; -//import com.opensymphony.xwork2.ActionContext; /** * 应用 * @author ji_sheng_hua diff --git a/src/com/jsh/action/basic/DepotAction.java b/src/com/jsh/action/basic/DepotAction.java index d48ff7f6..f67da8a3 100644 --- a/src/com/jsh/action/basic/DepotAction.java +++ b/src/com/jsh/action/basic/DepotAction.java @@ -21,7 +21,10 @@ import com.jsh.model.vo.basic.DepotModel; import com.jsh.service.basic.DepotIService; import com.jsh.service.basic.UserBusinessIService; import com.jsh.util.common.PageUtil; - +/** + * 仓库 + * @author ji sheng hua + */ @SuppressWarnings("serial") public class DepotAction extends BaseAction { diff --git a/src/com/jsh/action/basic/SupplierAction.java b/src/com/jsh/action/basic/SupplierAction.java index c15f3eae..b5c77ec0 100644 --- a/src/com/jsh/action/basic/SupplierAction.java +++ b/src/com/jsh/action/basic/SupplierAction.java @@ -1,402 +1,406 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.dao.DataAccessException; - -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.basic.SupplierModel; -import com.jsh.service.basic.SupplierIService; -import com.jsh.util.common.PageUtil; - -@SuppressWarnings("serial") -public class SupplierAction extends BaseAction -{ - private SupplierIService supplierService; - private SupplierModel model = new SupplierModel(); - - /** - * 增加供应商 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加供应商方法==================="); - Boolean flag = false; - try - { - Supplier supplier = new Supplier(); - supplier.setContacts(model.getContacts()); - supplier.setType(model.getType()); - supplier.setDescription(model.getDescription()); - supplier.setEmail(model.getEmail()); - supplier.setIsystem((short)1); - supplier.setPhonenum(model.getPhonenum()); - supplier.setSupplier(model.getSupplier()); - supplier.setEnabled(model.getEnabled()); - supplierService.create(supplier); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加供应商异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加供应商回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加供应商名称为 "+ model.getSupplier() + " " + tipMsg + "！", "增加供应商" + tipMsg)); - Log.infoFileSync("==================结束调用增加供应商方法==================="); - } - - /** - * 删除供应商 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除供应商信息方法delete()================"); - try - { - supplierService.delete(model.getSupplierID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getSupplierID() + " 的供应商异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除供应商ID为 "+ model.getSupplierID() + ",名称为 " + model.getSupplier() + tipMsg + "！", "删除供应商" + tipMsg)); - Log.infoFileSync("====================结束调用删除供应商信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新供应商 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Supplier supplier = supplierService.get(model.getSupplierID()); - supplier.setContacts(model.getContacts()); - supplier.setType(model.getType()); - supplier.setDescription(model.getDescription()); - supplier.setEmail(model.getEmail()); - supplier.setIsystem((short)1); - supplier.setPhonenum(model.getPhonenum()); - supplier.setSupplier(model.getSupplier()); - supplier.setEnabled(model.getEnabled()); - supplierService.update(supplier); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 ： " + model.getSupplierID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新供应商ID为 "+ model.getSupplierID() + " " + tipMsg + "！", "更新供应商" + tipMsg)); - } - - /** - * 批量删除指定ID供应商 - * @return - */ - public String batchDelete() - { - try - { - supplierService.batchDelete(model.getSupplierIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除供应商ID为：" + model.getSupplierIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除供应商ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量删除供应商" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = supplierService.checkIsNameExist("supplier",model.getSupplier(),"id", model.getSupplierID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找供应商信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //供应商名称 - item.put("supplier", supplier.getSupplier()); - item.put("type", supplier.getType()); - item.put("contacts",supplier.getContacts()); - item.put("phonenum", supplier.getPhonenum()); - item.put("email", supplier.getEmail()); - item.put("isystem", supplier.getIsystem() == (short)0?"是":"否"); - item.put("description", supplier.getDescription()); - item.put("enabled", supplier.getEnabled()); - item.put("op", supplier.getIsystem()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 查找供应商信息-下拉框 - * @return - */ - public void findBySelect_sup() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select_sup()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //供应商名称 - item.put("supplier", supplier.getSupplier()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - /** - * 查找客户信息-下拉框 - * @return - */ - public void findBySelect_cus() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select_cus()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //客户名称 - item.put("supplier", supplier.getSupplier()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找客户信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("supplier_s_like", model.getSupplier()); - condition.put("type_s_like", model.getType()); - condition.put("contacts_s_like", model.getContacts()); - condition.put("phonenum_s_like", model.getPhonenum()); - condition.put("email_s_like", model.getEmail()); - condition.put("description_s_like", model.getDescription()); - condition.put("id_s_order", "desc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框-供应商 - * @return - */ - private Map getCondition_Select_sup() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("type_s_like", "供应商"); - condition.put("id_s_order", "desc"); - return condition; - } - /** - * 拼接搜索条件-下拉框-客户 - * @return - */ - private Map getCondition_Select_cus() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("type_s_like", "客户"); - condition.put("id_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public SupplierModel getModel() - { - return model; - } - public void setSupplierService(SupplierIService supplierService) - { - this.supplierService = supplierService; - } -} +package com.jsh.action.basic; + +import java.io.IOException; +import java.sql.Timestamp; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.springframework.dao.DataAccessException; + +import com.jsh.base.BaseAction; +import com.jsh.base.Log; +import com.jsh.model.po.Logdetails; +import com.jsh.model.po.Supplier; +import com.jsh.model.vo.basic.SupplierModel; +import com.jsh.service.basic.SupplierIService; +import com.jsh.util.common.PageUtil; + +@SuppressWarnings("serial") +public class SupplierAction extends BaseAction +{ + private SupplierIService supplierService; + private SupplierModel model = new SupplierModel(); + + /** + * 增加供应商 + * @return + */ + public void create() + { + Log.infoFileSync("==================开始调用增加供应商方法==================="); + Boolean flag = false; + try + { + Supplier supplier = new Supplier(); + supplier.setContacts(model.getContacts()); + supplier.setType(model.getType()); + supplier.setDescription(model.getDescription()); + supplier.setEmail(model.getEmail()); + supplier.setBeginNeedGet(model.getBeginNeedGet()); + supplier.setBeginNeedPay(model.getBeginNeedPay()); + supplier.setIsystem((short)1); + supplier.setPhonenum(model.getPhonenum()); + supplier.setSupplier(model.getSupplier()); + supplier.setEnabled(model.getEnabled()); + supplierService.create(supplier); + + //========标识位=========== + flag = true; + //记录操作日志使用 + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加供应商异常", e); + flag = false; + tipMsg = "失败"; + tipType = 1; + } + finally + { + try + { + toClient(flag.toString()); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>增加供应商回写客户端结果异常", e); + } + } + + logService.create(new Logdetails(getUser(), "增加供应商", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "增加供应商名称为 "+ model.getSupplier() + " " + tipMsg + "！", "增加供应商" + tipMsg)); + Log.infoFileSync("==================结束调用增加供应商方法==================="); + } + + /** + * 删除供应商 + * @return + */ + public String delete() + { + Log.infoFileSync("====================开始调用删除供应商信息方法delete()================"); + try + { + supplierService.delete(model.getSupplierID()); + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getSupplierID() + " 的供应商异常", e); + tipMsg = "失败"; + tipType = 1; + } + model.getShowModel().setMsgTip(tipMsg); + logService.create(new Logdetails(getUser(), "删除供应商", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "删除供应商ID为 "+ model.getSupplierID() + ",名称为 " + model.getSupplier() + tipMsg + "！", "删除供应商" + tipMsg)); + Log.infoFileSync("====================结束调用删除供应商信息方法delete()================"); + return SUCCESS; + } + + /** + * 更新供应商 + * @return + */ + public void update() + { + Boolean flag = false; + try + { + Supplier supplier = supplierService.get(model.getSupplierID()); + supplier.setContacts(model.getContacts()); + supplier.setType(model.getType()); + supplier.setDescription(model.getDescription()); + supplier.setEmail(model.getEmail()); + supplier.setBeginNeedGet(model.getBeginNeedGet()); + supplier.setBeginNeedPay(model.getBeginNeedPay()); + supplier.setIsystem((short)1); + supplier.setPhonenum(model.getPhonenum()); + supplier.setSupplier(model.getSupplier()); + supplier.setEnabled(model.getEnabled()); + supplierService.update(supplier); + + flag = true; + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 ： " + model.getSupplierID() + "信息失败", e); + flag = false; + tipMsg = "失败"; + tipType = 1; + } + finally + { + try + { + toClient(flag.toString()); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e); + } + } + logService.create(new Logdetails(getUser(), "更新供应商", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "更新供应商ID为 "+ model.getSupplierID() + " " + tipMsg + "！", "更新供应商" + tipMsg)); + } + + /** + * 批量删除指定ID供应商 + * @return + */ + public String batchDelete() + { + try + { + supplierService.batchDelete(model.getSupplierIDs()); + model.getShowModel().setMsgTip("成功"); + //记录操作日志使用 + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>批量删除供应商ID为：" + model.getSupplierIDs() + "信息异常", e); + tipMsg = "失败"; + tipType = 1; + } + + logService.create(new Logdetails(getUser(), "批量删除供应商", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "批量删除供应商ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量删除供应商" + tipMsg)); + return SUCCESS; + } + + /** + * 检查输入名称是否存在 + */ + public void checkIsNameExist() + { + Boolean flag = false; + try + { + flag = supplierService.checkIsNameExist("supplier",model.getSupplier(),"id", model.getSupplierID()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！"); + } + finally + { + try + { + toClient(flag.toString()); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>回写检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！",e); + } + } + } + + /** + * 查找供应商信息 + * @return + */ + public void findBy() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(model.getPageSize()); + pageUtil.setCurPage(model.getPageNo()); + pageUtil.setAdvSearch(getCondition()); + supplierService.find(pageUtil); + List dataList = pageUtil.getPageList(); + + JSONObject outer = new JSONObject(); + outer.put("total", pageUtil.getTotalCount()); + //存放数据json数组 + JSONArray dataArray = new JSONArray(); + if(null != dataList) + { + for(Supplier supplier:dataList) + { + JSONObject item = new JSONObject(); + item.put("id", supplier.getId()); + //供应商名称 + item.put("supplier", supplier.getSupplier()); + item.put("type", supplier.getType()); + item.put("contacts",supplier.getContacts()); + item.put("phonenum", supplier.getPhonenum()); + item.put("email", supplier.getEmail()); + item.put("BeginNeedGet",supplier.getBeginNeedGet()); + item.put("BeginNeedPay",supplier.getBeginNeedPay()); + item.put("AllNeedGet",supplier.getAllNeedGet()); + item.put("AllNeedPay",supplier.getAllNeedPay()); + item.put("isystem", supplier.getIsystem() == (short)0?"是":"否"); + item.put("description", supplier.getDescription()); + item.put("enabled", supplier.getEnabled()); + item.put("op", supplier.getIsystem()); + dataArray.add(item); + } + } + outer.put("rows", dataArray); + //回写查询结果 + toClient(outer.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); + } + } + + /** + * 查找供应商信息-下拉框 + * @return + */ + public void findBySelect_sup() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + pageUtil.setAdvSearch(getCondition_Select_sup()); + supplierService.find(pageUtil); + List dataList = pageUtil.getPageList(); + //存放数据json数组 + JSONArray dataArray = new JSONArray(); + if(null != dataList) + { + for(Supplier supplier:dataList) + { + JSONObject item = new JSONObject(); + item.put("id", supplier.getId()); + //供应商名称 + item.put("supplier", supplier.getSupplier()); + dataArray.add(item); + } + } + //回写查询结果 + toClient(dataArray.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); + } + } + /** + * 查找客户信息-下拉框 + * @return + */ + public void findBySelect_cus() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + pageUtil.setAdvSearch(getCondition_Select_cus()); + supplierService.find(pageUtil); + List dataList = pageUtil.getPageList(); + //存放数据json数组 + JSONArray dataArray = new JSONArray(); + if(null != dataList) + { + for(Supplier supplier:dataList) + { + JSONObject item = new JSONObject(); + item.put("id", supplier.getId()); + //客户名称 + item.put("supplier", supplier.getSupplier()); + dataArray.add(item); + } + } + //回写查询结果 + toClient(dataArray.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>查找客户信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e); + } + } + + /** + * 拼接搜索条件 + * @return + */ + private Map getCondition() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("supplier_s_like", model.getSupplier()); + condition.put("type_s_like", model.getType()); + condition.put("contacts_s_like", model.getContacts()); + condition.put("phonenum_s_like", model.getPhonenum()); + condition.put("email_s_like", model.getEmail()); + condition.put("description_s_like", model.getDescription()); + condition.put("id_s_order", "desc"); + return condition; + } + + /** + * 拼接搜索条件-下拉框-供应商 + * @return + */ + private Map getCondition_Select_sup() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("type_s_like", "供应商"); + condition.put("id_s_order", "desc"); + return condition; + } + /** + * 拼接搜索条件-下拉框-客户 + * @return + */ + private Map getCondition_Select_cus() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("type_s_like", "客户"); + condition.put("id_s_order", "desc"); + return condition; + } + + //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== + @Override + public SupplierModel getModel() + { + return model; + } + public void setSupplierService(SupplierIService supplierService) + { + this.supplierService = supplierService; + } +} diff --git a/src/com/jsh/action/basic/VisitAccountAction.java b/src/com/jsh/action/basic/VisitAccountAction.java deleted file mode 100644 index 183d8512..00000000 --- a/src/com/jsh/action/basic/VisitAccountAction.java +++ /dev/null @@ -1,267 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.dao.DataAccessException; - -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Category; -import com.jsh.model.po.Depot; -import com.jsh.model.po.VisitAccount; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.VisitAccountModel; -import com.jsh.service.basic.VisitAccountIService; -import com.jsh.util.common.PageUtil; - -@SuppressWarnings("serial") -public class VisitAccountAction extends BaseAction -{ - private VisitAccountIService visitAccountService; - private VisitAccountModel model = new VisitAccountModel(); - /** - * 增加回访 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加回访信息方法create()==================="); - Boolean flag = false; - try - { - VisitAccount visitAccount = new VisitAccount(); - visitAccount.setDepot(new Depot(model.getProjectId())); - - visitAccount.setLouHao(model.getLouHao()); - visitAccount.setHuHao(model.getHuHao()); - visitAccount.setHuiFang(model.getHuiFang()); - visitAccount.setLuoShi(model.getLuoShi()); - visitAccount.setName(model.getName()); - visitAccount.setTel(model.getTel()); - visitAccount.setAddTime(new Timestamp(new Date().getTime())); - visitAccountService.create(visitAccount); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加回访信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加回访信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加回访", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加回访名称为 "+ model.getName() + " " + tipMsg + "！", "增加回访" + tipMsg)); - Log.infoFileSync("==================结束调用增加回访方法create()==================="); - } - - /** - * 删除回访 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除回访信息方法delete()================"); - try - { - visitAccountService.delete(model.getVisitAccountID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getVisitAccountID() + " 的回访异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除回访", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除回访ID为 "+ model.getVisitAccountID() + " " + tipMsg + "！", "删除回访" + tipMsg)); - Log.infoFileSync("====================结束调用删除回访信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新回访 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - VisitAccount visitAccount = visitAccountService.get(model.getVisitAccountID()); - visitAccount.setDepot(new Depot(model.getProjectId())); - - visitAccount.setLouHao(model.getLouHao()); - visitAccount.setHuHao(model.getHuHao()); - visitAccount.setHuiFang(model.getHuiFang()); - visitAccount.setLuoShi(model.getLuoShi()); - visitAccount.setName(model.getName()); - visitAccount.setTel(model.getTel()); - visitAccount.setAddTime(new Timestamp(new Date().getTime())); - visitAccountService.update(visitAccount); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改回访ID为 ： " + model.getVisitAccountID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改回访回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新回访", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新回访ID为 "+ model.getVisitAccountID() + " " + tipMsg + "！", "更新回访" + tipMsg)); - } - - /** - * 批量删除指定ID回访 - * @return - */ - public String batchDelete() - { - try - { - visitAccountService.batchDelete(model.getVisitAccountIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除回访ID为：" + model.getVisitAccountIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除回访", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除回访ID为 "+ model.getVisitAccountIDs() + " " + tipMsg + "！", "批量删除回访" + tipMsg)); - return SUCCESS; - } - - /** - * 查找回访信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - visitAccountService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(VisitAccount visitAccount:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", visitAccount.getId()); - item.put("ProjectId", visitAccount.getDepot().getId()); - item.put("ProjectName", visitAccount.getDepot().getName()); - item.put("LouHao", visitAccount.getLouHao()); - item.put("HuHao", visitAccount.getHuHao()); - item.put("HuiFang", visitAccount.getHuiFang()); - item.put("LuoShi", visitAccount.getLuoShi()); - item.put("Name", visitAccount.getName()); - item.put("Tel", visitAccount.getTel()); - item.put("AddTime", visitAccount.getAddTime()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找回访信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询回访信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("ProjectId_n_eq", model.getProjectId()); - condition.put("LouHao_s_like", model.getLouHao()); - condition.put("AddTime_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public VisitAccountModel getModel() - { - return model; - } - public void setVisitAccountService(VisitAccountIService visitAccountService) - { - this.visitAccountService = visitAccountService; - } -} diff --git a/src/com/jsh/action/materials/MaterialAction.java b/src/com/jsh/action/materials/MaterialAction.java index 4b6ccaea..1e2408c9 100644 --- a/src/com/jsh/action/materials/MaterialAction.java +++ b/src/com/jsh/action/materials/MaterialAction.java @@ -1,391 +1,399 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.dao.DataAccessException; - -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.Material; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.MaterialCategory; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.materials.MaterialModel; -import com.jsh.service.materials.MaterialIService; -import com.jsh.util.common.PageUtil; - -@SuppressWarnings("serial") -public class MaterialAction extends BaseAction -{ - private MaterialIService materialService; - private MaterialModel model = new MaterialModel(); - - /** - * 增加物料 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加物料信息方法create()==================="); - Boolean flag = false; - try - { - Material material = new Material(); - material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); - - material.setName(model.getName()); - material.setModel(model.getModel()); - material.setColor(model.getColor()); - material.setUnit(model.getUnit()); - material.setRemark(model.getRemark()); - materialService.create(material); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加物料信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加物料信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加物料", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加物料名称为 "+ model.getName() + " " + tipMsg + "！", "增加物料" + tipMsg)); - Log.infoFileSync("==================结束调用增加物料方法create()==================="); - } - - /** - * 删除物料 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除物料信息方法delete()================"); - try - { - materialService.delete(model.getMaterialID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + " 的物料异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除物料", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除物料ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "删除物料" + tipMsg)); - Log.infoFileSync("====================结束调用删除物料信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新物料 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Material material = materialService.get(model.getMaterialID()); - material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); - - material.setName(model.getName()); - material.setModel(model.getModel()); - material.setColor(model.getColor()); - material.setUnit(model.getUnit()); - material.setRemark(model.getRemark()); - material.setName(model.getName()); - materialService.update(material); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改物料ID为 ： " + model.getMaterialID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改物料回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新物料", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新物料ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "更新物料" + tipMsg)); - } - - /** - * 批量删除指定ID物料 - * @return - */ - public String batchDelete() - { - try - { - materialService.batchDelete(model.getMaterialIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除物料ID为：" + model.getMaterialIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除物料", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除物料ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除物料" + tipMsg)); - return SUCCESS; - } - - /** - * 查找物料信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - Long lei=model.getCategoryId(); - if(1==lei) //判断值还真不能用String类型的判断 - { - pageUtil.setAdvSearch(getCondition_all()); - } - else if(1!=lei) - { - pageUtil.setAdvSearch(getCondition()); - } - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Material material:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", material.getId()); - item.put("Name", material.getName()); - item.put("Model", material.getModel()); - item.put("Color", material.getColor()); - item.put("Unit", material.getUnit()); - item.put("Remark", material.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找物料信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询物料信息结果异常", e); - } - } - - /** - * 查找物料信息-下拉框 - * @return - */ - public void findBySelect() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select()); - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Material material:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", material.getId()); - //供应商名称 - item.put("MaterialName", ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + ((material.getColor() == null)?"":"("+material.getColor() + ")")); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 查找物料信息-统计排序 - * @return - */ - public void findByOrder() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Order()); - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONObject outer = new JSONObject(); - String mId = ""; - if(null != dataList) - { - for(Material material:dataList) - { - mId = mId + material.getId() + ","; - } - } - if(mId!="") { - mId = mId.substring(0, mId.lastIndexOf(",")); - } - outer.put("mIds", mId); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 拼接搜索条件(查全部) - * @return - */ - private Map getCondition_all() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("CategoryId_s_in", model.getCategoryIds()); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框 - * @return - */ - private Map getCondition_Select() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框 - * @return - */ - private Map getCondition_Order() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name,Model_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public MaterialModel getModel() - { - return model; - } - public void setMaterialService(MaterialIService materialService) - { - this.materialService = materialService; - } -} +package com.jsh.action.materials; + +import java.io.IOException; +import java.sql.Timestamp; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.springframework.dao.DataAccessException; + +import com.jsh.base.BaseAction; +import com.jsh.base.Log; +import com.jsh.model.po.DepotHead; +import com.jsh.model.po.Material; +import com.jsh.model.po.Logdetails; +import com.jsh.model.po.MaterialCategory; +import com.jsh.model.po.Supplier; +import com.jsh.model.vo.materials.MaterialModel; +import com.jsh.service.materials.MaterialIService; +import com.jsh.util.common.PageUtil; + +@SuppressWarnings("serial") +public class MaterialAction extends BaseAction +{ + private MaterialIService materialService; + private MaterialModel model = new MaterialModel(); + + /** + * 增加商品 + * @return + */ + public void create() + { + Log.infoFileSync("==================开始调用增加商品信息方法create()==================="); + Boolean flag = false; + try + { + Material material = new Material(); + material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); + + material.setName(model.getName()); + material.setModel(model.getModel()); + material.setColor(model.getColor()); + material.setUnit(model.getUnit()); + material.setRetailPrice(model.getRetailPrice()); + material.setLowPrice(model.getLowPrice()); + material.setPresetPriceOne(model.getPresetPriceOne()); + material.setPresetPriceTwo(model.getPresetPriceTwo()); + material.setRemark(model.getRemark()); + materialService.create(material); + + //========标识位=========== + flag = true; + //记录操作日志使用 + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品信息异常", e); + flag = false; + tipMsg = "失败"; + tipType = 1; + } + finally + { + try + { + toClient(flag.toString()); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>增加商品信息回写客户端结果异常", e); + } + } + + logService.create(new Logdetails(getUser(), "增加商品", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "增加商品名称为 "+ model.getName() + " " + tipMsg + "！", "增加商品" + tipMsg)); + Log.infoFileSync("==================结束调用增加商品方法create()==================="); + } + + /** + * 删除商品 + * @return + */ + public String delete() + { + Log.infoFileSync("====================开始调用删除商品信息方法delete()================"); + try + { + materialService.delete(model.getMaterialID()); + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + " 的商品异常", e); + tipMsg = "失败"; + tipType = 1; + } + model.getShowModel().setMsgTip(tipMsg); + logService.create(new Logdetails(getUser(), "删除商品", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "删除商品ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "删除商品" + tipMsg)); + Log.infoFileSync("====================结束调用删除商品信息方法delete()================"); + return SUCCESS; + } + + /** + * 更新商品 + * @return + */ + public void update() + { + Boolean flag = false; + try + { + Material material = materialService.get(model.getMaterialID()); + material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); + + material.setName(model.getName()); + material.setModel(model.getModel()); + material.setColor(model.getColor()); + material.setUnit(model.getUnit()); + material.setRetailPrice(model.getRetailPrice()); + material.setLowPrice(model.getLowPrice()); + material.setPresetPriceOne(model.getPresetPriceOne()); + material.setPresetPriceTwo(model.getPresetPriceTwo()); + material.setRemark(model.getRemark()); + material.setName(model.getName()); + materialService.update(material); + + flag = true; + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>修改商品ID为 ： " + model.getMaterialID() + "信息失败", e); + flag = false; + tipMsg = "失败"; + tipType = 1; + } + finally + { + try + { + toClient(flag.toString()); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>修改商品回写客户端结果异常", e); + } + } + logService.create(new Logdetails(getUser(), "更新商品", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "更新商品ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "更新商品" + tipMsg)); + } + + /** + * 批量删除指定ID商品 + * @return + */ + public String batchDelete() + { + try + { + materialService.batchDelete(model.getMaterialIDs()); + model.getShowModel().setMsgTip("成功"); + //记录操作日志使用 + tipMsg = "成功"; + tipType = 0; + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>批量删除商品ID为：" + model.getMaterialIDs() + "信息异常", e); + tipMsg = "失败"; + tipType = 1; + } + + logService.create(new Logdetails(getUser(), "批量删除商品", model.getClientIp(), + new Timestamp(System.currentTimeMillis()) + , tipType, "批量删除商品ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除商品" + tipMsg)); + return SUCCESS; + } + + /** + * 查找商品信息 + * @return + */ + public void findBy() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(model.getPageSize()); + pageUtil.setCurPage(model.getPageNo()); + Long lei=model.getCategoryId(); + if(1==lei) //判断值还真不能用String类型的判断 + { + pageUtil.setAdvSearch(getCondition_all()); + } + else if(1!=lei) + { + pageUtil.setAdvSearch(getCondition()); + } + materialService.find(pageUtil); + List dataList = pageUtil.getPageList(); + + JSONObject outer = new JSONObject(); + outer.put("total", pageUtil.getTotalCount()); + //存放数据json数组 + JSONArray dataArray = new JSONArray(); + if(null != dataList) + { + for(Material material:dataList) + { + JSONObject item = new JSONObject(); + item.put("Id", material.getId()); + item.put("Name", material.getName()); + item.put("Model", material.getModel()); + item.put("Color", material.getColor()); + item.put("Unit", material.getUnit()); + item.put("RetailPrice", material.getRetailPrice()); + item.put("LowPrice", material.getLowPrice()); + item.put("PresetPriceOne", material.getPresetPriceOne()); + item.put("PresetPriceTwo", material.getPresetPriceTwo()); + item.put("Remark", material.getRemark()); + item.put("op", 1); + dataArray.add(item); + } + } + outer.put("rows", dataArray); + //回写查询结果 + toClient(outer.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e); + } + } + + /** + * 查找商品信息-下拉框 + * @return + */ + public void findBySelect() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + pageUtil.setAdvSearch(getCondition_Select()); + materialService.find(pageUtil); + List dataList = pageUtil.getPageList(); + //存放数据json数组 + JSONArray dataArray = new JSONArray(); + if(null != dataList) + { + for(Material material:dataList) + { + JSONObject item = new JSONObject(); + item.put("Id", material.getId()); + //名称 + item.put("MaterialName", ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + ((material.getColor() == null)?"":"("+material.getColor() + ")")); + dataArray.add(item); + } + } + //回写查询结果 + toClient(dataArray.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); + } + } + + /** + * 查找商品信息-统计排序 + * @return + */ + public void findByOrder() + { + try + { + PageUtil pageUtil = new PageUtil(); + pageUtil.setPageSize(0); + pageUtil.setCurPage(0); + pageUtil.setAdvSearch(getCondition_Order()); + materialService.find(pageUtil); + List dataList = pageUtil.getPageList(); + //存放数据json数组 + JSONObject outer = new JSONObject(); + String mId = ""; + if(null != dataList) + { + for(Material material:dataList) + { + mId = mId + material.getId() + ","; + } + } + if(mId!="") { + mId = mId.substring(0, mId.lastIndexOf(",")); + } + outer.put("mIds", mId); + //回写查询结果 + toClient(outer.toString()); + } + catch (DataAccessException e) + { + Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); + } + catch (IOException e) + { + Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); + } + } + + /** + * 拼接搜索条件(查全部) + * @return + */ + private Map getCondition_all() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("Id_s_order", "asc"); + return condition; + } + + /** + * 拼接搜索条件 + * @return + */ + private Map getCondition() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("CategoryId_s_in", model.getCategoryIds()); + condition.put("Id_s_order", "asc"); + return condition; + } + + /** + * 拼接搜索条件-下拉框 + * @return + */ + private Map getCondition_Select() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("Id_s_order", "asc"); + return condition; + } + + /** + * 拼接搜索条件-下拉框 + * @return + */ + private Map getCondition_Order() + { + /** + * 拼接搜索条件 + */ + Map condition = new HashMap(); + condition.put("Name,Model_s_order", "asc"); + return condition; + } + + //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== + @Override + public MaterialModel getModel() + { + return model; + } + public void setMaterialService(MaterialIService materialService) + { + this.materialService = materialService; + } +} diff --git a/src/com/jsh/action/materials/MaterialCategoryAction.java b/src/com/jsh/action/materials/MaterialCategoryAction.java index 32b8af89..19b5e403 100644 --- a/src/com/jsh/action/materials/MaterialCategoryAction.java +++ b/src/com/jsh/action/materials/MaterialCategoryAction.java @@ -44,19 +44,19 @@ public class MaterialCategoryAction extends BaseAction } catch (Exception e) { - Log.errorFileSync(">>>>>>>>>>>>>查找物料类别信息异常", e); + Log.errorFileSync(">>>>>>>>>>>>>查找商品类别信息异常", e); model.getShowModel().setMsgTip("exceptoin"); } return SUCCESS; } /** - * 增加物料类别 + * 增加商品类别 * @return */ public void create() { - Log.infoFileSync("==================开始调用增加物料类别信息方法create()==================="); + Log.infoFileSync("==================开始调用增加商品类别信息方法create()==================="); Boolean flag = false; try { @@ -75,7 +75,7 @@ public class MaterialCategoryAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加物料类别信息异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品类别信息异常", e); flag = false; tipMsg = "失败"; tipType = 1; @@ -88,23 +88,23 @@ public class MaterialCategoryAction extends BaseAction } catch (IOException e) { - Log.errorFileSync(">>>>>>>>>>>>增加物料类别信息回写客户端结果异常", e); + Log.errorFileSync(">>>>>>>>>>>>增加商品类别信息回写客户端结果异常", e); } } - logService.create(new Logdetails(getUser(), "增加物料类别", model.getClientIp(), + logService.create(new Logdetails(getUser(), "增加商品类别", model.getClientIp(), new Timestamp(System.currentTimeMillis()) - , tipType, "增加物料类别名称为 "+ model.getName() + " " + tipMsg + "！", "增加物料类别" + tipMsg)); - Log.infoFileSync("==================结束调用增加物料类别方法create()==================="); + , tipType, "增加商品类别名称为 "+ model.getName() + " " + tipMsg + "！", "增加商品类别" + tipMsg)); + Log.infoFileSync("==================结束调用增加商品类别方法create()==================="); } /** - * 删除物料类别 + * 删除商品类别 * @return */ public String delete() { - Log.infoFileSync("====================开始调用删除物料类别信息方法delete()================"); + Log.infoFileSync("====================开始调用删除商品类别信息方法delete()================"); try { materialCategoryService.delete(model.getMaterialCategoryID()); @@ -113,20 +113,20 @@ public class MaterialCategoryAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + " 的物料类别异常", e); + Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + " 的商品类别异常", e); tipMsg = "失败"; tipType = 1; } model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除物料类别", model.getClientIp(), + logService.create(new Logdetails(getUser(), "删除商品类别", model.getClientIp(), new Timestamp(System.currentTimeMillis()) - , tipType, "删除物料类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "删除物料类别" + tipMsg)); - Log.infoFileSync("====================结束调用删除物料类别信息方法delete()================"); + , tipType, "删除商品类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "删除商品类别" + tipMsg)); + Log.infoFileSync("====================结束调用删除商品类别信息方法delete()================"); return SUCCESS; } /** - * 更新物料类别 + * 更新商品类别 * @return */ public void update() @@ -147,7 +147,7 @@ public class MaterialCategoryAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>修改物料类别ID为 ： " + model.getMaterialCategoryID() + "信息失败", e); + Log.errorFileSync(">>>>>>>>>>>>>修改商品类别ID为 ： " + model.getMaterialCategoryID() + "信息失败", e); flag = false; tipMsg = "失败"; tipType = 1; @@ -160,16 +160,16 @@ public class MaterialCategoryAction extends BaseAction } catch (IOException e) { - Log.errorFileSync(">>>>>>>>>>>>修改物料类别回写客户端结果异常", e); + Log.errorFileSync(">>>>>>>>>>>>修改商品类别回写客户端结果异常", e); } } - logService.create(new Logdetails(getUser(), "更新物料类别", model.getClientIp(), + logService.create(new Logdetails(getUser(), "更新商品类别", model.getClientIp(), new Timestamp(System.currentTimeMillis()) - , tipType, "更新物料类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "更新物料类别" + tipMsg)); + , tipType, "更新商品类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "更新商品类别" + tipMsg)); } /** - * 批量删除指定ID物料类别 + * 批量删除指定ID商品类别 * @return */ public String batchDelete() @@ -184,19 +184,19 @@ public class MaterialCategoryAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>批量删除物料类别ID为：" + model.getMaterialCategoryIDs() + "信息异常", e); + Log.errorFileSync(">>>>>>>>>>>批量删除商品类别ID为：" + model.getMaterialCategoryIDs() + "信息异常", e); tipMsg = "失败"; tipType = 1; } - logService.create(new Logdetails(getUser(), "批量删除物料类别", model.getClientIp(), + logService.create(new Logdetails(getUser(), "批量删除商品类别", model.getClientIp(), new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除物料类别ID为 "+ model.getMaterialCategoryIDs() + " " + tipMsg + "！", "批量删除物料类别" + tipMsg)); + , tipType, "批量删除商品类别ID为 "+ model.getMaterialCategoryIDs() + " " + tipMsg + "！", "批量删除商品类别" + tipMsg)); return SUCCESS; } /** - * 查找物料类别信息 + * 查找商品类别信息 * @return */ public void findBy() @@ -238,11 +238,11 @@ public class MaterialCategoryAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找物料类别信息异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e); } catch (IOException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询物料类别信息结果异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e); } } diff --git a/src/com/jsh/base/BaseDAO.java b/src/com/jsh/base/BaseDAO.java index 314d7c75..3cee9ec6 100644 --- a/src/com/jsh/base/BaseDAO.java +++ b/src/com/jsh/base/BaseDAO.java @@ -1,137 +1,140 @@ -package com.jsh.base; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import org.hibernate.Query; -import org.springframework.dao.DataAccessException; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import com.jsh.util.common.PageUtil; -import com.jsh.util.common.SearchConditionUtil; - -public class BaseDAO extends HibernateDaoSupport implements BaseIDAO -{ - protected Class entityClass; - - public void setPoJoClass(Class c) - { - this.entityClass = c; - } - - protected Class getEntityClass() - { - return this.entityClass; - } - - @Override - public Serializable create(T t) throws DataAccessException - { - return this.getHibernateTemplate().save(t); - } - - @Override - public void delete(T t) throws DataAccessException - { - this.getHibernateTemplate().delete(t); - } - - @Override - public T get(Long objID) throws DataAccessException - { - return (T) this.getHibernateTemplate().get(getEntityClass(), objID); - } - - @Override - public void update(T t) throws DataAccessException - { - this.getHibernateTemplate().update(t); - } - - @Override - public void batchDelete(String objIDs) throws DataAccessException - { - this.getHibernateTemplate().bulkUpdate("delete from " + getEntityClass().getName() + " where id in ("+ objIDs + ")"); - } - - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil) throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ - SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - - // 分页查询 - int pageNo = pageUtil.getCurPage(); - int pageSize = pageUtil.getPageSize(); - if (0 != pageNo && 0 != pageSize) - { - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - } - pageUtil.setPageList(query.list()); - } - - @SuppressWarnings("unchecked") - @Override - public List find(Map conditon)throws DataAccessException - { - return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); - } - - @SuppressWarnings("unchecked") - @Override - public List find(String hql) throws DataAccessException - { - return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ hql); - } - - @SuppressWarnings("unchecked") - @Override - public List find(Map conditon, int pageSize, int pageNo)throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - return query.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List find(String hql, int pageSize, int pageNo)throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql); - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - return query.list(); - } - - @SuppressWarnings("unchecked") - @Override - public Integer countSum(Map conditon)throws DataAccessException - { - List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)).list(); - return dataList ==null?0:dataList.size(); - } - - @SuppressWarnings("unchecked") - @Override - public Integer countSum(String hql) throws DataAccessException - { - List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql).list(); - return dataList ==null?0:dataList.size(); - } - - @Override - public void save(T t) throws DataAccessException - { - this.getHibernateTemplate().save(t); - } -} +package com.jsh.base; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.springframework.dao.DataAccessException; +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +import com.jsh.util.common.PageUtil; +import com.jsh.util.common.SearchConditionUtil; +/** + * 基础dao + * @author ji_sheng_hua + */ +public class BaseDAO extends HibernateDaoSupport implements BaseIDAO +{ + protected Class entityClass; + + public void setPoJoClass(Class c) + { + this.entityClass = c; + } + + protected Class getEntityClass() + { + return this.entityClass; + } + + @Override + public Serializable create(T t) throws DataAccessException + { + return this.getHibernateTemplate().save(t); + } + + @Override + public void delete(T t) throws DataAccessException + { + this.getHibernateTemplate().delete(t); + } + + @Override + public T get(Long objID) throws DataAccessException + { + return (T) this.getHibernateTemplate().get(getEntityClass(), objID); + } + + @Override + public void update(T t) throws DataAccessException + { + this.getHibernateTemplate().update(t); + } + + @Override + public void batchDelete(String objIDs) throws DataAccessException + { + this.getHibernateTemplate().bulkUpdate("delete from " + getEntityClass().getName() + " where id in ("+ objIDs + ")"); + } + + @SuppressWarnings("unchecked") + @Override + public void find(PageUtil pageUtil) throws DataAccessException + { + Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() + .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); + pageUtil.setTotalCount(query.list().size()); + + // 分页查询 + int pageNo = pageUtil.getCurPage(); + int pageSize = pageUtil.getPageSize(); + if (0 != pageNo && 0 != pageSize) + { + query.setFirstResult((pageNo - 1) * pageSize); + query.setMaxResults(pageSize); + } + pageUtil.setPageList(query.list()); + } + + @SuppressWarnings("unchecked") + @Override + public List find(Map conditon)throws DataAccessException + { + return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); + } + + @SuppressWarnings("unchecked") + @Override + public List find(String hql) throws DataAccessException + { + return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ hql); + } + + @SuppressWarnings("unchecked") + @Override + public List find(Map conditon, int pageSize, int pageNo)throws DataAccessException + { + Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() + .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); + query.setFirstResult((pageNo - 1) * pageSize); + query.setMaxResults(pageSize); + return query.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List find(String hql, int pageSize, int pageNo)throws DataAccessException + { + Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() + .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql); + query.setFirstResult((pageNo - 1) * pageSize); + query.setMaxResults(pageSize); + return query.list(); + } + + @SuppressWarnings("unchecked") + @Override + public Integer countSum(Map conditon)throws DataAccessException + { + List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() + .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)).list(); + return dataList ==null?0:dataList.size(); + } + + @SuppressWarnings("unchecked") + @Override + public Integer countSum(String hql) throws DataAccessException + { + List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() + .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql).list(); + return dataList ==null?0:dataList.size(); + } + + @Override + public void save(T t) throws DataAccessException + { + this.getHibernateTemplate().save(t); + } +} diff --git a/src/com/jsh/base/BaseIDAO.java b/src/com/jsh/base/BaseIDAO.java index 562cdaae..06efdc16 100644 --- a/src/com/jsh/base/BaseIDAO.java +++ b/src/com/jsh/base/BaseIDAO.java @@ -10,7 +10,7 @@ import com.jsh.util.common.PageUtil; /** * 常用增删改查操作 - * @author jishenghua + * @author ji-sheng-hua * @param */ public interface BaseIDAO diff --git a/src/com/jsh/base/Log.java b/src/com/jsh/base/Log.java index eb3a23af..58ffb9af 100644 --- a/src/com/jsh/base/Log.java +++ b/src/com/jsh/base/Log.java @@ -4,7 +4,7 @@ import org.apache.log4j.Logger; /** * 封装log4j日志信息，打印日志信息类 - * @author jishenghua + * @author ji/sheng/hua * @since 2014-01-22 */ public class Log diff --git a/src/com/jsh/dao/basic/VisitAccountDAO.java b/src/com/jsh/dao/basic/VisitAccountDAO.java deleted file mode 100644 index e37ec20d..00000000 --- a/src/com/jsh/dao/basic/VisitAccountDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.VisitAccount; - -public class VisitAccountDAO extends BaseDAO implements VisitAccountIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return VisitAccount.class; - } -} diff --git a/src/com/jsh/dao/basic/VisitAccountIDAO.java b/src/com/jsh/dao/basic/VisitAccountIDAO.java deleted file mode 100644 index 212b0c8b..00000000 --- a/src/com/jsh/dao/basic/VisitAccountIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.VisitAccount; - -public interface VisitAccountIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/model/po/Material.hbm.xml b/src/com/jsh/model/po/Material.hbm.xml index 19a0d8e8..4b947e83 100644 --- a/src/com/jsh/model/po/Material.hbm.xml +++ b/src/com/jsh/model/po/Material.hbm.xml @@ -1,39 +1,59 @@ - - - - - - - - - - - - - - 名称 - - - - - 型号 - - - - - 颜色 - - - - - 单位 - - - - - 备注 - - - - + + + + + + + + + + + + + + 名称 + + + + + 型号 + + + + + 颜色 + + + + + 单位 + + + + + 零售价 + + + + + 最低售价 + + + + + 预设售价一 + + + + + 预设售价二 + + + + + 备注 + + + + diff --git a/src/com/jsh/model/po/Material.java b/src/com/jsh/model/po/Material.java index 5861586e..fa8dd352 100644 --- a/src/com/jsh/model/po/Material.java +++ b/src/com/jsh/model/po/Material.java @@ -1,91 +1,155 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Material implements java.io.Serializable -{ - private Long Id; - private MaterialCategory materialCategory; - private String Name; - private String Model; - private String Color; - private String Unit; - private String Remark; - - public Material() - { - - } - - public Material(Long Id) - { - this.Id = Id; - } - - public Material(MaterialCategory materialCategory, String name, - String model, String color, String unit, String remark) { - super(); - this.materialCategory = materialCategory; - Name = name; - Model = model; - Color = color; - Unit = unit; - Remark = remark; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public MaterialCategory getMaterialCategory() { - return materialCategory; - } - - public void setMaterialCategory(MaterialCategory materialCategory) { - this.materialCategory = materialCategory; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getModel() { - return Model; - } - - public void setModel(String model) { - Model = model; - } - - public String getColor() { - return Color; - } - - public void setColor(String color) { - Color = color; - } - - public String getUnit() { - return Unit; - } - - public void setUnit(String unit) { - Unit = unit; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - -} \ No newline at end of file +package com.jsh.model.po; + +@SuppressWarnings("serial") +public class Material implements java.io.Serializable +{ + private Long Id; + private MaterialCategory materialCategory; + private String Name; + private String Model; + private String Color; + private String Unit; + private Double RetailPrice; + private Double LowPrice; + private Double PresetPriceOne; + private Double PresetPriceTwo; + private String Remark; + + public Material() + { + + } + + public Material(Long Id) + { + this.Id = Id; + } + + public Material(MaterialCategory materialCategory, String name, + String model, String color, String unit, String remark, + Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo) + { + super(); + this.materialCategory = materialCategory; + Name = name; + Model = model; + Color = color; + Unit = unit; + RetailPrice = retailPrice; + LowPrice = lowPrice; + PresetPriceOne = presetPriceOne; + PresetPriceTwo = presetPriceTwo; + Remark = remark; + } + + public Long getId() + { + return Id; + } + + public void setId(Long id) + { + Id = id; + } + + public MaterialCategory getMaterialCategory() + { + return materialCategory; + } + + public void setMaterialCategory(MaterialCategory materialCategory) + { + this.materialCategory = materialCategory; + } + + public String getName() + { + return Name; + } + + public void setName(String name) + { + Name = name; + } + + public String getModel() + { + return Model; + } + + public void setModel(String model) + { + Model = model; + } + + public String getColor() + { + return Color; + } + + public void setColor(String color) + { + Color = color; + } + + public String getUnit() + { + return Unit; + } + + public void setUnit(String unit) + { + Unit = unit; + } + + public void setRetailPrice(Double retailPrice) + { + RetailPrice = retailPrice; + } + + public Double getRetailPrice() + { + return RetailPrice; + } + + public void setLowPrice(Double lowPrice) + { + LowPrice = lowPrice; + } + + public Double getLowPrice() + { + return LowPrice; + } + + public void setPresetPriceOne(Double presetPriceOne) + { + PresetPriceOne = presetPriceOne; + } + + public Double getPresetPriceOne() + { + return PresetPriceOne; + } + + public void setPresetPriceTwo(Double presetPriceTwo) + { + PresetPriceTwo = presetPriceTwo; + } + + public Double getPresetPriceTwo() + { + return PresetPriceTwo; + } + + public String getRemark() + { + return Remark; + } + + public void setRemark(String remark) + { + Remark = remark; + } + +} diff --git a/src/com/jsh/model/po/Supplier.hbm.xml b/src/com/jsh/model/po/Supplier.hbm.xml index f08bf17d..c4410ec7 100644 --- a/src/com/jsh/model/po/Supplier.hbm.xml +++ b/src/com/jsh/model/po/Supplier.hbm.xml @@ -1,49 +1,69 @@ - - - - - - - - - - - 供应商名称 - - - - - 类型 - - - - - 联系人 - - - - - 联系电话 - - - - - 电子邮箱 - - - - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 启用 - - - - \ No newline at end of file + + + + + + + + + + + 供应商名称 + + + + + 类型 + + + + + 联系人 + + + + + 联系电话 + + + + + 电子邮箱 + + + + + 期初应收 + + + + + 期初应付 + + + + + 累计应收 + + + + + 累计应付 + + + + + + + + 是否系统自带 0==系统 1==非系统 + + + + + 启用 + + + + diff --git a/src/com/jsh/model/po/Supplier.java b/src/com/jsh/model/po/Supplier.java index 0d297f9e..2578eb99 100644 --- a/src/com/jsh/model/po/Supplier.java +++ b/src/com/jsh/model/po/Supplier.java @@ -9,6 +9,10 @@ public class Supplier implements java.io.Serializable private String contacts; private String phonenum; private String email; + private Double BeginNeedGet; + private Double BeginNeedPay; + private Double AllNeedGet; + private Double AllNeedPay; private Short isystem; private String description; private Boolean enabled; @@ -23,29 +27,36 @@ public class Supplier implements java.io.Serializable this.id = id; } - public Supplier(String supplier, String type, String contacts, - String phonenum, String email, Short isystem, String description, - Boolean enabled) { + public Supplier(String supplier, String type, String contacts, String phonenum, + String email, Short isystem, String description, Boolean enabled, + Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) { super(); this.supplier = supplier; this.type = type; this.contacts = contacts; this.phonenum = phonenum; this.email = email; + this.BeginNeedGet = beginNeedGet; + this.BeginNeedPay = beginNeedPay; + this.AllNeedGet = allNeedGet; + this.AllNeedPay = allNeedPay; this.isystem = isystem; this.description = description; this.enabled = enabled; } - public Long getId() { + public Long getId() + { return id; } - public void setId(Long id) { + public void setId(Long id) + { this.id = id; } - public String getSupplier() { + public String getSupplier() + { return supplier; } @@ -84,6 +95,46 @@ public class Supplier implements java.io.Serializable public void setEmail(String email) { this.email = email; } + + public void setBeginNeedGet(Double beginNeedGet) + { + BeginNeedGet = beginNeedGet; + } + + public Double getBeginNeedGet() + { + return BeginNeedGet; + } + + public void setBeginNeedPay(Double beginNeedPay) + { + BeginNeedPay = beginNeedPay; + } + + public Double getBeginNeedPay() + { + return BeginNeedPay; + } + + public void setAllNeedGet(Double allNeedGet) + { + AllNeedGet = allNeedGet; + } + + public Double getAllNeedGet() + { + return AllNeedGet; + } + + public void setAllNeedPay(Double allNeedPay) + { + AllNeedPay = allNeedPay; + } + + public Double getAllNeedPay() + { + return AllNeedPay; + } public Short getIsystem() { return isystem; @@ -107,8 +158,6 @@ public class Supplier implements java.io.Serializable public void setEnabled(Boolean enabled) { this.enabled = enabled; - } - - - -} \ No newline at end of file + } + +} diff --git a/src/com/jsh/model/po/VisitAccount.hbm.xml b/src/com/jsh/model/po/VisitAccount.hbm.xml deleted file mode 100644 index fb1bfab5..00000000 --- a/src/com/jsh/model/po/VisitAccount.hbm.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - 楼号 - - - - - 户号 - - - - - 回访情况 - - - - - 落实情况 - - - - - 住户姓名 - - - - - 电话 - - - - - 时间 - - - - diff --git a/src/com/jsh/model/po/VisitAccount.java b/src/com/jsh/model/po/VisitAccount.java deleted file mode 100644 index be972e85..00000000 --- a/src/com/jsh/model/po/VisitAccount.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.jsh.model.po; - -import java.sql.Timestamp; - -@SuppressWarnings("serial") -public class VisitAccount implements java.io.Serializable -{ - private Long Id; - private Depot depot; - private String LouHao; - private String HuHao; - private String HuiFang; - private String LuoShi; - private String Name; - private String Tel; - private Timestamp AddTime; - - public VisitAccount() - { - - } - - public VisitAccount(Long Id) - { - this.Id = Id; - } - - public VisitAccount(Depot depot, String LouHao, String HuHao, - String HuiFang,String LuoShi,String Name,String Tel,Timestamp AddTime) - { - this.depot = depot; - this.LouHao = LouHao; - this.HuHao = HuHao; - this.HuiFang = HuiFang; - this.LuoShi = LuoShi; - this.Name = Name; - this.Tel = Tel; - this.AddTime = AddTime; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public Depot getDepot() { - return depot; - } - - public void setDepot(Depot depot) { - this.depot = depot; - } - - public String getLouHao() { - return LouHao; - } - - public void setLouHao(String louHao) { - LouHao = louHao; - } - - public String getHuHao() { - return HuHao; - } - - public void setHuHao(String huHao) { - HuHao = huHao; - } - - public String getHuiFang() { - return HuiFang; - } - - public void setHuiFang(String huiFang) { - HuiFang = huiFang; - } - - public String getLuoShi() { - return LuoShi; - } - - public void setLuoShi(String luoShi) { - LuoShi = luoShi; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getTel() { - return Tel; - } - - public void setTel(String tel) { - Tel = tel; - } - - public Timestamp getAddTime() { - return AddTime; - } - - public void setAddTime(Timestamp addTime) { - AddTime = addTime; - } - - -} \ No newline at end of file diff --git a/src/com/jsh/model/vo/basic/SupplierModel.java b/src/com/jsh/model/vo/basic/SupplierModel.java index 53ab8962..8ab7317c 100644 --- a/src/com/jsh/model/vo/basic/SupplierModel.java +++ b/src/com/jsh/model/vo/basic/SupplierModel.java @@ -1,177 +1,237 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class SupplierModel implements Serializable -{ - private SupplierShowModel showModel = new SupplierShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 供应商名称 - */ - private String supplier = ""; - - /** - * 类型 - */ - private String type = ""; - - /** - * 联系人 - */ - private String contacts = ""; - - /** - * 联系电话 - */ - private String phonenum = ""; - - /** - * 电子邮箱 - */ - private String email = ""; - - /** - * 描述信息 - */ - private String description = ""; - - /** - * 启用 - */ - private Boolean enabled = false; - - /** - * 供应商ID - */ - private Long supplierID = 0l; - - /** - * 供应商IDs 批量操作使用 - */ - private String supplierIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public SupplierShowModel getShowModel() { - return showModel; - } - - public void setShowModel(SupplierShowModel showModel) { - this.showModel = showModel; - } - - public String getSupplier() { - return supplier; - } - - public void setSupplier(String supplier) { - this.supplier = supplier; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getContacts() { - return contacts; - } - - public void setContacts(String contacts) { - this.contacts = contacts; - } - - public String getPhonenum() { - return phonenum; - } - - public void setPhonenum(String phonenum) { - this.phonenum = phonenum; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Boolean getEnabled() { - return enabled; - } - - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } - - public Long getSupplierID() { - return supplierID; - } - - public void setSupplierID(Long supplierID) { - this.supplierID = supplierID; - } - - public String getSupplierIDs() { - return supplierIDs; - } - - public void setSupplierIDs(String supplierIDs) { - this.supplierIDs = supplierIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - - -} +package com.jsh.model.vo.basic; + +import java.io.Serializable; + +@SuppressWarnings("serial") +public class SupplierModel implements Serializable +{ + private SupplierShowModel showModel = new SupplierShowModel(); + + /**======开始接受页面参数=================**/ + /** + * 供应商名称 + */ + private String supplier = ""; + + /** + * 类型 + */ + private String type = ""; + + /** + * 联系人 + */ + private String contacts = ""; + + /** + * 联系电话 + */ + private String phonenum = ""; + + /** + * 电子邮箱 + */ + private String email = ""; + + /** + * 期初应收 + */ + private Double BeginNeedGet; + + /** + * 期初应付 + */ + private Double BeginNeedPay; + + /** + * 累计应收 + */ + private Double AllNeedGet; + + /** + * 累计应付 + */ + private Double AllNeedPay; + + /** + * 描述信息 + */ + private String description = ""; + + /** + * 启用 + */ + private Boolean enabled = false; + + /** + * 供应商ID + */ + private Long supplierID = 0l; + + /** + * 供应商IDs 批量操作使用 + */ + private String supplierIDs = ""; + + /** + * 每页显示的个数 + */ + private int pageSize = 10; + + /** + * 当前页码 + */ + private int pageNo = 1; + + /** + * 用户IP，用户记录操作日志 + */ + private String clientIp = ""; + + public SupplierShowModel getShowModel() { + return showModel; + } + + public void setShowModel(SupplierShowModel showModel) { + this.showModel = showModel; + } + + public String getSupplier() { + return supplier; + } + + public void setSupplier(String supplier) { + this.supplier = supplier; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getContacts() { + return contacts; + } + + public void setContacts(String contacts) { + this.contacts = contacts; + } + + public String getPhonenum() { + return phonenum; + } + + public void setPhonenum(String phonenum) { + this.phonenum = phonenum; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public void setBeginNeedGet(Double beginNeedGet) + { + BeginNeedGet = beginNeedGet; + } + + public Double getBeginNeedGet() + { + return BeginNeedGet; + } + + public void setBeginNeedPay(Double beginNeedPay) + { + BeginNeedPay = beginNeedPay; + } + + public Double getBeginNeedPay() + { + return BeginNeedPay; + } + + public void setAllNeedGet(Double allNeedGet) + { + AllNeedGet = allNeedGet; + } + + public Double getAllNeedGet() + { + return AllNeedGet; + } + + public void setAllNeedPay(Double allNeedPay) + { + AllNeedPay = allNeedPay; + } + + public Double getAllNeedPay() + { + return AllNeedPay; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getEnabled() { + return enabled; + } + + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + public Long getSupplierID() { + return supplierID; + } + + public void setSupplierID(Long supplierID) { + this.supplierID = supplierID; + } + + public String getSupplierIDs() { + return supplierIDs; + } + + public void setSupplierIDs(String supplierIDs) { + this.supplierIDs = supplierIDs; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageNo() { + return pageNo; + } + + public void setPageNo(int pageNo) { + this.pageNo = pageNo; + } + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + + + +} diff --git a/src/com/jsh/model/vo/basic/VisitAccountModel.java b/src/com/jsh/model/vo/basic/VisitAccountModel.java deleted file mode 100644 index 8b0f5214..00000000 --- a/src/com/jsh/model/vo/basic/VisitAccountModel.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class VisitAccountModel implements Serializable -{ - private VisitAccountShowModel showModel = new VisitAccountShowModel(); - - /**======开始接受页面参数=================**/ - /** - * ProjectId - */ - private Long ProjectId; - /** - * 楼号 - */ - private String LouHao = ""; - /** - * 户号 - */ - private String HuHao = ""; - /** - * 回访情况 - */ - private String HuiFang = ""; - /** - * 落实情况 - */ - private String LuoShi = ""; - /** - * 住户姓名 - */ - private String Name = ""; - /** - * 电话 - */ - private String Tel = ""; - /** - * 时间 - */ - private String AddTime = ""; - - /** - * 分类ID - */ - private Long visitAccountID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String visitAccountIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - - public VisitAccountShowModel getShowModel() { - return showModel; - } - - public void setShowModel(VisitAccountShowModel showModel) { - this.showModel = showModel; - } - - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - - public String getLouHao() { - return LouHao; - } - - public void setLouHao(String louHao) { - LouHao = louHao; - } - - public String getHuHao() { - return HuHao; - } - - public void setHuHao(String huHao) { - HuHao = huHao; - } - - public String getHuiFang() { - return HuiFang; - } - - public void setHuiFang(String huiFang) { - HuiFang = huiFang; - } - - public String getLuoShi() { - return LuoShi; - } - - public void setLuoShi(String luoShi) { - LuoShi = luoShi; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getTel() { - return Tel; - } - - public void setTel(String tel) { - Tel = tel; - } - - public String getAddTime() { - return AddTime; - } - - public void setAddTime(String addTime) { - AddTime = addTime; - } - - public Long getVisitAccountID() { - return visitAccountID; - } - - public void setVisitAccountID(Long visitAccountID) { - this.visitAccountID = visitAccountID; - } - - public String getVisitAccountIDs() { - return visitAccountIDs; - } - - public void setVisitAccountIDs(String visitAccountIDs) { - this.visitAccountIDs = visitAccountIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - - -} diff --git a/src/com/jsh/model/vo/basic/VisitAccountShowModel.java b/src/com/jsh/model/vo/basic/VisitAccountShowModel.java deleted file mode 100644 index e34890ba..00000000 --- a/src/com/jsh/model/vo/basic/VisitAccountShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class VisitAccountShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/materials/MaterialModel.java b/src/com/jsh/model/vo/materials/MaterialModel.java index d96f6b2c..0cc7bb51 100644 --- a/src/com/jsh/model/vo/materials/MaterialModel.java +++ b/src/com/jsh/model/vo/materials/MaterialModel.java @@ -1,175 +1,235 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class MaterialModel implements Serializable -{ - private MaterialShowModel showModel = new MaterialShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String Name = ""; - - /** - * 型号 - */ - private String Model = ""; - - /** - * 颜色 - */ - private String Color = ""; - - /** - * 单位 - */ - private String Unit = ""; - - /** - * 备注 - */ - private String Remark = ""; - - /** - * CategoryId - */ - private Long CategoryId; - - /** - * CategoryIds 用于in子查询 - */ - private String CategoryIds = "1"; - - /** - * 分类ID - */ - private Long materialID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String materialIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public MaterialShowModel getShowModel() { - return showModel; - } - - public void setShowModel(MaterialShowModel showModel) { - this.showModel = showModel; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getModel() { - return Model; - } - - public void setModel(String model) { - Model = model; - } - - public String getColor() { - return Color; - } - - public void setColor(String color) { - Color = color; - } - - public String getUnit() { - return Unit; - } - - public void setUnit(String unit) { - Unit = unit; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Long getCategoryId() { - return CategoryId; - } - - public void setCategoryId(Long categoryId) { - CategoryId = categoryId; - } - - public Long getMaterialID() { - return materialID; - } - - public void setMaterialID(Long materialID) { - this.materialID = materialID; - } - - public String getMaterialIDs() { - return materialIDs; - } - - public void setMaterialIDs(String materialIDs) { - this.materialIDs = materialIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getCategoryIds() { - return CategoryIds; - } - - public void setCategoryIds(String categoryIds) { - CategoryIds = categoryIds; - } - -} +package com.jsh.model.vo.materials; + +import java.io.Serializable; + +@SuppressWarnings("serial") +public class MaterialModel implements Serializable +{ + private MaterialShowModel showModel = new MaterialShowModel(); + + /**======开始接受页面参数=================**/ + /** + * 名称 + */ + private String Name = ""; + + /** + * 型号 + */ + private String Model = ""; + + /** + * 颜色 + */ + private String Color = ""; + + /** + * 单位 + */ + private String Unit = ""; + + /** + * 零售价 + */ + private Double RetailPrice; + + /** + * 最低售价 + */ + private Double LowPrice; + + /** + * 预设售价一 + */ + private Double PresetPriceOne; + + /** + * 预设售价二 + */ + private Double PresetPriceTwo; + + /** + * 备注 + */ + private String Remark = ""; + + /** + * CategoryId + */ + private Long CategoryId; + + /** + * CategoryIds 用于in子查询 + */ + private String CategoryIds = "1"; + + /** + * 分类ID + */ + private Long materialID = 0l; + + /** + * 分类IDs 批量操作使用 + */ + private String materialIDs = ""; + + /** + * 每页显示的个数 + */ + private int pageSize = 10; + + /** + * 当前页码 + */ + private int pageNo = 1; + + /** + * 用户IP，用户记录操作日志 + */ + private String clientIp = ""; + + public MaterialShowModel getShowModel() { + return showModel; + } + + public void setShowModel(MaterialShowModel showModel) { + this.showModel = showModel; + } + + public String getName() { + return Name; + } + + public void setName(String name) { + Name = name; + } + + public String getModel() { + return Model; + } + + public void setModel(String model) { + Model = model; + } + + public String getColor() { + return Color; + } + + public void setColor(String color) { + Color = color; + } + + public String getUnit() { + return Unit; + } + + public void setUnit(String unit) { + Unit = unit; + } + + public void setRetailPrice(Double retailPrice) + { + RetailPrice = retailPrice; + } + + public Double getRetailPrice() + { + return RetailPrice; + } + + public void setLowPrice(Double lowPrice) + { + LowPrice = lowPrice; + } + + public Double getLowPrice() + { + return LowPrice; + } + + public void setPresetPriceOne(Double presetPriceOne) + { + PresetPriceOne = presetPriceOne; + } + + public Double getPresetPriceOne() + { + return PresetPriceOne; + } + + public void setPresetPriceTwo(Double presetPriceTwo) + { + PresetPriceTwo = presetPriceTwo; + } + + public Double getPresetPriceTwo() + { + return PresetPriceTwo; + } + + public String getRemark() { + return Remark; + } + + public void setRemark(String remark) { + Remark = remark; + } + + public Long getCategoryId() { + return CategoryId; + } + + public void setCategoryId(Long categoryId) { + CategoryId = categoryId; + } + + public Long getMaterialID() { + return materialID; + } + + public void setMaterialID(Long materialID) { + this.materialID = materialID; + } + + public String getMaterialIDs() { + return materialIDs; + } + + public void setMaterialIDs(String materialIDs) { + this.materialIDs = materialIDs; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageNo() { + return pageNo; + } + + public void setPageNo(int pageNo) { + this.pageNo = pageNo; + } + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + + public String getCategoryIds() { + return CategoryIds; + } + + public void setCategoryIds(String categoryIds) { + CategoryIds = categoryIds; + } + +} diff --git a/src/com/jsh/service/basic/VisitAccountIService.java b/src/com/jsh/service/basic/VisitAccountIService.java deleted file mode 100644 index bb7a0908..00000000 --- a/src/com/jsh/service/basic/VisitAccountIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.VisitAccount; - -public interface VisitAccountIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/VisitAccountService.java b/src/com/jsh/service/basic/VisitAccountService.java deleted file mode 100644 index 510dc9a5..00000000 --- a/src/com/jsh/service/basic/VisitAccountService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.VisitAccountIDAO; -import com.jsh.model.po.VisitAccount; - -public class VisitAccountService extends BaseService implements VisitAccountIService -{ - @SuppressWarnings("unused") - private VisitAccountIDAO visitAccountDao; - - - public void setVisitAccountDao(VisitAccountIDAO visitAccountDao) { - this.visitAccountDao = visitAccountDao; - } - - - @Override - protected Class getEntityClass() - { - return VisitAccount.class; - } - -}