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 14ef4bcc9..b945f5267 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/materials/BuildingAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/BuildingAction.class deleted file mode 100644 index 9e6594332..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/BuildingAction.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class index 2003237ef..40d780eed 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class index ac7c0a5e2..58debfc4f 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class 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 2a6915169..ccea8af82 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/action/materials/PersonAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class index 01a4b7580..7ffc38a8f 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingDAO.class deleted file mode 100644 index 98d22fd3f..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingDAO.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingIDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingIDAO.class deleted file mode 100644 index d45457db3..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingIDAO.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class deleted file mode 100644 index d38128339..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.hbm.xml deleted file mode 100644 index 99f39b7a6..000000000 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/Building.hbm.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - 名称 - - - - - 备注 - - - - - 启用 - - - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class index 62f067904..ff405213a 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class and b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.hbm.xml index d98fafd1e..80352b748 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.hbm.xml @@ -49,48 +49,33 @@ - 采购/领料-经手人Id + 经手人Id - - - 仓管员-经手人Id + + + 账户Id - - - 现金/记账 + + + 变动金额(收款/付款) - - - 单元Id - - 调拨时，对方项目Id + + + 合计金额 + + 备注 - - - 草稿/已生效/废弃/待审核/未通过 - - - - - 撤审人 - - - - - 撤审原因 - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class index f442364c9..47455307b 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class and b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml index 558018e26..c6de4ed93 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml @@ -27,9 +27,9 @@ 单价 - - - 运杂费 + + + 金额 diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class index f949b757a..bf6861e2b 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class and b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml index 8b71ec756..f3e03159d 100644 --- a/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml +++ b/WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml @@ -7,9 +7,6 @@ - - - 类型 diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class deleted file mode 100644 index 91672c50b..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class index cb952e7c8..3e6248fb2 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class and b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class index 6bb52bdd4..7b4500532 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class and b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class index 6b62987ce..19202e2d2 100644 Binary files a/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class and b/WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class b/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class deleted file mode 100644 index 91fb4834c..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class and /dev/null differ diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingService.class b/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingService.class deleted file mode 100644 index d60827c0d..000000000 Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingService.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 366b9e51d..a7f61903a 100644 --- a/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml +++ b/WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml @@ -1,47 +1,46 @@ - - - - - - - org.hibernate.dialect.MySQL5Dialect - - true - - update - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + org.hibernate.dialect.MySQL5Dialect + + true + + update + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml index 2f391ae5c..ec9d563db 100644 --- a/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml @@ -1,360 +1,348 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml index e2a578516..8261312ce 100644 --- a/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml +++ b/WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml @@ -1,57 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/classes/struts2/building-struts.xml b/WebRoot/WEB-INF/classes/struts2/building-struts.xml deleted file mode 100644 index be7b854b6..000000000 --- a/WebRoot/WEB-INF/classes/struts2/building-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js b/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js index 217296080..24a3a18a2 100644 --- a/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js +++ b/WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js @@ -14,23 +14,23 @@ if ($.messager){ $.messager.defaults.cancel = '取消'; } if ($.fn.validatebox){ - $.fn.validatebox.defaults.missingMessage = '该输入项为必输项'; + $.fn.validatebox.defaults.missingMessage = '必填'; $.fn.validatebox.defaults.rules.email.message = '请输入有效的电子邮件地址'; $.fn.validatebox.defaults.rules.url.message = '请输入有效的URL地址'; $.fn.validatebox.defaults.rules.length.message = '输入内容长度必须介于{0}和{1}之间'; $.fn.validatebox.defaults.rules.remote.message = '请修正该字段'; } if ($.fn.numberbox){ - $.fn.numberbox.defaults.missingMessage = '该输入项为必输项'; + $.fn.numberbox.defaults.missingMessage = '必填'; } if ($.fn.combobox){ - $.fn.combobox.defaults.missingMessage = '该输入项为必输项'; + $.fn.combobox.defaults.missingMessage = '必填'; } if ($.fn.combotree){ - $.fn.combotree.defaults.missingMessage = '该输入项为必输项'; + $.fn.combotree.defaults.missingMessage = '必填'; } if ($.fn.combogrid){ - $.fn.combogrid.defaults.missingMessage = '该输入项为必输项'; + $.fn.combogrid.defaults.missingMessage = '必填'; } if ($.fn.calendar){ $.fn.calendar.defaults.weeks = ['日','一','二','三','四','五','六']; @@ -40,7 +40,7 @@ if ($.fn.datebox){ $.fn.datebox.defaults.currentText = '今天'; $.fn.datebox.defaults.closeText = '关闭'; $.fn.datebox.defaults.okText = '确定'; - $.fn.datebox.defaults.missingMessage = '该输入项为必输项'; + $.fn.datebox.defaults.missingMessage = '必填'; $.fn.datebox.defaults.formatter = function(date){ var y = date.getFullYear(); var m = date.getMonth()+1; diff --git a/WebRoot/pages/manage/user.jsp b/WebRoot/pages/manage/user.jsp index 50a117949..270e2f836 100644 --- a/WebRoot/pages/manage/user.jsp +++ b/WebRoot/pages/manage/user.jsp @@ -46,7 +46,7 @@ 查询   重置   分配角色   - 分配部门 + 分配仓库 diff --git a/WebRoot/pages/materials/allocation_out_list.jsp b/WebRoot/pages/materials/allocation_out_list.jsp index 784828b89..a2f152cfa 100644 --- a/WebRoot/pages/materials/allocation_out_list.jsp +++ b/WebRoot/pages/materials/allocation_out_list.jsp @@ -78,7 +78,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/other_in_list.jsp b/WebRoot/pages/materials/other_in_list.jsp index de2dfa79e..648755fcb 100644 --- a/WebRoot/pages/materials/other_in_list.jsp +++ b/WebRoot/pages/materials/other_in_list.jsp @@ -80,7 +80,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/other_out_list.jsp b/WebRoot/pages/materials/other_out_list.jsp index 40401ef5d..2bda95525 100644 --- a/WebRoot/pages/materials/other_out_list.jsp +++ b/WebRoot/pages/materials/other_out_list.jsp @@ -78,7 +78,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/person.jsp b/WebRoot/pages/materials/person.jsp index 42510c16d..c26d29a7a 100644 --- a/WebRoot/pages/materials/person.jsp +++ b/WebRoot/pages/materials/person.jsp @@ -26,16 +26,15 @@
- + @@ -60,25 +59,20 @@
仓库：姓名： - + 类型：
- - - - - +
仓库 - -
类型
姓名 + +
@@ -184,13 +178,12 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '仓库',field: 'ProjectName',width:180}, - { title: '类型',field: 'Type',width:180}, - { title: '经手人',field: 'Name',width:180}, + { title: '姓名',field: 'Name',width:180}, + { title: '类型',field: 'Type',width:180}, { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec) { var str = ''; - var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.Type+ 'AaBb' + rec.Name; + var rowInfo = rec.Id + 'AaBb' + rec.Type+ 'AaBb' + rec.Name; if(1 == value) { str += ' 编辑  '; @@ -403,7 +396,6 @@ dataType: "json", async : false, data: ({ - ProjectId : $.trim($("#ProjectId").val()), Type : $.trim($("#Type").val()), Name : $.trim($("#Name").val()), clientIp:'<%=clientIp %>' @@ -442,16 +434,15 @@ var personInfo = personTotalInfo.split("AaBb"); $("#clientIp").val('<%=clientIp %>'); - $("#ProjectId").focus().val(personInfo[1]); - $("#Type").val(personInfo[2]); - $("#Name").val(personInfo[3]); + $("#Type").val(personInfo[1]); + $("#Name").val(personInfo[2]); //orgPerson = personInfo[1]; $('#personDlg').dialog('open').dialog('setTitle',' 编辑经手人信息'); $(".window-mask").css({ width: webW ,height: webH}); personID = personInfo[0]; //焦点在名称输入框==定焦在输入文字后面 - $("#Name").val("").focus().val(personInfo[3]); + $("#Name").val("").focus().val(personInfo[2]); url = '<%=path %>/person/update.action?personID=' + personInfo[0]; } @@ -479,7 +470,7 @@ url: "<%=path %>/person/findBy.action", dataType: "json", data: ({ - ProjectId:$.trim($("#searchProjectId").val()), + Name:$.trim($("#searchName").val()), Type:$.trim($("#searchType").val()), pageNo:pageNo, pageSize:pageSize diff --git a/WebRoot/pages/materials/purchase_back_list.jsp b/WebRoot/pages/materials/purchase_back_list.jsp index 1a38139e2..02e2e56b6 100644 --- a/WebRoot/pages/materials/purchase_back_list.jsp +++ b/WebRoot/pages/materials/purchase_back_list.jsp @@ -80,7 +80,7 @@ - 仓管员： + 经手人： diff --git a/WebRoot/pages/materials/purchase_in_list.jsp b/WebRoot/pages/materials/purchase_in_list.jsp index 35c6ce991..0c79e3a52 100644 --- a/WebRoot/pages/materials/purchase_in_list.jsp +++ b/WebRoot/pages/materials/purchase_in_list.jsp @@ -31,11 +31,11 @@ - 单据号： + 单据编号： - 入库时间： + 单据日期： @@ -64,40 +64,38 @@ 收货仓库： - + - 入库时间： + 单据日期： - + - 供应商： + 供货单位： - + - 采购人： + 经手人： - + - - 仓管员： + + 付款账户： - + - 结算方式： + 付款金额： - + - 备注： + 单据编号： - - - 单据号： - + + 单据备注： + + + 商品列表： @@ -119,39 +117,39 @@ - - - + - - + - - + - - + - - + - - - - + + + + @@ -184,6 +182,10 @@ initSelectInfo_UB(); initSystemData_depot(); initSelectInfo_depot(); + initSystemData_person(); + initSelectInfo_person(); + initSystemData_account(); + initSelectInfo_account(); initSupplier(); //供应商 initTableData(); ininPager(); @@ -233,7 +235,7 @@ { if(userBusinessList.length>0) { - //用户对应的部门列表 [1][2][3]... + //用户对应的仓库列表 [1][2][3]... userdepot =userBusinessList[0].value; } } @@ -297,11 +299,11 @@ } //初始化系统基础信息 - function initSystemData_person(ProjectSearch) + function initSystemData_person() { $.ajax({ type:"post", - url: "<%=path%>/person/getBasicData.action?ProjectId="+ProjectSearch, + url: "<%=path%>/person/getBasicData.action", //设置为同步 async:false, dataType: "json", @@ -321,7 +323,6 @@ function initSelectInfo_person() { var options1 = ""; - var options2 = ""; if(personList !=null) { @@ -332,30 +333,50 @@ { personID = person.id; } - if(person.type=="采购人") + if(person.type=="仓管员") { options1 += ''; - } - else if(person.type=="仓管员") - { - options2 += ''; - } + } } $("#HandsPersonId").empty().append(options1); - $("#WareHousePersonId").empty().append(options2); } } - - $("#ProjectId").change( - function(){ - var ProjectId=$("#ProjectId").val(); - if(ProjectId!='') + //获取账户信息 + function initSystemData_account() + { + $.ajax({ + type:"post", + url: "<%=path%>/account/getAccount.action", + //设置为同步 + async:false, + dataType: "json", + success: function (systemInfo) + { + accountList = systemInfo.showModel.map.accountList; + var msgTip = systemInfo.showModel.msgTip; + if(msgTip == "exceptoin") { - initSystemData_person(ProjectId); - initSelectInfo_person(); - } + $.messager.alert('提示','查找账户信息异常,请与管理员联系！','error'); + return; + } } - ); + }); + } + //获取账户信息 + function initSelectInfo_account() + { + var options = ""; + if(accountList !=null) + { + options = ""; + for(var i = 0 ;i < accountList.length;i ++) + { + var account = accountList[i]; + options += ''; + } + $("#AccountId").empty().append(options); + } + } //防止表单提交重复 function initForm() @@ -394,19 +415,18 @@ pageList: initPageNum, columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '单据号',field: 'Number',width:100}, - { title: '入库时间 ',field: 'OperTime',width:100}, + { title: '单据编号',field: 'Number',width:100}, + { title: '单据日期 ',field: 'OperTime',width:100}, { title: '创建时间',field: 'CreateTime',width:100}, { title: '操作员',field: 'OperPersonName',width:100}, - { title: '备注',field: 'Remark',width:100}, + { title: '单据备注',field: 'Remark',width:100}, { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec) { var str = ''; var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.Number+ 'AaBb' + rec.OperPersonName + 'AaBb' + rec.OperTime+ 'AaBb' + rec.OrganId+ 'AaBb' + rec.HandsPersonId - + 'AaBb' + rec.WareHousePersonId+ 'AaBb' + rec.SettlementWay+ 'AaBb' + rec.Remark - + 'AaBb' + rec.ProjectName+ 'AaBb' + rec.OrganName+ 'AaBb' + rec.HandsPersonName+ 'AaBb' + rec.WareHousePersonName - + 'AaBb' + rec.ReAuditPersonName+ 'AaBb' + rec.Reason; + + 'AaBb' + rec.AccountId+ 'AaBb' + rec.ChangeAmount+ 'AaBb' + rec.Remark + + 'AaBb' + rec.ProjectName+ 'AaBb' + rec.OrganName+ 'AaBb' + rec.HandsPersonName+ 'AaBb' + rec.AccountName + 'AaBb' + rec.TotalPrice; if(1 == value) { str += ' 查看  '; @@ -446,7 +466,7 @@ } //初始化表格数据-商品列表-编辑状态 - function initTableData_material() + function initTableData_material(type,TotalPrice) { $('#materialData').datagrid({ height:300, @@ -460,34 +480,34 @@ //fitColumns:true, //单击行是否选中 //checkOnSelect : false, - url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, pagination: true, //交替出现背景 striped : true, + showFooter: true, //loadFilter: pagerFilter, onClickRow: onClickRow, pageSize: 50, pageList: [50,100,150], columns:[[ - { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '名称',field: 'MaterialId',width:230, - formatter:function(value,row,index){ - return row.MaterialName; - }, - editor:{ - type:'combobox', - options:{ - valueField:'Id', - textField:'MaterialName', - method:'get', - url: "<%=path%>/material/findBySelect.action" - } - } - }, - { title: '数量',field: 'OperNumber',editor:'validatebox',width:50}, - { title: '单价',field: 'UnitPrice',editor:'validatebox',width:50}, - { title: '备注',field: 'Remark',editor:'validatebox',width:150}, - { title: '图片',field: 'Img',editor:'validatebox',width:110}, + { field: 'Id',width:35,align:"center",checkbox:true}, + { title: '商品名称',field: 'MaterialId',width:230, + formatter:function(value,row,index){ + return row.MaterialName; + }, + editor:{ + type:'combobox', + options:{ + valueField:'Id', + textField:'MaterialName', + method:'get', + url: "<%=path%>/material/findBySelect.action" + } + } + }, + { title: '数量',field: 'OperNumber',editor:'validatebox',width:50}, + { title: '单价',field: 'UnitPrice',editor:'validatebox',width:50}, + { title: '金额',field: 'AllPrice',editor:'validatebox',width:50}, + { title: '备注',field: 'Remark',editor:'validatebox',width:150} ]], toolbar:[ { @@ -524,11 +544,31 @@ return; } }); - } - + $.ajax({ + type:"post", + url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, + dataType: "json", + success: function (res) { + var AllPrice = 0 + if(type === "edit") { + AllPrice = TotalPrice; + } + var array = []; + array.push({ + "AllPrice": AllPrice + }); + res.footer = array; + $("#materialData").datagrid('loadData',res); + + }, + error:function() { + $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + } + }); + } //初始化表格数据-商品列表-查看状态 - function initTableData_material_show() + function initTableData_material_show(TotalPrice) { $('#materialDataShow').datagrid({ height:300, @@ -542,21 +582,21 @@ //fitColumns:true, //单击行是否选中 //checkOnSelect : false, - url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, pagination: true, //交替出现背景 striped : true, + showFooter: true, //loadFilter: pagerFilter, onClickRow: onClickRow, pageSize: 50, pageList: [50,100,150], columns:[[ { field: 'Id',width:35,align:"center",checkbox:true}, - { title: '名称',field: 'MaterialName',width:230}, + { title: '商品名称',field: 'MaterialName',width:230}, { title: '数量',field: 'OperNumber',width:50}, { title: '单价',field: 'UnitPrice',width:50}, - { title: '备注',field: 'Remark',width:150}, - { title: '图片',field: 'Img',width:110}, + { title: '金额',field: 'AllPrice',width:50}, + { title: '备注',field: 'Remark',width:150} ]], onLoadError:function() { @@ -564,6 +604,24 @@ return; } }); + $.ajax({ + type:"post", + url:'<%=path %>/depotItem/findBy.action?HeaderId=' + depotHeadID, + dataType: "json", + success: function (res) { + var AllPrice = TotalPrice; + var array = []; + array.push({ + "AllPrice": AllPrice + }); + res.footer = array; + $("#materialDataShow").datagrid('loadData',res); + + }, + error:function() { + $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); + } + }); } //初始化键盘enter事件 @@ -724,7 +782,7 @@ orgDepotHead = ""; depotHeadID = 0; - initTableData_material(); //商品列表 + initTableData_material("add"); //商品列表 reject(); //撤销下、刷新商品列表 url = '<%=path %>/depotHead/create.action'; } @@ -750,8 +808,9 @@ OperTime: $("#OperTime").val(), OrganId: $('#OrganId').combobox('getValue'), HandsPersonId: $.trim($("#HandsPersonId").val()), - WareHousePersonId: $.trim($("#WareHousePersonId").val()), - SettlementWay: $.trim($("#SettlementWay").val()), + AccountId: $.trim($("#AccountId").val()), + ChangeAmount: $.trim($("#ChangeAmount").val()), + TotalPrice: $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text(), Remark: $.trim($("#Remark").val()), clientIp:'<%=clientIp %>' }), @@ -810,16 +869,17 @@ $("#OperTime").val(depotHeadInfo[4]); $('#OrganId').combobox('setValue', depotHeadInfo[5]); $("#HandsPersonId").val(depotHeadInfo[6]); - $("#WareHousePersonId").val(depotHeadInfo[7]); - $("#SettlementWay").val(depotHeadInfo[8]); + $("#AccountId").val(depotHeadInfo[7]); + $("#ChangeAmount").val(depotHeadInfo[8]); $("#Remark").val(depotHeadInfo[9]); + var TotalPrice = depotHeadInfo[14]; //orgDepotHead = depotHeadInfo[1]; $('#depotHeadDlg').dialog('open').dialog('setTitle',' 编辑采购入库信息'); $(".window-mask").css({ width: webW ,height: webH}); depotHeadID = depotHeadInfo[0]; - initTableData_material(); //商品列表 + initTableData_material("edit",TotalPrice); //商品列表 reject(); //撤销下、刷新商品列表 url = '<%=path %>/depotHead/update.action?depotHeadID=' + depotHeadInfo[0]; } @@ -833,16 +893,15 @@ $("#OperTimeShow").text(depotHeadInfo[4]); $('#OrganIdShow').text(depotHeadInfo[11]); $("#HandsPersonIdShow").text(depotHeadInfo[12]); - $("#WareHousePersonIdShow").text(depotHeadInfo[13]); - $("#SettlementWayShow").text(depotHeadInfo[8]); + $("#AccountIdShow").text(depotHeadInfo[13]); + $("#ChangeAmountShow").text(depotHeadInfo[8]); $("#RemarkShow").text(depotHeadInfo[9]); - var audit=(depotHeadInfo[14]!="undefined"&&depotHeadInfo[15]!="undefined"&&depotHeadInfo[14]!=""&&depotHeadInfo[15]!="")?" 撤审人:"+depotHeadInfo[14]+" 撤审原因:"+depotHeadInfo[15]:""; - audit=""+audit+""; - $('#depotHeadDlgShow').dialog('open').dialog('setTitle',' 查看采购入库信息'+audit); + var TotalPrice = depotHeadInfo[14]; + $('#depotHeadDlgShow').dialog('open').dialog('setTitle',' 查看采购入库信息'); $(".window-mask").css({ width: webW ,height: webH}); depotHeadID = depotHeadInfo[0]; - initTableData_material_show(); //商品列表-查看状态 + initTableData_material_show(TotalPrice); //商品列表-查看状态 } //搜索处理 @@ -909,7 +968,59 @@ $("#searchBtn").click(); } }); - + //自动计算事件 + function autoReckon() { + //延时绑定事件 + setTimeout(function(){ + var body =$("#depotHeadFM .datagrid-body"); + var footer =$("#depotHeadFM .datagrid-footer"); + var input = ".datagrid-editable-input"; + + //修改单价，自动计算金额和合计 + body.find("[field='UnitPrice']").find(input).off("keyup").on("keyup",function(){ + var UnitPrice =$(this).val()-0; //单价 + var TotalPrice = 0; + var OperNumber = body.find("[field='OperNumber']").find(input).val(); //数量 + body.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + UnitPrice*OperNumber; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + //修改数量，自动计算金额和合计 + body.find("[field='OperNumber']").find(input).off("keyup").on("keyup",function(){ + var UnitPrice = body.find("[field='UnitPrice']").find(input).val(); //单价 + var TotalPrice = 0; + var OperNumber =$(this).val()-0; //数量 + body.find("[field='AllPrice']").find(input).val((UnitPrice*OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + UnitPrice*OperNumber; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + //修改金额，自动计算单价和合计 + body.find("[field='AllPrice']").find(input).off("keyup").on("keyup",function(){ + var OperNumber = body.find("[field='OperNumber']").find(input).val(); //数量 + var TotalPrice = 0; + var AllPrice =$(this).val()-0; //金额 + body.find("[field='UnitPrice']").find(input).val((AllPrice/OperNumber).toFixed(2)); + body.find("[field='AllPrice']").each(function(){ + if($(this).find("div").text()!==""){ + TotalPrice = TotalPrice + parseFloat($(this).find("div").text().toString()); + } + }); + TotalPrice = TotalPrice + AllPrice; + footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); + }); + },500); + } + //结束编辑 var editIndex = undefined; function endEditing() { @@ -929,9 +1040,9 @@ function onClickRow(index) { if (editIndex != index) { if (endEditing()) { - $('#materialData').datagrid('selectRow', index) - .datagrid('beginEdit', index); + $('#materialData').datagrid('selectRow', index).datagrid('beginEdit', index); editIndex = index; + autoReckon(); } else { $('#materialData').datagrid('selectRow', editIndex); } @@ -943,8 +1054,8 @@ if (endEditing()) { $('#materialData').datagrid('appendRow', {}); editIndex = $('#materialData').datagrid('getRows').length - 1; - $('#materialData').datagrid('selectRow', editIndex) - .datagrid('beginEdit', editIndex); + $('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex); + autoReckon(); } } //删除 diff --git a/WebRoot/pages/materials/sale_back_list.jsp b/WebRoot/pages/materials/sale_back_list.jsp index 834621547..166a458fe 100644 --- a/WebRoot/pages/materials/sale_back_list.jsp +++ b/WebRoot/pages/materials/sale_back_list.jsp @@ -78,7 +78,7 @@ - + diff --git a/WebRoot/pages/materials/sale_out_list.jsp b/WebRoot/pages/materials/sale_out_list.jsp index d97706b0a..8cada165a 100644 --- a/WebRoot/pages/materials/sale_out_list.jsp +++ b/WebRoot/pages/materials/sale_out_list.jsp @@ -78,7 +78,7 @@ - + diff --git a/config/hibernate/hibernate.cfg.xml b/config/hibernate/hibernate.cfg.xml index 366b9e51d..a7f61903a 100644 --- a/config/hibernate/hibernate.cfg.xml +++ b/config/hibernate/hibernate.cfg.xml @@ -1,47 +1,46 @@ - - - - - - - org.hibernate.dialect.MySQL5Dialect - - true - - update - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + org.hibernate.dialect.MySQL5Dialect + + true + + update + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml index 2f391ae5c..ec9d563db 100644 --- a/config/spring/basic-applicationContext.xml +++ b/config/spring/basic-applicationContext.xml @@ -1,360 +1,348 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/spring/dao-applicationContext.xml b/config/spring/dao-applicationContext.xml index e2a578516..8261312ce 100644 --- a/config/spring/dao-applicationContext.xml +++ b/config/spring/dao-applicationContext.xml @@ -1,57 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/struts2/building-struts.xml b/config/struts2/building-struts.xml deleted file mode 100644 index be7b854b6..000000000 --- a/config/struts2/building-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 4ddcf14ee..09a45cfc1 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -2,7 +2,7 @@ MySQL Backup Source Server Version: 5.1.54 Source Database: jsh_erp -Date: 2016-12-11 22:44:47 +Date: 2016-12-24 23:56:10 */ SET FOREIGN_KEY_CHECKS=0; @@ -42,7 +42,7 @@ CREATE TABLE `jsh_accounthead` ( CONSTRAINT `FK9F4C0D8DAAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `FK9F4C0D8DB610FC06` FOREIGN KEY (`OrganId`) REFERENCES `jsh_supplier` (`id`), CONSTRAINT `FK9F4C0D8DC4170B37` FOREIGN KEY (`HandsPersonId`) REFERENCES `jsh_person` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_accountitem` @@ -62,7 +62,7 @@ CREATE TABLE `jsh_accountitem` ( CONSTRAINT `FK9F4CBAC0AAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `FK9F4CBAC0C5FE6007` FOREIGN KEY (`HeaderId`) REFERENCES `jsh_accounthead` (`Id`) ON DELETE CASCADE, CONSTRAINT `FK9F4CBAC0D203EDC5` FOREIGN KEY (`InOutItemId`) REFERENCES `jsh_inoutitem` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_app` @@ -177,7 +177,7 @@ CREATE TABLE `jsh_depot` ( `sort` varchar(10) DEFAULT NULL COMMENT '排序', `remark` varchar(100) DEFAULT NULL COMMENT '描述', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_depothead` @@ -194,28 +194,23 @@ CREATE TABLE `jsh_depothead` ( `OperTime` datetime DEFAULT NULL COMMENT '出入库时间', `OrganId` bigint(20) DEFAULT NULL COMMENT '供应商Id', `HandsPersonId` bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人Id', - `WareHousePersonId` bigint(20) NOT NULL COMMENT '仓管员-经手人Id', - `SettlementWay` varchar(50) DEFAULT NULL COMMENT '现金/记账', - `BuildingId` bigint(20) DEFAULT NULL COMMENT '单元Id', + `AccountId` bigint(20) DEFAULT NULL COMMENT '账户Id', + `ChangeAmount` double DEFAULT NULL COMMENT '变动金额(收款/付款)', `AllocationProjectId` bigint(20) DEFAULT NULL COMMENT '调拨时，对方项目Id', + `TotalPrice` double DEFAULT NULL COMMENT '合计金额', `Remark` varchar(1000) DEFAULT NULL COMMENT '备注', - `State` varchar(50) DEFAULT NULL COMMENT '草稿/已生效/废弃/待审核/未通过', - `ReAuditPersonName` varchar(50) DEFAULT NULL COMMENT '撤审人', - `Reason` varchar(100) DEFAULT NULL COMMENT '撤审原因', PRIMARY KEY (`Id`), KEY `FK2A80F214CA633ABA` (`AllocationProjectId`), KEY `FK2A80F214C4170B37` (`HandsPersonId`), KEY `FK2A80F214B610FC06` (`OrganId`), - KEY `FK2A80F2148E0FA916` (`WareHousePersonId`), KEY `FK2A80F2142888F9A` (`ProjectId`), - KEY `FK2A80F214F039F8D1` (`BuildingId`), + KEY `FK2A80F214AAE50527` (`AccountId`), + CONSTRAINT `FK2A80F214AAE50527` FOREIGN KEY (`AccountId`) REFERENCES `jsh_account` (`Id`), CONSTRAINT `jsh_depothead_ibfk_1` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`), - CONSTRAINT `jsh_depothead_ibfk_2` FOREIGN KEY (`WareHousePersonId`) REFERENCES `jsh_person` (`Id`), CONSTRAINT `jsh_depothead_ibfk_3` FOREIGN KEY (`OrganId`) REFERENCES `jsh_supplier` (`id`), CONSTRAINT `jsh_depothead_ibfk_4` FOREIGN KEY (`HandsPersonId`) REFERENCES `jsh_person` (`Id`), - CONSTRAINT `jsh_depothead_ibfk_5` FOREIGN KEY (`AllocationProjectId`) REFERENCES `jsh_depot` (`id`), - CONSTRAINT `jsh_depothead_ibfk_6` FOREIGN KEY (`BuildingId`) REFERENCES `jsh_building` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8; + CONSTRAINT `jsh_depothead_ibfk_5` FOREIGN KEY (`AllocationProjectId`) REFERENCES `jsh_depot` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_depotitem` @@ -227,7 +222,7 @@ CREATE TABLE `jsh_depotitem` ( `MaterialId` bigint(20) NOT NULL COMMENT '材料Id', `OperNumber` double DEFAULT NULL COMMENT '数量', `UnitPrice` double DEFAULT NULL COMMENT '单价', - `Incidentals` double DEFAULT NULL COMMENT '运杂费', + `AllPrice` double DEFAULT NULL COMMENT '金额', `Remark` varchar(200) DEFAULT NULL COMMENT '描述', `Img` varchar(50) DEFAULT NULL COMMENT '图片', PRIMARY KEY (`Id`), @@ -235,7 +230,7 @@ CREATE TABLE `jsh_depotitem` ( KEY `FK2A819F474BB6190E` (`HeaderId`), CONSTRAINT `jsh_depotitem_ibfk_1` FOREIGN KEY (`HeaderId`) REFERENCES `jsh_depothead` (`Id`) ON DELETE CASCADE, CONSTRAINT `jsh_depotitem_ibfk_2` FOREIGN KEY (`MaterialId`) REFERENCES `jsh_material` (`Id`) -) ENGINE=InnoDB AUTO_INCREMENT=1023 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1028 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_functions` @@ -282,7 +277,7 @@ CREATE TABLE `jsh_log` ( PRIMARY KEY (`id`), KEY `FKF2696AA13E226853` (`userID`), CONSTRAINT `FKF2696AA13E226853` FOREIGN KEY (`userID`) REFERENCES `jsh_user` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1941 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2023 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_material` @@ -325,13 +320,10 @@ CREATE TABLE `jsh_materialcategory` ( DROP TABLE IF EXISTS `jsh_person`; CREATE TABLE `jsh_person` ( `Id` bigint(20) NOT NULL AUTO_INCREMENT, - `ProjectId` bigint(20) NOT NULL, `Type` varchar(20) DEFAULT NULL COMMENT '类型', `Name` varchar(50) DEFAULT NULL COMMENT '姓名', - PRIMARY KEY (`Id`), - KEY `FK5AF487552888F9A` (`ProjectId`), - CONSTRAINT `FK5AF487552888F9A` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; + PRIMARY KEY (`Id`) +) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; -- ---------------------------- -- Table structure for `jsh_role` @@ -416,34 +408,29 @@ CREATE TABLE `jsh_visitaccount` ( CONSTRAINT `FKFF4AAE822888F9A` FOREIGN KEY (`ProjectId`) REFERENCES `jsh_depot` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- ---------------------------- --- View definition for `jsh_view_in_out_stock` --- ---------------------------- -DROP VIEW IF EXISTS `jsh_view_in_out_stock`; -CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `jsh_view_in_out_stock` AS select `jsh_depotitem`.`Id` AS `Id`,`jsh_depotitem`.`HeaderId` AS `HeaderId`,`jsh_depotitem`.`MaterialId` AS `MaterialId`,`jsh_depotitem`.`OperNumber` AS `OperNumber`,`jsh_depotitem`.`UnitPrice` AS `UnitPrice`,`jsh_depotitem`.`Incidentals` AS `Incidentals`,`jsh_depotitem`.`Remark` AS `Remark`,`jsh_depotitem`.`Img` AS `Img` from `jsh_depotitem` group by `jsh_depotitem`.`MaterialId`; - -- ---------------------------- -- Records -- ---------------------------- INSERT INTO `jsh_account` VALUES ('4','南通建行','3241423','121','34','66666'), ('9','公司总账1','4123411','423','412','77777'); -INSERT INTO `jsh_accounthead` VALUES ('3','收入','1','3','333','9','33No','2016-12-10 00:00:00','444aa'), ('9','收入','1','3','213','4','3134','2016-12-10 00:00:00','12341'), ('12','收入','1','3','123','4','NO123','2016-12-10 00:00:00','666666'), ('13','收入','1','3','45','4','N666','2016-12-11 00:00:00','111'), ('14','支出','1','3','55','9','aa','2016-12-11 00:00:00','123'), ('15','收款','1','3','123','9','34124','2016-12-11 00:00:00','123'), ('16','付款','1','3','1234','4','234234','2016-12-11 00:00:00','2342'), ('17','转账','1','3','23','4','234','2016-12-11 00:00:00','234'); -INSERT INTO `jsh_accountitem` VALUES ('3','9',NULL,'5',NULL,'123414'), ('6','12',NULL,'8','12','啊啊啊'), ('7','13',NULL,'7','1111','2222'), ('8','3',NULL,'9','11',''), ('9','3',NULL,'8','22',''), ('10','14',NULL,'10','123','123'), ('11','15',NULL,'7','12341','124'), ('12','16',NULL,'1','3423','2342'), ('13','17',NULL,'10','12','1'); +INSERT INTO `jsh_accounthead` VALUES ('3','收入','1','3','333','9','33No','2016-12-10 00:00:00','444aa'), ('9','收入','1','3','213','4','3134','2016-12-10 00:00:00','12341'), ('12','收入','1','3','123','4','NO123','2016-12-10 00:00:00','666666'), ('13','收入','1','3','45','4','N666','2016-12-11 00:00:00','111'), ('14','支出','1','3','55','9','aa','2016-12-11 00:00:00','123'), ('15','收款','1','3','123','9','34124','2016-12-11 00:00:00','123'), ('16','付款','1','3','1234','4','234234','2016-12-11 00:00:00','2342'), ('17','转账','1','3','23','4','234','2016-12-11 00:00:00','234'), ('18','收款','1','3','11','4','123123','2016-12-18 00:00:00','123'); +INSERT INTO `jsh_accountitem` VALUES ('3','9',NULL,'5',NULL,'123414'), ('6','12',NULL,'8','12','啊啊啊'), ('7','13',NULL,'7','1111','2222'), ('8','3',NULL,'9','11',''), ('9','3',NULL,'8','22',''), ('10','14',NULL,'10','123','123'), ('11','15','4','7','12341','124'), ('12','16',NULL,'1','3423','2342'), ('13','17',NULL,'10','12','1'), ('14','18','9',NULL,'11','123'), ('15','18','4',NULL,'22','aaa'); INSERT INTO `jsh_app` VALUES ('1','','企业邮箱','app','0000000001.png','../EmailManage/Email','600','400','\0','\0','\0','desk','010','','\0'), ('3','00','系统管理','app','0000000004.png','','1024','600','','\0','\0','desk','198','',''), ('6','','个人信息','app','0000000005.png','../user/password.jsp','600','400','\0','\0','\0','dock','200','',''), ('7','01','基础数据','app','0000000006.png','','1024','600','','\0','\0','desk','120','',''), ('8','02','进销存','app','0000000007.png','','1024','600','','\0','\0','desk','030','',''), ('20','13','公告管理','app','0000000020.png',NULL,'1024','600','','\0','\0','desk','125',NULL,'\0'), ('21','','今日留言','app','0000000021.png','../phone/msg','1024','600','','\0','\0','dock','000','','\0'), ('22','03','报表查询','app','0000000022.png','','1024','600','','\0','\0','desk','115','',''); INSERT INTO `jsh_asset` VALUES ('1','27','weizhi','','0',NULL,'11','2016-10-22 00:00:00','2016-10-21 00:00:00','2016-11-03 00:00:00','1231241','123124123','2','','2016-10','2016-10-22 20:04:48','63','2016-10-22 20:04:48','63'); INSERT INTO `jsh_assetcategory` VALUES ('14','递延资产','1','递延资产'), ('15','无形资产','1','无形资产'), ('16','长期投资','1','长期投资'), ('17','固定资产','1','固定资产'), ('18','流动资产','1','流动资产'); INSERT INTO `jsh_assetname` VALUES ('1','联想Y450','17','1','','1'), ('2','惠普打印机','15','1','','0'), ('12','乐萌水杯','16','1','','1'), ('13','机顶盒','17','1','机顶盒','0'), ('14','TCL电视','17','1','','1'), ('15','手机','17','1','','1'), ('16','硬盘','16','1','','0'), ('17','毛笔','17','1','','0'), ('18','杯子','17','1','','0'), ('19','建造师证书','15','1','','0'), ('20','算量软件','14','1','','1'), ('21','cad软件','15','1','','0'), ('22','办公桌','17','1','','0'), ('23','笔记本','17','1','笔记本','1'), ('24','打印机','17','1','打印机','0'), ('25','电脑','17','1','电脑','0'), ('26','电动车','16','1','电动车','0'), ('27','电源线','17','1','电源线','0'); -INSERT INTO `jsh_depot` VALUES ('1','上海花边店','2',''), ('2','公司总部','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), ('33','入库','其它','1','234234','季圣华','2016-12-11 18:15:39','2016-12-11 00:00:00','1','2','1','现金',NULL,NULL,'12312','草稿',NULL,NULL), ('34','出库','其它','1','1234','季圣华','2016-12-11 18:44:50','2016-12-11 00:00:00','2',NULL,'1','',NULL,NULL,'41234','草稿',NULL,NULL), ('35','出库','其它','1','bbb','季圣华','2016-12-11 22:31:49','2016-12-11 00:00:00','2',NULL,'1','',NULL,NULL,'aa666','草稿',NULL,NULL), ('36','出库','调拨','1','bb22','季圣华','2016-12-11 22:32:52','2016-12-11 00:00:00',NULL,NULL,'1','',NULL,'2','aa11','草稿',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','498','1','0.9',NULL,'',''), ('1019','33','487','1','2',NULL,'',''), ('1020','34','498','21','12',NULL,'',''), ('1021','35','487','1','1',NULL,'',''), ('1022','36','498','1',NULL,NULL,'2','3'); +INSERT INTO `jsh_depot` VALUES ('1','上海花边店','2',''), ('2','公司总部','1','总部'), ('3','苏州花边店','3',''); +INSERT INTO `jsh_depothead` VALUES ('29','入库','采购','1','1234','李四','2016-11-08 22:14:37','2016-11-08 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('30','入库','采购','1','1235','李四','2016-11-08 22:15:16','2016-11-08 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('31','出库','销售','1','123A','李四','2016-11-08 22:16:11','2016-11-08 00:00:00','2',NULL,NULL,NULL,NULL,NULL,''), ('32','入库','采购','1','ww123','季圣华','2016-11-25 22:14:46','2016-11-25 00:00:00','1','2',NULL,NULL,NULL,NULL,''), ('33','入库','其它','1','234234','季圣华','2016-12-11 18:15:39','2016-12-11 00:00:00','1','2',NULL,NULL,NULL,NULL,'12312'), ('34','出库','其它','1','1234','季圣华','2016-12-11 18:44:50','2016-12-11 00:00:00','2',NULL,NULL,NULL,NULL,NULL,'41234'), ('35','出库','其它','1','bbb','季圣华','2016-12-11 22:31:49','2016-12-11 00:00:00','2',NULL,NULL,NULL,NULL,NULL,'aa666'), ('36','出库','调拨','1','bb22','季圣华','2016-12-11 22:32:52','2016-12-11 00:00:00',NULL,NULL,NULL,NULL,'2',NULL,'aa11'), ('37','入库','采购','3','123a','季圣华','2016-12-24 14:33:02','2016-12-24 00:00:00','4','2','9','36',NULL,NULL,'1212a'), ('38','入库','采购','3','123132','季圣华','2016-12-24 23:14:22','2016-12-24 00:00:00','1','1','9','44',NULL,'24','312'), ('39','入库','采购','3','222','季圣华','2016-12-24 23:43:50','2016-12-24 00:00:00','4','2','9','44',NULL,'85.8','3333'); +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','498','1','0.9',NULL,'',''), ('1019','33','487','1','2',NULL,'',''), ('1020','34','498','21','12',NULL,'',''), ('1021','35','487','1','1',NULL,'',''), ('1022','36','498','1',NULL,NULL,'2','3'), ('1023','37','485','12','2.6','31.2','beizhu','img'), ('1024','37','498','12','1.4','16.8','a','b'), ('1025','38','485','12','2','24','',NULL), ('1026','39','498','22','2.1','46.2','',NULL), ('1027','39','487','33','1.2','39.6','',NULL); INSERT INTO `jsh_functions` VALUES ('1','00','系统管理','0','','','0010','','电脑版'), ('2','01','基础数据','0','','','0020','','电脑版'), ('3','02','进销存','0','','','0030','','电脑版'), ('11','0001','系统管理','00','','\0','0110','','电脑版'), ('12','000101','应用管理','0001','../manage/app.jsp','\0','0132','','电脑版'), ('13','000102','角色管理','0001','../manage/role.jsp','\0','0130','','电脑版'), ('14','000103','用户管理','0001','../manage/user.jsp','\0','0140','','电脑版'), ('15','000104','日志管理','0001','../manage/log.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','','电脑版'), ('31','010206','经手人管理','0102','../materials/person.jsp','\0','0284','','电脑版'), ('32','0202','入库管理','02','','\0','0330','','电脑版'), ('33','020201','采购入库','0202','../materials/purchase_in_list.jsp','\0','0340','','电脑版'), ('38','0203','出库管理','02','','\0','0390','','电脑版'), ('40','020302','调拨出库','0203','../materials/allocation_out_list.jsp','\0','0420','','电脑版'), ('41','020303','销售出库','0203','../materials/sale_out_list.jsp','\0','0410','','电脑版'), ('44','0204','财务管理','02','','\0','0450','','电脑版'), ('59','030101','项目进销存报表','0301','../reports/in_out_stock_report.jsp','\0','0600','','电脑版'), ('194','010204','收支项目','0102','../manage/inOutItem.jsp','\0','0282','','电脑版'), ('195','010205','结算账户','0102','../manage/account.jsp','\0','0283','','电脑版'), ('196','03','报表查询','0','','','0040','','电脑版'), ('197','020402','收入单','0204','../financial/item_in.jsp','\0','0465','','电脑版'), ('198','0301','报表查询','03','','\0','0570','','电脑版'), ('199','020304','采购退货','0203','../materials/purchase_back_list.jsp','\0','0415','','电脑版'), ('200','020202','销售退货','0202','../materials/sale_back_list.jsp','\0','0350','','电脑版'), ('201','020203','其它入库','0202','../materials/other_in_list.jsp','\0','0360','','电脑版'), ('202','020305','其它出库','0203','../materials/other_out_list.jsp','\0','0418','','电脑版'), ('203','020403','支出单','0204','../financial/item_out.jsp','\0','0470','','电脑版'), ('204','020404','收款单','0204','../financial/money_in.jsp','\0','0475','','电脑版'), ('205','020405','付款单','0204','../financial/money_out.jsp','\0','0480','','电脑版'), ('206','020406','转账单','0204','../financial/giro.jsp','\0','0490','','电脑版'); INSERT INTO `jsh_inoutitem` VALUES ('1','办公耗材','支出','办公耗材'), ('5','房租收入','收入','房租收入'), ('7','利息收入','收入','利息收入'), ('8','水电费','支出','水电费水电费'), ('9','快递费','支出','快递费'), ('10','交通报销费','支出','交通报销费'), ('11','差旅费','支出','差旅费'); 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 登录系统'), ('1731','63','登录系统','192.168.1.104','2016-12-04 10:38:50','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1732','63','增加物料','192.168.1.104','2016-12-04 10:40:52','0','增加物料名称为 11 成功！','增加物料成功'), ('1733','63','更新物料','192.168.1.104','2016-12-04 10:59:57','0','更新物料ID为 499 成功！','更新物料成功'), ('1734','63','更新物料','192.168.1.104','2016-12-04 11:00:13','0','更新物料ID为 499 成功！','更新物料成功'), ('1735','63','删除物料','192.168.1.104','2016-12-04 11:00:38','0','删除物料ID为 499 成功！','删除物料成功'), ('1736','63','增加物料','192.168.1.104','2016-12-04 11:02:35','0','增加物料名称为 11 成功！','增加物料成功'), ('1737','63','批量删除物料','192.168.1.104','2016-12-04 11:02:41','0','批量删除物料ID为 500 成功！','批量删除物料成功'), ('1738','63','更新功能','192.168.1.104','2016-12-04 11:04:43','0','更新功能ID为 26 成功！','更新功能成功'), ('1739','63','增加供应商','192.168.1.104','2016-12-04 11:38:13','0','增加供应商名称为 aa 成功！','增加供应商成功'), ('1740','63','增加供应商','192.168.1.104','2016-12-04 11:48:36','0','增加供应商名称为 aaaa 成功！','增加供应商成功'), ('1741','63','删除供应商','192.168.1.104','2016-12-04 11:48:53','0','删除供应商ID为 3,名称为 aa成功！','删除供应商成功'), ('1742','63','更新供应商','192.168.1.104','2016-12-04 11:48:59','0','更新供应商ID为 4 成功！','更新供应商成功'), ('1743','63','更新功能','192.168.1.104','2016-12-04 13:06:24','0','更新功能ID为 31 成功！','更新功能成功'), ('1744','63','删除功能','192.168.1.104','2016-12-04 13:06:47','0','删除功能ID为 30 成功！','删除功能成功'), ('1745','63','更新功能','192.168.1.104','2016-12-04 13:08:35','0','更新功能ID为 24 成功！','更新功能成功'), ('1746','63','更新功能','192.168.1.104','2016-12-04 13:09:52','0','更新功能ID为 24 成功！','更新功能成功'), ('1747','63','更新功能','192.168.1.104','2016-12-04 13:11:00','0','更新功能ID为 21 成功！','更新功能成功'), ('1748','63','更新功能','192.168.1.104','2016-12-04 13:11:08','0','更新功能ID为 22 成功！','更新功能成功'), ('1749','63','更新功能','192.168.1.104','2016-12-04 13:11:16','0','更新功能ID为 23 成功！','更新功能成功'), ('1750','63','更新功能','192.168.1.104','2016-12-04 13:11:31','0','更新功能ID为 23 成功！','更新功能成功'), ('1751','63','更新应用','192.168.1.104','2016-12-04 13:34:39','0','更新应用ID为 22 成功！','更新应用成功'), ('1752','63','更新应用','192.168.1.104','2016-12-04 13:35:13','0','更新应用ID为 22 成功！','更新应用成功'), ('1753','63','登录系统','192.168.1.104','2016-12-04 13:36:45','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1754','63','登录系统','192.168.1.104','2016-12-04 13:38:31','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1755','63','增加功能','192.168.1.104','2016-12-04 13:40:10','0','增加功能名称为 报表管理 成功！','增加功能成功'), ('1756','63','更新功能','192.168.1.104','2016-12-04 13:40:38','0','更新功能ID为 58 成功！','更新功能成功'), ('1757','63','更新功能','192.168.1.104','2016-12-04 13:40:54','0','更新功能ID为 59 成功！','更新功能成功'), ('1758','63','更新应用','192.168.1.104','2016-12-04 13:42:15','0','更新应用ID为 22 成功！','更新应用成功'), ('1759','63','更新功能','192.168.1.104','2016-12-04 13:43:23','0','更新功能ID为 58 成功！','更新功能成功'), ('1760','63','更新应用','192.168.1.104','2016-12-04 13:43:44','0','更新应用ID为 22 成功！','更新应用成功'), ('1761','63','更新应用','192.168.1.104','2016-12-04 13:47:17','0','更新应用ID为 22 成功！','更新应用成功'), ('1762','63','登录系统','192.168.112.102','2016-12-04 21:00:14','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1763','63','更新应用','192.168.112.102','2016-12-04 21:01:40','0','更新应用ID为 7 成功！','更新应用成功'), ('1764','63','更新应用','192.168.112.102','2016-12-04 21:02:40','0','更新应用ID为 7 成功！','更新应用成功'), ('1765','63','登录系统','192.168.112.102','2016-12-04 21:14:18','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1766','63','登录系统','192.168.112.102','2016-12-04 21:49:44','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1767','63','登录系统','192.168.4.108','2016-12-10 14:24:27','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1768','63','登录系统','192.168.4.108','2016-12-10 14:30:33','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1769','63','退出系统','192.168.4.108','2016-12-10 14:31:27','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1770','63','登录系统','192.168.4.108','2016-12-10 14:31:33','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1771','63','增加经手人','192.168.4.108','2016-12-10 14:55:24','0','增加经手人名称为 赵五-财务 成功！','增加经手人成功'), ('1772','63','更新经手人','192.168.4.108','2016-12-10 14:55:33','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1773','63','更新经手人','192.168.4.108','2016-12-10 14:55:45','0','更新经手人ID为 1 成功！','更新经手人成功'), ('1774','63','增加功能','192.168.4.108','2016-12-10 15:29:27','0','增加功能名称为 收入单 成功！','增加功能成功'), ('1775','63','更新UserBusiness','192.168.4.108','2016-12-10 15:30:47','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1776','63','更新功能','192.168.4.108','2016-12-10 15:35:04','0','更新功能ID为 58 成功！','更新功能成功'), ('1777','63','更新功能','192.168.4.108','2016-12-10 15:35:59','0','更新功能ID为 58 成功！','更新功能成功'), ('1778','63','更新功能','192.168.4.108','2016-12-10 15:37:40','0','更新功能ID为 196 成功！','更新功能成功'), ('1779','63','更新功能','192.168.4.108','2016-12-10 15:39:07','0','更新功能ID为 196 成功！','更新功能成功'), ('1780','63','更新功能','192.168.4.108','2016-12-10 15:39:23','0','更新功能ID为 59 成功！','更新功能成功'), ('1781','63','删除功能','192.168.4.108','2016-12-10 15:39:45','0','删除功能ID为 58 成功！','删除功能成功'), ('1782','63','更新功能','192.168.4.108','2016-12-10 15:40:03','0','更新功能ID为 59 成功！','更新功能成功'), ('1783','63','更新UserBusiness','192.168.4.108','2016-12-10 15:41:52','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1784','63','增加功能','192.168.4.108','2016-12-10 15:44:39','0','增加功能名称为 报表管理 成功！','增加功能成功'), ('1785','63','更新功能','192.168.4.108','2016-12-10 15:44:51','0','更新功能ID为 59 成功！','更新功能成功'), ('1786','63','更新功能','192.168.4.108','2016-12-10 15:46:30','0','更新功能ID为 198 成功！','更新功能成功'), ('1787','63','增加经手人','192.168.4.108','2016-12-10 16:48:36','0','增加经手人名称为 赵六-财务 成功！','增加经手人成功'), ('1788','63','更新经手人','192.168.4.108','2016-12-10 16:48:43','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1789','63','更新经手人','192.168.4.108','2016-12-10 16:48:49','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1790','63','增加仓库','192.168.4.108','2016-12-10 16:59:41','0','增加仓库名称为 总部 成功！','增加仓库成功'), ('1791','63','更新仓库','192.168.4.108','2016-12-10 16:59:52','0','更新仓库ID为 2 成功！','更新仓库成功'), ('1792','63','更新仓库','192.168.4.108','2016-12-10 17:00:03','0','更新仓库ID为 1 成功！','更新仓库成功'), ('1793','63','更新经手人','192.168.4.108','2016-12-10 17:00:15','0','更新经手人ID为 3 成功！','更新经手人成功'), ('1794','63','更新经手人','192.168.4.108','2016-12-10 17:00:23','0','更新经手人ID为 4 成功！','更新经手人成功'), ('1795','63','登录系统','192.168.4.108','2016-12-10 17:10:40','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1796','63','退出系统','192.168.4.108','2016-12-10 17:39:05','0','管理用户：jsh 退出系统','jsh 退出系统'), ('1797','63','登录系统','192.168.4.108','2016-12-10 17:39:16','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1798','63','批量删除功能','192.168.4.108','2016-12-10 17:44:39','0','批量删除功能ID为 51,193 成功！','批量删除功能成功'), ('1799','63','批量删除功能','192.168.4.108','2016-12-10 17:44:54','0','批量删除功能ID为 46,47,48,49,50 成功！','批量删除功能成功'), ('1800','63','批量删除功能','192.168.4.108','2016-12-10 17:45:26','0','批量删除功能ID为 52,53,54,55 成功！','批量删除功能成功'), ('1801','63','批量删除功能','192.168.4.108','2016-12-10 17:45:49','0','批量删除功能ID为 45 成功！','批量删除功能成功'), ('1802','63','登录系统','192.168.112.102','2016-12-10 20:19:13','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1803','63','增加财务','192.168.112.102','2016-12-10 20:20:06','0','增加财务编号为 33 成功！','增加财务成功'), ('1804','63','增加财务','192.168.112.102','2016-12-10 20:20:11','0','增加财务编号为 33 成功！','增加财务成功'), ('1805','63','增加财务','192.168.112.102','2016-12-10 20:20:12','0','增加财务编号为 33 成功！','增加财务成功'), ('1806','63','增加财务','192.168.112.102','2016-12-10 20:25:48','0','增加财务编号为 123 成功！','增加财务成功'), ('1807','63','登录系统','192.168.112.102','2016-12-10 20:50:11','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1808','63','增加财务','192.168.112.102','2016-12-10 20:51:41','0','增加财务编号为 3123 成功！','增加财务成功'), ('1809','63','增加财务','192.168.112.102','2016-12-10 20:53:58','0','增加财务编号为 3123 成功！','增加财务成功'), ('1810','63','增加财务','192.168.112.102','2016-12-10 21:08:57','0','增加财务编号为 123 成功！','增加财务成功'), ('1811','63','增加财务','192.168.112.102','2016-12-10 21:47:45','0','增加财务编号为 123 成功！','增加财务成功'), ('1812','63','保存财务明细','192.168.112.102','2016-12-10 21:47:46','0','保存财务明细对应主表编号为 8 成功！','保存财务明细成功'), ('1813','63','登录系统','192.168.112.102','2016-12-10 22:49:54','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1814','63','删除财务','192.168.112.102','2016-12-10 22:52:43','0','删除财务ID为 5 成功！','删除财务成功'), ('1815','63','批量删除财务','192.168.112.102','2016-12-10 22:52:49','0','批量删除财务ID为 4 成功！','批量删除财务成功'), ('1816','63','增加财务','192.168.112.102','2016-12-10 22:53:19','0','增加财务编号为 3134 成功！','增加财务成功'), ('1817','63','保存财务明细','192.168.112.102','2016-12-10 22:53:20','0','保存财务明细对应主表编号为 9 成功！','保存财务明细成功'), ('1818','63','删除财务','192.168.112.102','2016-12-10 22:53:35','0','删除财务ID为 7 成功！','删除财务成功'), ('1819','63','增加财务','192.168.112.102','2016-12-10 22:54:05','0','增加财务编号为 N123 成功！','增加财务成功'), ('1820','63','保存财务明细','192.168.112.102','2016-12-10 22:54:06','0','保存财务明细对应主表编号为 10 成功！','保存财务明细成功'), ('1821','63','更新财务','192.168.112.102','2016-12-10 22:54:28','0','更新财务ID为 10 成功！','更新财务成功'); INSERT INTO `jsh_log` VALUES ('1822','63','更新财务','192.168.112.102','2016-12-10 23:06:54','0','更新财务ID为 10 成功！','更新财务成功'), ('1823','63','增加财务','192.168.112.102','2016-12-10 23:07:51','0','增加财务编号为 124 成功！','增加财务成功'), ('1824','63','保存财务明细','192.168.112.102','2016-12-10 23:07:51','0','保存财务明细对应主表编号为 11 成功！','保存财务明细成功'), ('1825','63','登录系统','192.168.112.102','2016-12-10 23:09:32','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1826','63','更新财务','192.168.112.102','2016-12-10 23:09:55','0','更新财务ID为 10 成功！','更新财务成功'), ('1827','63','更新收支项目','192.168.112.102','2016-12-10 23:10:18','0','更新收支项目ID为 7 成功！','更新收支项目成功'), ('1828','63','更新收支项目','192.168.112.102','2016-12-10 23:10:32','0','更新收支项目ID为 5 成功！','更新收支项目成功'), ('1829','63','更新收支项目','192.168.112.102','2016-12-10 23:10:47','0','更新收支项目ID为 1 成功！','更新收支项目成功'), ('1830','63','增加收支项目','192.168.112.102','2016-12-10 23:11:05','0','增加收支项目名称为 水电费 成功！','增加收支项目成功'), ('1831','63','增加收支项目','192.168.112.102','2016-12-10 23:11:18','0','增加收支项目名称为 快递费 成功！','增加收支项目成功'), ('1832','63','增加收支项目','192.168.112.102','2016-12-10 23:11:30','0','增加收支项目名称为 交通报销费 成功！','增加收支项目成功'), ('1833','63','增加收支项目','192.168.112.102','2016-12-10 23:11:50','0','增加收支项目名称为 差旅费 成功！','增加收支项目成功'), ('1834','63','增加财务','192.168.112.102','2016-12-10 23:12:45','0','增加财务编号为 NO123 成功！','增加财务成功'), ('1835','63','保存财务明细','192.168.112.102','2016-12-10 23:12:46','0','保存财务明细对应主表编号为 12 成功！','保存财务明细成功'), ('1836','63','更新财务','192.168.112.102','2016-12-10 23:27:12','0','更新财务ID为 12 成功！','更新财务成功'), ('1837','63','更新财务','192.168.112.102','2016-12-10 23:27:46','0','更新财务ID为 12 成功！','更新财务成功'), ('1838','63','登录系统','192.168.112.102','2016-12-10 23:29:10','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1839','63','更新财务','192.168.112.102','2016-12-10 23:30:01','0','更新财务ID为 12 成功！','更新财务成功'), ('1840','63','更新财务','192.168.112.102','2016-12-10 23:30:43','0','更新财务ID为 12 成功！','更新财务成功'), ('1841','63','更新财务','192.168.112.102','2016-12-10 23:31:17','0','更新财务ID为 12 成功！','更新财务成功'), ('1842','63','更新财务','192.168.112.102','2016-12-10 23:38:58','0','更新财务ID为 12 成功！','更新财务成功'), ('1843','63','更新财务','192.168.112.102','2016-12-10 23:42:13','0','更新财务ID为 12 成功！','更新财务成功'), ('1844','63','登录系统','192.168.112.102','2016-12-10 23:45:16','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1845','63','更新财务','192.168.112.102','2016-12-10 23:45:34','0','更新财务ID为 12 成功！','更新财务成功'), ('1846','63','增加财务','192.168.112.102','2016-12-10 23:46:22','0','增加财务编号为 12312 成功！','增加财务成功'), ('1847','63','保存财务明细','192.168.112.102','2016-12-10 23:46:23','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1848','63','更新财务','192.168.112.102','2016-12-10 23:46:50','0','更新财务ID为 13 成功！','更新财务成功'), ('1849','63','删除财务','192.168.112.102','2016-12-10 23:47:54','1','删除财务ID为 9 失败！','删除财务失败'), ('1850','63','删除财务','192.168.112.102','2016-12-10 23:48:00','1','删除财务ID为 10 失败！','删除财务失败'), ('1851','63','批量删除财务','192.168.112.102','2016-12-10 23:48:07','1','批量删除财务ID为 10 失败！','批量删除财务失败'), ('1852','63','删除财务','192.168.112.102','2016-12-10 23:53:36','0','删除财务ID为 10 成功！','删除财务成功'), ('1853','63','删除财务','192.168.112.102','2016-12-10 23:53:39','0','删除财务ID为 8 成功！','删除财务成功'), ('1854','63','批量删除财务','192.168.112.102','2016-12-10 23:53:44','0','批量删除财务ID为 6 成功！','批量删除财务成功'), ('1855','63','登录系统','192.168.4.107','2016-12-11 09:50:41','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1856','63','删除财务','192.168.4.107','2016-12-11 09:51:09','0','删除财务ID为 11 成功！','删除财务成功'), ('1857','63','增加财务','192.168.4.107','2016-12-11 09:51:42','0','增加财务编号为 N666 成功！','增加财务成功'), ('1858','63','保存财务明细','192.168.4.107','2016-12-11 09:51:43','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1859','63','批量删除功能','192.168.4.107','2016-12-11 10:08:23','0','批量删除功能ID为 34,35,36,37,39 成功！','批量删除功能成功'), ('1860','63','批量删除功能','192.168.4.107','2016-12-11 10:08:49','0','批量删除功能ID为 42,43 成功！','批量删除功能成功'), ('1861','63','更新功能','192.168.4.107','2016-12-11 10:15:14','0','更新功能ID为 40 成功！','更新功能成功'), ('1862','63','更新功能','192.168.4.107','2016-12-11 10:15:32','0','更新功能ID为 41 成功！','更新功能成功'), ('1863','63','更新功能','192.168.4.107','2016-12-11 10:17:58','0','更新功能ID为 3 成功！','更新功能成功'), ('1864','63','更新功能','192.168.4.107','2016-12-11 10:18:32','0','更新功能ID为 3 成功！','更新功能成功'), ('1865','63','删除功能','192.168.4.107','2016-12-11 10:18:56','0','删除功能ID为 10 成功！','删除功能成功'), ('1866','63','更新功能','192.168.4.107','2016-12-11 10:20:32','0','更新功能ID为 196 成功！','更新功能成功'), ('1867','63','更新功能','192.168.4.107','2016-12-11 10:33:16','0','更新功能ID为 15 成功！','更新功能成功'), ('1868','63','更新功能','192.168.4.107','2016-12-11 10:34:36','0','更新功能ID为 14 成功！','更新功能成功'), ('1869','63','登录系统','192.168.4.107','2016-12-11 14:36:43','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1870','63','增加功能','192.168.4.107','2016-12-11 15:11:33','0','增加功能名称为 入库退货 成功！','增加功能成功'), ('1871','63','增加功能','192.168.4.107','2016-12-11 15:12:44','0','增加功能名称为 销售退货 成功！','增加功能成功'), ('1872','63','更新功能','192.168.4.107','2016-12-11 15:13:08','0','更新功能ID为 199 成功！','更新功能成功'), ('1873','63','更新UserBusiness','192.168.4.107','2016-12-11 15:13:39','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1874','63','增加功能','192.168.4.107','2016-12-11 15:20:11','0','增加功能名称为 其他入库 成功！','增加功能成功'), ('1875','63','增加功能','192.168.4.107','2016-12-11 15:21:11','0','增加功能名称为 其他出库 成功！','增加功能成功'), ('1876','63','更新UserBusiness','192.168.4.107','2016-12-11 15:21:26','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1877','63','更新功能','192.168.4.107','2016-12-11 15:24:06','0','更新功能ID为 200 成功！','更新功能成功'), ('1878','63','更新功能','192.168.4.107','2016-12-11 15:24:43','0','更新功能ID为 199 成功！','更新功能成功'), ('1879','63','更新UserBusiness','192.168.4.107','2016-12-11 15:25:05','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1880','63','更新UserBusiness','192.168.4.107','2016-12-11 15:25:28','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1881','63','更新功能','192.168.4.107','2016-12-11 15:27:25','0','更新功能ID为 197 成功！','更新功能成功'), ('1882','63','更新功能','192.168.4.107','2016-12-11 15:30:42','0','更新功能ID为 197 成功！','更新功能成功'), ('1883','63','增加功能','192.168.4.107','2016-12-11 15:31:43','0','增加功能名称为 支出单 成功！','增加功能成功'), ('1884','63','更新功能','192.168.4.107','2016-12-11 15:31:56','0','更新功能ID为 203 成功！','更新功能成功'), ('1885','63','更新UserBusiness','192.168.4.107','2016-12-11 15:32:12','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1886','63','更新UserBusiness','192.168.4.107','2016-12-11 15:32:23','0','更新UserBusiness的ID为 6 成功！','更新UserBusiness成功'), ('1887','63','更新功能','192.168.4.107','2016-12-11 15:39:07','0','更新功能ID为 197 成功！','更新功能成功'), ('1888','63','更新功能','192.168.4.107','2016-12-11 15:39:14','0','更新功能ID为 203 成功！','更新功能成功'), ('1889','63','增加功能','192.168.4.107','2016-12-11 15:40:32','0','增加功能名称为 收款单 成功！','增加功能成功'), ('1890','63','增加功能','192.168.4.107','2016-12-11 15:41:18','0','增加功能名称为 付款单 成功！','增加功能成功'), ('1891','63','增加功能','192.168.4.107','2016-12-11 15:42:11','0','增加功能名称为 转账单 成功！','增加功能成功'), ('1892','63','更新功能','192.168.4.107','2016-12-11 15:42:26','0','更新功能ID为 204 成功！','更新功能成功'), ('1893','63','更新UserBusiness','192.168.4.107','2016-12-11 15:42:37','0','更新UserBusiness的ID为 5 成功！','更新UserBusiness成功'), ('1894','63','更新功能','192.168.4.107','2016-12-11 15:43:50','0','更新功能ID为 206 成功！','更新功能成功'), ('1895','63','登录系统','192.168.112.100','2016-12-11 18:02:00','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1896','63','增加仓管通','192.168.112.100','2016-12-11 18:15:39','0','增加仓管通编号为 234234 成功！','增加仓管通成功'), ('1897','63','保存仓管通明细','192.168.112.100','2016-12-11 18:15:40','0','保存仓管通明细对应主表编号为 33 成功！','保存仓管通明细成功'), ('1898','63','更新功能','192.168.112.100','2016-12-11 18:23:48','0','更新功能ID为 201 成功！','更新功能成功'), ('1899','63','更新功能','192.168.112.100','2016-12-11 18:23:58','0','更新功能ID为 202 成功！','更新功能成功'), ('1900','63','增加仓管通','192.168.112.100','2016-12-11 18:44:50','0','增加仓管通编号为 1234 成功！','增加仓管通成功'), ('1901','63','保存仓管通明细','192.168.112.100','2016-12-11 18:44:51','0','保存仓管通明细对应主表编号为 34 成功！','保存仓管通明细成功'), ('1902','63','登录系统','192.168.112.100','2016-12-11 20:14:46','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1903','63','更新财务','192.168.112.100','2016-12-11 21:29:17','0','更新财务ID为 13 成功！','更新财务成功'), ('1904','63','更新财务','192.168.112.100','2016-12-11 21:29:47','0','更新财务ID为 13 成功！','更新财务成功'), ('1905','63','更新财务','192.168.112.100','2016-12-11 21:30:26','0','更新财务ID为 9 成功！','更新财务成功'), ('1906','63','更新财务','192.168.112.100','2016-12-11 21:32:31','0','更新财务ID为 13 成功！','更新财务成功'), ('1907','63','更新财务','192.168.112.100','2016-12-11 21:44:38','0','更新财务ID为 13 成功！','更新财务成功'), ('1908','63','登录系统','192.168.112.100','2016-12-11 21:50:51','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1909','63','更新财务','192.168.112.100','2016-12-11 21:51:18','0','更新财务ID为 13 成功！','更新财务成功'), ('1910','63','更新财务','192.168.112.100','2016-12-11 21:59:18','0','更新财务ID为 13 成功！','更新财务成功'), ('1911','63','保存财务明细','192.168.112.100','2016-12-11 21:59:19','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1912','63','更新财务','192.168.112.100','2016-12-11 22:00:04','0','更新财务ID为 12 成功！','更新财务成功'), ('1913','63','保存财务明细','192.168.112.100','2016-12-11 22:00:05','0','保存财务明细对应主表编号为 12 成功！','保存财务明细成功'), ('1914','63','更新财务','192.168.112.100','2016-12-11 22:01:32','0','更新财务ID为 13 成功！','更新财务成功'), ('1915','63','保存财务明细','192.168.112.100','2016-12-11 22:01:33','0','保存财务明细对应主表编号为 13 成功！','保存财务明细成功'), ('1916','63','更新仓管通','192.168.112.100','2016-12-11 22:08:09','0','更新仓管通ID为 32 成功！','更新仓管通成功'), ('1917','63','保存仓管通明细','192.168.112.100','2016-12-11 22:08:09','0','保存仓管通明细对应主表编号为 32 成功！','保存仓管通明细成功'), ('1918','63','登录系统','192.168.112.100','2016-12-11 22:29:23','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1919','63','登录系统','192.168.112.100','2016-12-11 22:29:44','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1920','63','删除财务','192.168.112.100','2016-12-11 22:30:04','0','删除财务ID为 1 成功！','删除财务成功'), ('1921','63','批量删除财务','192.168.112.100','2016-12-11 22:30:09','0','批量删除财务ID为 2 成功！','批量删除财务成功'); -INSERT INTO `jsh_log` VALUES ('1922','63','更新财务','192.168.112.100','2016-12-11 22:30:25','0','更新财务ID为 3 成功！','更新财务成功'), ('1923','63','更新财务','192.168.112.100','2016-12-11 22:30:35','0','更新财务ID为 3 成功！','更新财务成功'), ('1924','63','保存财务明细','192.168.112.100','2016-12-11 22:30:35','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1925','63','更新财务','192.168.112.100','2016-12-11 22:30:44','0','更新财务ID为 3 成功！','更新财务成功'), ('1926','63','保存财务明细','192.168.112.100','2016-12-11 22:30:44','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1927','63','更新财务','192.168.112.100','2016-12-11 22:30:53','0','更新财务ID为 3 成功！','更新财务成功'), ('1928','63','增加仓管通','192.168.112.100','2016-12-11 22:31:49','0','增加仓管通编号为 bbb 成功！','增加仓管通成功'), ('1929','63','保存仓管通明细','192.168.112.100','2016-12-11 22:31:50','0','保存仓管通明细对应主表编号为 35 成功！','保存仓管通明细成功'), ('1930','63','更新仓管通','192.168.112.100','2016-12-11 22:32:16','0','更新仓管通ID为 35 成功！','更新仓管通成功'), ('1931','63','增加仓管通','192.168.112.100','2016-12-11 22:32:52','0','增加仓管通编号为 bb22 成功！','增加仓管通成功'), ('1932','63','保存仓管通明细','192.168.112.100','2016-12-11 22:32:53','0','保存仓管通明细对应主表编号为 36 成功！','保存仓管通明细成功'), ('1933','63','增加财务','192.168.112.100','2016-12-11 22:37:44','0','增加财务编号为 aa 成功！','增加财务成功'), ('1934','63','保存财务明细','192.168.112.100','2016-12-11 22:37:45','0','保存财务明细对应主表编号为 14 成功！','保存财务明细成功'), ('1935','63','增加财务','192.168.112.100','2016-12-11 22:38:12','0','增加财务编号为 34124 成功！','增加财务成功'), ('1936','63','保存财务明细','192.168.112.100','2016-12-11 22:38:12','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1937','63','增加财务','192.168.112.100','2016-12-11 22:38:44','0','增加财务编号为 234234 成功！','增加财务成功'), ('1938','63','保存财务明细','192.168.112.100','2016-12-11 22:38:44','0','保存财务明细对应主表编号为 16 成功！','保存财务明细成功'), ('1939','63','增加财务','192.168.112.100','2016-12-11 22:39:23','0','增加财务编号为 234 成功！','增加财务成功'), ('1940','63','保存财务明细','192.168.112.100','2016-12-11 22:39:23','0','保存财务明细对应主表编号为 17 成功！','保存财务明细成功'); +INSERT INTO `jsh_log` VALUES ('1922','63','更新财务','192.168.112.100','2016-12-11 22:30:25','0','更新财务ID为 3 成功！','更新财务成功'), ('1923','63','更新财务','192.168.112.100','2016-12-11 22:30:35','0','更新财务ID为 3 成功！','更新财务成功'), ('1924','63','保存财务明细','192.168.112.100','2016-12-11 22:30:35','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1925','63','更新财务','192.168.112.100','2016-12-11 22:30:44','0','更新财务ID为 3 成功！','更新财务成功'), ('1926','63','保存财务明细','192.168.112.100','2016-12-11 22:30:44','0','保存财务明细对应主表编号为 3 成功！','保存财务明细成功'), ('1927','63','更新财务','192.168.112.100','2016-12-11 22:30:53','0','更新财务ID为 3 成功！','更新财务成功'), ('1928','63','增加仓管通','192.168.112.100','2016-12-11 22:31:49','0','增加仓管通编号为 bbb 成功！','增加仓管通成功'), ('1929','63','保存仓管通明细','192.168.112.100','2016-12-11 22:31:50','0','保存仓管通明细对应主表编号为 35 成功！','保存仓管通明细成功'), ('1930','63','更新仓管通','192.168.112.100','2016-12-11 22:32:16','0','更新仓管通ID为 35 成功！','更新仓管通成功'), ('1931','63','增加仓管通','192.168.112.100','2016-12-11 22:32:52','0','增加仓管通编号为 bb22 成功！','增加仓管通成功'), ('1932','63','保存仓管通明细','192.168.112.100','2016-12-11 22:32:53','0','保存仓管通明细对应主表编号为 36 成功！','保存仓管通明细成功'), ('1933','63','增加财务','192.168.112.100','2016-12-11 22:37:44','0','增加财务编号为 aa 成功！','增加财务成功'), ('1934','63','保存财务明细','192.168.112.100','2016-12-11 22:37:45','0','保存财务明细对应主表编号为 14 成功！','保存财务明细成功'), ('1935','63','增加财务','192.168.112.100','2016-12-11 22:38:12','0','增加财务编号为 34124 成功！','增加财务成功'), ('1936','63','保存财务明细','192.168.112.100','2016-12-11 22:38:12','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1937','63','增加财务','192.168.112.100','2016-12-11 22:38:44','0','增加财务编号为 234234 成功！','增加财务成功'), ('1938','63','保存财务明细','192.168.112.100','2016-12-11 22:38:44','0','保存财务明细对应主表编号为 16 成功！','保存财务明细成功'), ('1939','63','增加财务','192.168.112.100','2016-12-11 22:39:23','0','增加财务编号为 234 成功！','增加财务成功'), ('1940','63','保存财务明细','192.168.112.100','2016-12-11 22:39:23','0','保存财务明细对应主表编号为 17 成功！','保存财务明细成功'), ('1941','63','登录系统','192.168.1.103','2016-12-18 11:47:14','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1942','63','增加财务','192.168.1.103','2016-12-18 12:57:39','0','增加财务编号为 123123 成功！','增加财务成功'), ('1943','63','保存财务明细','192.168.1.103','2016-12-18 12:57:40','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1944','63','更新供应商','192.168.1.103','2016-12-18 13:02:15','0','更新供应商ID为 4 成功！','更新供应商成功'), ('1945','63','更新财务','192.168.1.103','2016-12-18 13:02:40','0','更新财务ID为 18 成功！','更新财务成功'), ('1946','63','保存财务明细','192.168.1.103','2016-12-18 13:02:41','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1947','63','更新财务','192.168.1.103','2016-12-18 13:03:01','0','更新财务ID为 18 成功！','更新财务成功'), ('1948','63','保存财务明细','192.168.1.103','2016-12-18 13:03:02','0','保存财务明细对应主表编号为 18 成功！','保存财务明细成功'), ('1949','63','更新财务','192.168.1.103','2016-12-18 13:05:58','0','更新财务ID为 15 成功！','更新财务成功'), ('1950','63','保存财务明细','192.168.1.103','2016-12-18 13:05:58','0','保存财务明细对应主表编号为 15 成功！','保存财务明细成功'), ('1951','63','登录系统','192.168.112.101','2016-12-18 21:32:52','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1952','63','更新UserBusiness','192.168.112.101','2016-12-18 22:00:16','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1953','63','登录系统','127.0.0.1','2016-12-20 12:30:58','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1954','63','登录系统','127.0.0.1','2016-12-20 12:45:18','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1955','63','登录系统','192.168.112.102','2016-12-23 22:08:55','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1956','63','增加仓管通','192.168.112.102','2016-12-23 23:12:33','1','增加仓管通编号为 wrwq 失败！','增加仓管通失败'), ('1957','63','登录系统','192.168.112.102','2016-12-24 08:45:28','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1958','63','登录系统','192.168.112.102','2016-12-24 12:12:45','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1959','63','增加仓库','192.168.112.102','2016-12-24 12:33:18','0','增加仓库名称为 苏州花边店 成功！','增加仓库成功'), ('1960','63','更新UserBusiness','192.168.112.102','2016-12-24 12:44:03','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1961','63','更新UserBusiness','192.168.112.102','2016-12-24 13:10:12','0','更新UserBusiness的ID为 18 成功！','更新UserBusiness成功'), ('1962','63','增加经手人','192.168.112.102','2016-12-24 13:28:51','1','增加经手人名称为 失败！','增加经手人失败'), ('1963','63','增加经手人','192.168.112.102','2016-12-24 13:36:27','0','增加经手人名称为 成功！','增加经手人成功'), ('1964','63','增加经手人','192.168.112.102','2016-12-24 13:40:00','0','增加经手人名称为 成功！','增加经手人成功'), ('1965','63','增加经手人','192.168.112.102','2016-12-24 13:40:06','0','增加经手人名称为 成功！','增加经手人成功'), ('1966','63','增加经手人','192.168.112.102','2016-12-24 13:42:26','0','增加经手人名称为 成功！','增加经手人成功'), ('1967','63','增加经手人','192.168.112.102','2016-12-24 13:45:11','0','增加经手人名称为 成功！','增加经手人成功'), ('1968','63','增加经手人','192.168.112.102','2016-12-24 13:46:29','0','增加经手人名称为 成功！','增加经手人成功'), ('1969','63','批量删除经手人','192.168.112.102','2016-12-24 13:48:20','0','批量删除经手人ID为 5,6,7,8,9,10 成功！','批量删除经手人成功'), ('1970','63','增加经手人','192.168.112.102','2016-12-24 13:49:03','0','增加经手人名称为 655aaaa 成功！','增加经手人成功'), ('1971','63','增加经手人','192.168.112.102','2016-12-24 13:50:08','0','增加经手人名称为 11111 成功！','增加经手人成功'), ('1972','63','删除经手人','192.168.112.102','2016-12-24 13:50:11','0','删除经手人ID为 12 成功！','删除经手人成功'), ('1973','63','删除经手人','192.168.112.102','2016-12-24 13:50:15','0','删除经手人ID为 11 成功！','删除经手人成功'), ('1974','63','增加经手人','192.168.112.102','2016-12-24 13:50:31','0','增加经手人名称为 rrrrr 成功！','增加经手人成功'), ('1975','63','更新经手人','192.168.112.102','2016-12-24 13:50:36','0','更新经手人ID为 13 成功！','更新经手人成功'), ('1976','63','删除经手人','192.168.112.102','2016-12-24 13:53:27','0','删除经手人ID为 13 成功！','删除经手人成功'), ('1977','63','删除经手人','192.168.112.102','2016-12-24 13:55:13','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1978','63','删除经手人','192.168.112.102','2016-12-24 13:55:19','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1979','63','增加经手人','192.168.112.102','2016-12-24 13:55:25','0','增加经手人名称为 123123 成功！','增加经手人成功'), ('1980','63','删除经手人','192.168.112.102','2016-12-24 13:55:28','0','删除经手人ID为 14 成功！','删除经手人成功'), ('1981','63','删除经手人','192.168.112.102','2016-12-24 13:55:32','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1982','63','删除经手人','192.168.112.102','2016-12-24 13:56:05','1','删除经手人ID为 2 失败！','删除经手人失败'), ('1983','63','更新经手人','192.168.112.102','2016-12-24 13:56:18','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1984','63','更新经手人','192.168.112.102','2016-12-24 13:56:33','0','更新经手人ID为 2 成功！','更新经手人成功'), ('1985','63','增加仓管通','192.168.112.102','2016-12-24 14:07:11','1','增加仓管通编号为 1111 失败！','增加仓管通失败'), ('1986','63','增加仓管通','192.168.112.102','2016-12-24 14:07:20','1','增加仓管通编号为 1111 失败！','增加仓管通失败'), ('1987','63','增加仓管通','192.168.112.102','2016-12-24 14:17:53','1','增加仓管通编号为 33 失败！','增加仓管通失败'), ('1988','63','增加仓管通','192.168.112.102','2016-12-24 14:18:15','1','增加仓管通编号为 33 失败！','增加仓管通失败'), ('1989','63','增加仓管通','192.168.112.102','2016-12-24 14:33:03','0','增加仓管通编号为 123 成功！','增加仓管通成功'), ('1990','63','保存仓管通明细','192.168.112.102','2016-12-24 14:33:03','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1991','63','更新仓管通','192.168.112.102','2016-12-24 14:35:40','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1992','63','更新仓管通','192.168.112.102','2016-12-24 14:37:08','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1993','63','保存仓管通明细','192.168.112.102','2016-12-24 14:37:08','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1994','63','更新仓管通','192.168.112.102','2016-12-24 14:37:32','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1995','63','更新仓管通','192.168.112.102','2016-12-24 14:51:08','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1996','63','更新仓管通','192.168.112.102','2016-12-24 14:51:47','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('1997','63','保存仓管通明细','192.168.112.102','2016-12-24 14:51:48','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('1998','63','登录系统','192.168.112.102','2016-12-24 15:32:37','0','管理用户：jsh 登录系统','jsh 登录系统'), ('1999','63','登录系统','192.168.112.102','2016-12-24 16:14:10','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2000','63','登录系统','192.168.112.102','2016-12-24 17:43:55','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2001','63','登录系统','192.168.112.102','2016-12-24 17:45:17','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2002','63','登录系统','192.168.112.102','2016-12-24 19:47:51','0','管理用户：jsh 登录系统','jsh 登录系统'), ('2003','63','更新仓管通','192.168.112.102','2016-12-24 22:12:26','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2004','63','保存仓管通明细','192.168.112.102','2016-12-24 22:12:27','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2005','63','更新仓管通','192.168.112.102','2016-12-24 22:54:10','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2006','63','保存仓管通明细','192.168.112.102','2016-12-24 22:54:11','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2007','63','更新仓管通','192.168.112.102','2016-12-24 23:01:32','0','更新仓管通ID为 37 成功！','更新仓管通成功'), ('2008','63','保存仓管通明细','192.168.112.102','2016-12-24 23:01:32','0','保存仓管通明细对应主表编号为 37 成功！','保存仓管通明细成功'), ('2009','63','增加仓管通','192.168.112.102','2016-12-24 23:14:22','0','增加仓管通编号为 123132 成功！','增加仓管通成功'), ('2010','63','更新仓管通','192.168.112.102','2016-12-24 23:29:31','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2011','63','更新仓管通','192.168.112.102','2016-12-24 23:33:25','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2012','63','更新仓管通','192.168.112.102','2016-12-24 23:37:28','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2013','63','保存仓管通明细','192.168.112.102','2016-12-24 23:37:29','0','保存仓管通明细对应主表编号为 38 成功！','保存仓管通明细成功'), ('2014','63','更新仓管通','192.168.112.102','2016-12-24 23:41:41','0','更新仓管通ID为 38 成功！','更新仓管通成功'), ('2015','63','保存仓管通明细','192.168.112.102','2016-12-24 23:41:41','0','保存仓管通明细对应主表编号为 38 成功！','保存仓管通明细成功'), ('2016','63','增加仓管通','192.168.112.102','2016-12-24 23:43:50','0','增加仓管通编号为 222 成功！','增加仓管通成功'), ('2017','63','保存仓管通明细','192.168.112.102','2016-12-24 23:43:51','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'), ('2018','63','更新仓管通','192.168.112.102','2016-12-24 23:44:16','0','更新仓管通ID为 39 成功！','更新仓管通成功'), ('2019','63','保存仓管通明细','192.168.112.102','2016-12-24 23:44:17','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'), ('2020','63','更新仓管通','192.168.112.102','2016-12-24 23:46:56','0','更新仓管通ID为 39 成功！','更新仓管通成功'), ('2021','63','保存仓管通明细','192.168.112.102','2016-12-24 23:46:57','0','保存仓管通明细对应主表编号为 39 成功！','保存仓管通明细成功'); +INSERT INTO `jsh_log` VALUES ('2022','63','更新仓管通','192.168.112.102','2016-12-24 23:50:37','0','更新仓管通ID为 39 成功！','更新仓管通成功'); INSERT INTO `jsh_material` VALUES ('485','1','棉线','A21-4321','米色','码','',NULL,NULL,NULL,NULL), ('487','1','网布','12343','红色','码','',NULL,NULL,NULL,NULL), ('498','2','蕾丝','B123','蓝色','码','',NULL,NULL,NULL,NULL); INSERT INTO `jsh_materialcategory` VALUES ('1','根目录','1','1'), ('2','花边分类','1','1'); -INSERT INTO `jsh_person` VALUES ('1','1','仓管员','张三-仓管'), ('2','1','采购人','李四-采购'), ('3','2','财务员','王五-财务'), ('4','2','财务员','赵六-财务'); +INSERT INTO `jsh_person` VALUES ('1','仓管员','张三-仓管'), ('2','仓管员','李四-仓管'), ('3','财务员','王五-财务'), ('4','财务员','赵六-财务'); INSERT INTO `jsh_role` VALUES ('4','管理员'), ('5','仓管员'); -INSERT INTO `jsh_supplier` VALUES ('1','上海某某花边工厂','','','','','1','供应商','\0',NULL,NULL,NULL,NULL), ('2','客户AAAA','','','','','1','客户','\0',NULL,NULL,NULL,NULL), ('4','aaaa','11','22','312341@qq.com','55','1','供应商','\0','33','44',NULL,NULL); +INSERT INTO `jsh_supplier` VALUES ('1','上海某某花边工厂','','','','','1','供应商','\0',NULL,NULL,NULL,NULL), ('2','客户AAAA','','','','','1','客户','\0',NULL,NULL,NULL,NULL), ('4','苏州新源布料厂','11','22','312341@qq.com','55','1','供应商','\0','33','44',NULL,NULL); INSERT INTO `jsh_user` VALUES ('63','季圣华','jsh','e10adc3949ba59abbe56e057f20f883e','','','','','0','1','-1','',NULL), ('64','张三','zs','e10adc3949ba59abbe56e057f20f883e','','销售','','','0','1',NULL,'',NULL), ('65','李四','ls','e10adc3949ba59abbe56e057f20f883e','','销售','','','0','1',NULL,'',NULL); -INSERT INTO `jsh_userbusiness` VALUES ('1','RoleAPP','4','[21][1][8][11][10][19][16][15][12][7][17][20][18][3][6][22][23][24][25]'), ('2','RoleAPP','5','[8][7][3][6]'), ('3','RoleAPP','6','[21][1][8]'), ('4','RoleAPP','7','[21][1][8][11]'), ('5','RoleFunctions','4','[13][12][16][14][15][22][23][25][26][194][195][31][33][200][201][41][199][202][40][197][203][204][205][206][59]'), ('6','RoleFunctions','5','[22][23][25][26][194][195][31][33][200][201][41][199][202][40][59]'), ('7','RoleFunctions','6','[168][13][12][16][14][15][189][18][19]'), ('8','RoleAPP','8','[21][1][8][11][10]'), ('9','RoleFunctions','7','[168][13][12][16][14][15][189][18][19][132]'), ('10','RoleFunctions','8','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]'), ('11','RoleFunctions','9','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]'), ('12','UserRole','1','[5]'), ('13','UserRole','2','[6][7]'), ('14','UserDepot','2','[1][2][6][7]'), ('15','UserDepot','1','[1][2][5][6][7][10][12][14][15][17]'), ('16','UserRole','63','[4]'), ('17','RoleFunctions','13','[46][47][48][49]'), ('18','UserDepot','63','[1][6][45][46][50][51]'), ('19','UserDepot','5','[6][45][46][50]'), ('20','UserRole','5','[5]'), ('21','UserRole','64','[5]'), ('22','UserDepot','64','[1]'), ('23','UserRole','65','[5]'), ('24','UserDepot','65','[1]'); +INSERT INTO `jsh_userbusiness` VALUES ('1','RoleAPP','4','[21][1][8][11][10][19][16][15][12][7][17][20][18][3][6][22][23][24][25]'), ('2','RoleAPP','5','[8][7][3][6]'), ('3','RoleAPP','6','[21][1][8]'), ('4','RoleAPP','7','[21][1][8][11]'), ('5','RoleFunctions','4','[13][12][16][14][15][22][23][25][26][194][195][31][33][200][201][41][199][202][40][197][203][204][205][206][59]'), ('6','RoleFunctions','5','[22][23][25][26][194][195][31][33][200][201][41][199][202][40][59]'), ('7','RoleFunctions','6','[168][13][12][16][14][15][189][18][19]'), ('8','RoleAPP','8','[21][1][8][11][10]'), ('9','RoleFunctions','7','[168][13][12][16][14][15][189][18][19][132]'), ('10','RoleFunctions','8','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187]'), ('11','RoleFunctions','9','[168][13][12][16][14][15][189][18][19][132][22][23][25][26][27][157][158][155][156][125][31][127][126][128][33][34][35][36][37][39][40][41][42][43][46][47][48][49][50][51][52][53][54][55][56][57][192][59][60][61][62][63][65][66][68][69][70][71][73][74][76][77][79][191][81][82][83][85][89][161][86][176][165][160][28][134][91][92][29][94][95][97][104][99][100][101][102][105][107][108][110][111][113][114][116][117][118][120][121][131][135][123][122][20][130][146][147][138][148][149][153][140][145][184][152][143][170][171][169][166][167][163][164][172][173][179][178][181][182][183][186][187][188]'), ('12','UserRole','1','[5]'), ('13','UserRole','2','[6][7]'), ('14','UserDepot','2','[1][2][6][7]'), ('15','UserDepot','1','[1][2][5][6][7][10][12][14][15][17]'), ('16','UserRole','63','[4]'), ('17','RoleFunctions','13','[46][47][48][49]'), ('18','UserDepot','63','[1][3]'), ('19','UserDepot','5','[6][45][46][50]'), ('20','UserRole','5','[5]'), ('21','UserRole','64','[5]'), ('22','UserDepot','64','[1]'), ('23','UserRole','65','[5]'), ('24','UserDepot','65','[1]'); diff --git a/src/com/jsh/action/basic/DepotAction.java b/src/com/jsh/action/basic/DepotAction.java index 25b185112..d1c798e08 100644 --- a/src/com/jsh/action/basic/DepotAction.java +++ b/src/com/jsh/action/basic/DepotAction.java @@ -40,7 +40,7 @@ public class DepotAction extends BaseAction try { Map condition = pageUtil.getAdvSearch(); - condition.put("id_s_order", "asc"); + condition.put("sort_s_order", "asc"); depotService.find(pageUtil); mapData.put("depotList", pageUtil.getPageList()); } @@ -237,10 +237,6 @@ public class DepotAction extends BaseAction depotService.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数组 @@ -274,7 +270,7 @@ public class DepotAction extends BaseAction } /** - * 用户对应部门显示 + * 用户对应仓库显示 * @return */ public void findUserDepot() @@ -292,7 +288,7 @@ public class DepotAction extends BaseAction //开始拼接json数据 JSONObject outer = new JSONObject(); outer.put("id", 1); - outer.put("text", "部门列表"); + outer.put("text", "仓库列表"); outer.put("state", "open"); //存放数据json数组 JSONArray dataArray = new JSONArray(); @@ -311,7 +307,7 @@ public class DepotAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的部门：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); + Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); } if (flag==true){item.put("checked", true);} //结束 @@ -324,11 +320,11 @@ public class DepotAction extends BaseAction } catch (DataAccessException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找部门异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e); } catch (IOException e) { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询部门结果异常", e); + Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e); } } @@ -358,7 +354,7 @@ public class DepotAction extends BaseAction * 拼接搜索条件 */ Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); + condition.put("sort_s_order", "asc"); return condition; } diff --git a/src/com/jsh/action/materials/AccountHeadAction.java b/src/com/jsh/action/materials/AccountHeadAction.java index 806f7f113..e16153a99 100644 --- a/src/com/jsh/action/materials/AccountHeadAction.java +++ b/src/com/jsh/action/materials/AccountHeadAction.java @@ -12,7 +12,6 @@ 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.Building; import com.jsh.model.po.Account; import com.jsh.model.po.AccountHead; import com.jsh.model.po.Logdetails; diff --git a/src/com/jsh/action/materials/BuildingAction.java b/src/com/jsh/action/materials/BuildingAction.java deleted file mode 100644 index 5140cd15f..000000000 --- a/src/com/jsh/action/materials/BuildingAction.java +++ /dev/null @@ -1,274 +0,0 @@ -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.Depot; -import com.jsh.model.po.Building; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.materials.BuildingModel; -import com.jsh.service.materials.BuildingIService; -import com.jsh.util.PageUtil; - -@SuppressWarnings("serial") -public class BuildingAction extends BaseAction -{ - private BuildingIService buildingService; - private BuildingModel model = new BuildingModel(); - - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("ProjectId_n_eq", model.getProjectId()); - condition.put("Id_s_order", "asc"); - buildingService.find(pageUtil); - mapData.put("buildingList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - /** - * 增加单元 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加单元信息方法create()==================="); - Boolean flag = false; - try - { - Building building = new Building(); - building.setDepot(new Depot(model.getProjectId())); - - building.setName(model.getName()); - building.setRemark(model.getRemark()); - building.setEnabled(model.getEnabled()); - buildingService.create(building); - - //========标识位=========== - 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 - { - buildingService.delete(model.getBuildingID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getBuildingID() + " 的单元异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除单元ID为 "+ model.getBuildingID() + " " + tipMsg + "！", "删除单元" + tipMsg)); - Log.infoFileSync("====================结束调用删除单元信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新单元 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Building building = buildingService.get(model.getBuildingID()); - building.setDepot(new Depot(model.getProjectId())); - - building.setName(model.getName()); - building.setRemark(model.getRemark()); - building.setEnabled(model.getEnabled()); - buildingService.update(building); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改单元ID为 ： " + model.getBuildingID() + "信息失败", 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.getBuildingID() + " " + tipMsg + "！", "更新单元" + tipMsg)); - } - - /** - * 批量删除指定ID单元 - * @return - */ - public String batchDelete() - { - try - { - buildingService.batchDelete(model.getBuildingIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除单元ID为：" + model.getBuildingIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除单元", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除单元ID为 "+ model.getBuildingIDs() + " " + tipMsg + "！", "批量删除单元" + tipMsg)); - return SUCCESS; - } - - /** - * 查找单元信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - buildingService.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(Building building:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", building.getId()); - item.put("ProjectId", building.getDepot().getId()); - item.put("ProjectName", building.getDepot().getName()); - item.put("Name", building.getName()); - item.put("Remark", building.getRemark()); - item.put("Enabled", building.getEnabled()); - 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("Name_s_like", model.getName()); - condition.put("Id_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public BuildingModel getModel() - { - return model; - } - public void setBuildingService(BuildingIService buildingService) - { - this.buildingService = buildingService; - } -} diff --git a/src/com/jsh/action/materials/DepotHeadAction.java b/src/com/jsh/action/materials/DepotHeadAction.java index 21af3e239..c903a0afd 100644 --- a/src/com/jsh/action/materials/DepotHeadAction.java +++ b/src/com/jsh/action/materials/DepotHeadAction.java @@ -12,7 +12,7 @@ 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.Building; +import com.jsh.model.po.Account; import com.jsh.model.po.Depot; import com.jsh.model.po.DepotHead; import com.jsh.model.po.Logdetails; @@ -81,13 +81,12 @@ public class DepotHeadAction extends BaseAction Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); } if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getWareHousePersonId()!=null){depotHead.setWareHousePersonId(new Person(model.getWareHousePersonId()));} + if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} + if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} + depotHead.setChangeAmount(model.getChangeAmount()); if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - if(model.getBuildingId()!=null){depotHead.setBuildingId(new Building(model.getBuildingId()));} - depotHead.setSettlementWay(model.getSettlementWay()); + depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setRemark(model.getRemark()); - depotHead.setState("草稿"); depotHeadService.create(depotHead); //========标识位=========== @@ -173,10 +172,10 @@ public class DepotHeadAction extends BaseAction } if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getWareHousePersonId()!=null){depotHead.setWareHousePersonId(new Person(model.getWareHousePersonId()));} + if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} + depotHead.setChangeAmount(model.getChangeAmount()); if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - if(model.getBuildingId()!=null){depotHead.setBuildingId(new Building(model.getBuildingId()));} - depotHead.setSettlementWay(model.getSettlementWay()); + depotHead.setTotalPrice(model.getTotalPrice()); depotHead.setRemark(model.getRemark()); depotHeadService.update(depotHead); @@ -207,58 +206,6 @@ public class DepotHeadAction extends BaseAction , tipType, "更新仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "更新仓管通" + tipMsg)); } - /** - * 更新状态 - * @return - */ - public void submit() - { - Log.infoFileSync("====================开始调用更新状态仓管通信息方法submit()================"); - Boolean flag = false; - String changeId=""; - try - { - String DepotHeadIDs=model.getDepotHeadIDs(); - String[] DepotHeadID=DepotHeadIDs.split(","); - for(int i=0;i>>>>>>>>>>>>更新状态仓管通ID为 ： " + model.getDepotHeadID() + "信息失败", 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.getState()+"-ID为 "+ changeId + " " + tipMsg + "！", "更新状态仓管通" + tipMsg)); - Log.infoFileSync("====================结束调用更新状态仓管通信息方法submit()================"); - } - /** * 批量删除指定ID仓管通 * @return @@ -301,10 +248,6 @@ public class DepotHeadAction extends BaseAction depotHeadService.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数组 @@ -325,17 +268,13 @@ public class DepotHeadAction extends BaseAction item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier()); item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId()); item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName()); - item.put("WareHousePersonId", depotHead.getWareHousePersonId()==null?"":depotHead.getWareHousePersonId().getId()); - item.put("WareHousePersonName", depotHead.getWareHousePersonId()==null?"":depotHead.getWareHousePersonId().getName()); + item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId()); + item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName()); + item.put("ChangeAmount", depotHead.getChangeAmount()); item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId()); - item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); - item.put("BuildingId", depotHead.getBuildingId()==null?"":depotHead.getBuildingId().getId()); - item.put("BuildingName", depotHead.getBuildingId()==null?"":depotHead.getBuildingId().getName()); //单元名称 - item.put("SettlementWay", depotHead.getSettlementWay()); + item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); + item.put("TotalPrice", depotHead.getTotalPrice()); item.put("Remark", depotHead.getRemark()); - item.put("State", depotHead.getState()); - item.put("ReAuditPersonName", depotHead.getReAuditPersonName()); - item.put("Reason", depotHead.getReason()); item.put("op", 1); dataArray.add(item); } @@ -411,7 +350,6 @@ public class DepotHeadAction extends BaseAction condition.put("Number_s_like",model.getNumber()); condition.put("OperTime_s_gteq",model.getBeginTime()); condition.put("OperTime_s_lteq",model.getEndTime()); - condition.put("State_s_eq", model.getState()); condition.put("Id_s_order","desc"); return condition; } diff --git a/src/com/jsh/action/materials/DepotItemAction.java b/src/com/jsh/action/materials/DepotItemAction.java index 70cae83d2..80505294a 100644 --- a/src/com/jsh/action/materials/DepotItemAction.java +++ b/src/com/jsh/action/materials/DepotItemAction.java @@ -66,9 +66,8 @@ public class DepotItemAction extends BaseAction depotItem.setMaterialId(new Material(tempInsertedJson.getLong("MaterialId"))); depotItem.setOperNumber(tempInsertedJson.getDouble("OperNumber")); if(tempInsertedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempInsertedJson.getDouble("UnitPrice"));} - if(tempInsertedJson.get("Incidentals")!=null){depotItem.setIncidentals(0.0);} + if(tempInsertedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempInsertedJson.getDouble("AllPrice"));} depotItem.setRemark(tempInsertedJson.getString("Remark")); - depotItem.setImg(tempInsertedJson.getString("Img")); depotItemService.create(depotItem); } } @@ -89,9 +88,8 @@ public class DepotItemAction extends BaseAction depotItem.setMaterialId(new Material(tempUpdatedJson.getLong("MaterialId"))); depotItem.setOperNumber(tempUpdatedJson.getDouble("OperNumber")); if(tempUpdatedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempUpdatedJson.getDouble("UnitPrice"));} - if(tempUpdatedJson.get("Incidentals")!=null){depotItem.setIncidentals(0.0);} + if(tempUpdatedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempUpdatedJson.getDouble("AllPrice"));} depotItem.setRemark(tempUpdatedJson.getString("Remark")); - depotItem.setImg(tempUpdatedJson.getString("Img")); depotItemService.create(depotItem); } } @@ -143,10 +141,6 @@ public class DepotItemAction extends BaseAction depotItemService.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数组 @@ -158,10 +152,13 @@ public class DepotItemAction extends BaseAction JSONObject item = new JSONObject(); item.put("Id", depotItem.getId()); item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName()+((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")"); + String MaterialName = ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName() + +((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")" + +((depotItem.getMaterialId().getUnit() == null)?"(":"("+depotItem.getMaterialId().getUnit()) + ")"; + item.put("MaterialName", MaterialName); item.put("OperNumber", depotItem.getOperNumber()); item.put("UnitPrice", depotItem.getUnitPrice()); - item.put("Incidentals", depotItem.getIncidentals()); + item.put("AllPrice", depotItem.getAllPrice()); item.put("Remark", depotItem.getRemark()); item.put("Img", depotItem.getImg()); item.put("op", 1); diff --git a/src/com/jsh/action/materials/MaterialAction.java b/src/com/jsh/action/materials/MaterialAction.java index 0e3ecc482..4c1d034a1 100644 --- a/src/com/jsh/action/materials/MaterialAction.java +++ b/src/com/jsh/action/materials/MaterialAction.java @@ -271,7 +271,10 @@ public class MaterialAction extends BaseAction JSONObject item = new JSONObject(); item.put("Id", material.getId()); //名称 - item.put("MaterialName", ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + ((material.getColor() == null)?"":"("+material.getColor() + ")")); + String MaterialName = ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() + + ((material.getColor() == null)?"":"("+material.getColor() + ")") + + ((material.getUnit() == null)?"":"("+material.getUnit() + ")"); + item.put("MaterialName", MaterialName); dataArray.add(item); } } diff --git a/src/com/jsh/action/materials/PersonAction.java b/src/com/jsh/action/materials/PersonAction.java index 962cd0382..94e9d9843 100644 --- a/src/com/jsh/action/materials/PersonAction.java +++ b/src/com/jsh/action/materials/PersonAction.java @@ -36,7 +36,6 @@ public class PersonAction extends BaseAction try { Map condition = pageUtil.getAdvSearch(); - condition.put("ProjectId_n_eq", model.getProjectId()); condition.put("Id_s_order", "asc"); personService.find(pageUtil); mapData.put("personList", pageUtil.getPageList()); @@ -83,7 +82,6 @@ public class PersonAction extends BaseAction try { Person person = new Person(); - person.setDepot(new Depot(model.getProjectId())); person.setType(model.getType()); person.setName(model.getName()); @@ -157,7 +155,6 @@ public class PersonAction extends BaseAction try { Person person = personService.get(model.getPersonID()); - person.setDepot(new Depot(model.getProjectId())); person.setType(model.getType()); person.setName(model.getName()); @@ -242,8 +239,6 @@ public class PersonAction extends BaseAction { JSONObject item = new JSONObject(); item.put("Id", person.getId()); - item.put("ProjectId", person.getDepot().getId()); - item.put("ProjectName", person.getDepot().getName()); item.put("Type", person.getType()); item.put("Name", person.getName()); item.put("op", 1); @@ -274,7 +269,7 @@ public class PersonAction extends BaseAction * 拼接搜索条件 */ Map condition = new HashMap(); - condition.put("ProjectId_n_eq", model.getProjectId()); + condition.put("Name_s_like", model.getName()); condition.put("Type_s_eq", model.getType()); return condition; } diff --git a/src/com/jsh/dao/materials/BuildingDAO.java b/src/com/jsh/dao/materials/BuildingDAO.java deleted file mode 100644 index 50d48de6f..000000000 --- a/src/com/jsh/dao/materials/BuildingDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Building; - -public class BuildingDAO extends BaseDAO implements BuildingIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Building.class; - } -} diff --git a/src/com/jsh/dao/materials/BuildingIDAO.java b/src/com/jsh/dao/materials/BuildingIDAO.java deleted file mode 100644 index f97df09d6..000000000 --- a/src/com/jsh/dao/materials/BuildingIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Building; - -public interface BuildingIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/model/po/Building.hbm.xml b/src/com/jsh/model/po/Building.hbm.xml deleted file mode 100644 index 99f39b7a6..000000000 --- a/src/com/jsh/model/po/Building.hbm.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - 名称 - - - - - 备注 - - - - - 启用 - - - - diff --git a/src/com/jsh/model/po/Building.java b/src/com/jsh/model/po/Building.java deleted file mode 100644 index dbf38e3b4..000000000 --- a/src/com/jsh/model/po/Building.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Building implements java.io.Serializable -{ - private Long Id; - private Depot depot; - private String Name; - private String Remark; - private Boolean Enabled; - - public Building() - { - - } - - public Building(Long Id) - { - this.Id = Id; - } - - public Building(Depot depot, String name, String remark, Boolean enabled) { - super(); - this.depot = depot; - Name = name; - Remark = remark; - Enabled = enabled; - } - - 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 getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotHead.hbm.xml b/src/com/jsh/model/po/DepotHead.hbm.xml index d98fafd1e..80352b748 100644 --- a/src/com/jsh/model/po/DepotHead.hbm.xml +++ b/src/com/jsh/model/po/DepotHead.hbm.xml @@ -49,48 +49,33 @@ - 采购/领料-经手人Id + 经手人Id - - - 仓管员-经手人Id + + + 账户Id - - - 现金/记账 + + + 变动金额(收款/付款) - - - 单元Id - - 调拨时，对方项目Id + + + 合计金额 + + 备注 - - - 草稿/已生效/废弃/待审核/未通过 - - - - - 撤审人 - - - - - 撤审原因 - - diff --git a/src/com/jsh/model/po/DepotHead.java b/src/com/jsh/model/po/DepotHead.java index 4b6453033..6b15402ff 100644 --- a/src/com/jsh/model/po/DepotHead.java +++ b/src/com/jsh/model/po/DepotHead.java @@ -15,15 +15,11 @@ public class DepotHead implements java.io.Serializable private Timestamp OperTime; private Supplier OrganId; private Person HandsPersonId; - private Person WareHousePersonId; - private String SettlementWay; - private Building BuildingId; + private Account AccountId; + private Double ChangeAmount; private Depot AllocationProjectId; - private String Remark; - private String State; - private String ReAuditPersonName; - private String Reason; - + private Double TotalPrice; + private String Remark; public DepotHead() { @@ -38,9 +34,7 @@ public class DepotHead implements java.io.Serializable public DepotHead(String type, String subType, Depot projectId, String number, String operPersonName, Timestamp createTime, Timestamp operTime, Supplier organId, Person handsPersonId, - Person wareHousePersonId, String settlementWay, - Building buildingId, Depot allocationProjectId, String remark, - String state, String reAuditPersonName, String reason) { + Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice, String remark) { super(); Type = type; SubType = subType; @@ -51,14 +45,11 @@ public class DepotHead implements java.io.Serializable OperTime = operTime; OrganId = organId; HandsPersonId = handsPersonId; - WareHousePersonId = wareHousePersonId; - SettlementWay = settlementWay; - BuildingId = buildingId; + AccountId = accountId; + ChangeAmount = changeAmount; AllocationProjectId = allocationProjectId; + TotalPrice = totalPrice; Remark = remark; - State = state; - ReAuditPersonName = reAuditPersonName; - Reason = reason; } public Long getId() { @@ -140,29 +131,21 @@ public class DepotHead implements java.io.Serializable public void setHandsPersonId(Person handsPersonId) { HandsPersonId = handsPersonId; } - - public Person getWareHousePersonId() { - return WareHousePersonId; + + public Account getAccountId() { + return AccountId; } - public void setWareHousePersonId(Person wareHousePersonId) { - WareHousePersonId = wareHousePersonId; + public void setAccountId(Account accountId) { + AccountId = accountId; } - public String getSettlementWay() { - return SettlementWay; + public Double getChangeAmount() { + return ChangeAmount; } - public void setSettlementWay(String settlementWay) { - SettlementWay = settlementWay; - } - - public Building getBuildingId() { - return BuildingId; - } - - public void setBuildingId(Building buildingId) { - BuildingId = buildingId; + public void setChangeAmount(Double changeAmount) { + ChangeAmount = changeAmount; } public Depot getAllocationProjectId() { @@ -173,6 +156,14 @@ public class DepotHead implements java.io.Serializable AllocationProjectId = allocationProjectId; } + public Double getTotalPrice() { + return TotalPrice; + } + + public void setTotalPrice(Double totalPrice) { + TotalPrice = totalPrice; + } + public String getRemark() { return Remark; } @@ -180,31 +171,4 @@ public class DepotHead implements java.io.Serializable public void setRemark(String remark) { Remark = remark; } - - public String getState() { - return State; - } - - public void setState(String state) { - State = state; - } - - public String getReAuditPersonName() { - return ReAuditPersonName; - } - - public void setReAuditPersonName(String reAuditPersonName) { - ReAuditPersonName = reAuditPersonName; - } - - public String getReason() { - return Reason; - } - - public void setReason(String reason) { - Reason = reason; - } - - - } \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotItem.hbm.xml b/src/com/jsh/model/po/DepotItem.hbm.xml index 558018e26..c6de4ed93 100644 --- a/src/com/jsh/model/po/DepotItem.hbm.xml +++ b/src/com/jsh/model/po/DepotItem.hbm.xml @@ -27,9 +27,9 @@ 单价 - - - 运杂费 + + + 金额 diff --git a/src/com/jsh/model/po/DepotItem.java b/src/com/jsh/model/po/DepotItem.java index 420d60622..f3cec78b8 100644 --- a/src/com/jsh/model/po/DepotItem.java +++ b/src/com/jsh/model/po/DepotItem.java @@ -8,7 +8,7 @@ public class DepotItem implements java.io.Serializable private Material MaterialId; private Double OperNumber; private Double UnitPrice; - private Double Incidentals; + private Double AllPrice; private String Remark; private String Img; @@ -23,14 +23,14 @@ public class DepotItem implements java.io.Serializable } public DepotItem(DepotHead headerId, Material materialId, - Double operNumber, Double unitPrice, Double incidentals, + Double operNumber, Double unitPrice, Double allPrice, String remark, String img) { super(); HeaderId = headerId; MaterialId = materialId; OperNumber = operNumber; UnitPrice = unitPrice; - Incidentals = incidentals; + AllPrice = allPrice; Remark = remark; Img = img; } @@ -75,12 +75,12 @@ public class DepotItem implements java.io.Serializable UnitPrice = unitPrice; } - public Double getIncidentals() { - return Incidentals; + public Double getAllPrice() { + return AllPrice; } - public void setIncidentals(Double incidentals) { - Incidentals = incidentals; + public void setAllPrice(Double allPrice) { + AllPrice = allPrice; } public String getRemark() { diff --git a/src/com/jsh/model/po/Person.hbm.xml b/src/com/jsh/model/po/Person.hbm.xml index 8b71ec756..f3e03159d 100644 --- a/src/com/jsh/model/po/Person.hbm.xml +++ b/src/com/jsh/model/po/Person.hbm.xml @@ -7,9 +7,6 @@ - - - 类型 diff --git a/src/com/jsh/model/po/Person.java b/src/com/jsh/model/po/Person.java index 7d9566d65..6e739bd14 100644 --- a/src/com/jsh/model/po/Person.java +++ b/src/com/jsh/model/po/Person.java @@ -4,7 +4,6 @@ package com.jsh.model.po; public class Person implements java.io.Serializable { private Long Id; - private Depot depot; private String Type; private String Name; @@ -18,8 +17,7 @@ public class Person implements java.io.Serializable this.Id = Id; } - public Person(Depot depot, String type, String name) { - this.depot = depot; + public Person(String type, String name) { Type = type; Name = name; } @@ -32,14 +30,6 @@ public class Person implements java.io.Serializable Id = id; } - public Depot getDepot() { - return depot; - } - - public void setDepot(Depot depot) { - this.depot = depot; - } - public String getType() { return Type; } diff --git a/src/com/jsh/model/vo/materials/BuildingModel.java b/src/com/jsh/model/vo/materials/BuildingModel.java deleted file mode 100644 index c3365b7df..000000000 --- a/src/com/jsh/model/vo/materials/BuildingModel.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class BuildingModel implements Serializable -{ - private BuildingShowModel showModel = new BuildingShowModel(); - - /**======开始接受页面参数=================**/ - /** - * ProjectId - */ - private Long ProjectId; - /** - * 名称 - */ - private String Name = ""; - /** - * 备注 - */ - private String Remark = ""; - /** - * 启用 - */ - private Boolean Enabled = false; - - /** - * 分类ID - */ - private Long buildingID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String buildingIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public BuildingShowModel getShowModel() { - return showModel; - } - - public void setShowModel(BuildingShowModel showModel) { - this.showModel = showModel; - } - - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - public Long getBuildingID() { - return buildingID; - } - - public void setBuildingID(Long buildingID) { - this.buildingID = buildingID; - } - - public String getBuildingIDs() { - return buildingIDs; - } - - public void setBuildingIDs(String buildingIDs) { - this.buildingIDs = buildingIDs; - } - - 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/materials/BuildingShowModel.java b/src/com/jsh/model/vo/materials/BuildingShowModel.java deleted file mode 100644 index 2363433fd..000000000 --- a/src/com/jsh/model/vo/materials/BuildingShowModel.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class BuildingShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - -} diff --git a/src/com/jsh/model/vo/materials/DepotHeadModel.java b/src/com/jsh/model/vo/materials/DepotHeadModel.java index 584df6839..f41ffb8b7 100644 --- a/src/com/jsh/model/vo/materials/DepotHeadModel.java +++ b/src/com/jsh/model/vo/materials/DepotHeadModel.java @@ -16,14 +16,11 @@ public class DepotHeadModel implements Serializable private String OperTime; private Long OrganId; private Long HandsPersonId; - private Long WareHousePersonId; - private String SettlementWay = ""; - private Long BuildingId; + private Long AccountId; + private Double ChangeAmount; private Long AllocationProjectId; + private Double TotalPrice; private String Remark = ""; - private String State = ""; - private String ReAuditPersonName = ""; - private String Reason = ""; private String BeginTime; //查询开始时间 private String EndTime; //查询结束时间 @@ -117,28 +114,20 @@ public class DepotHeadModel implements Serializable HandsPersonId = handsPersonId; } - public Long getWareHousePersonId() { - return WareHousePersonId; + public Long getAccountId() { + return AccountId; } - public void setWareHousePersonId(Long wareHousePersonId) { - WareHousePersonId = wareHousePersonId; + public void setAccountId(Long accountId) { + AccountId = accountId; } - public String getSettlementWay() { - return SettlementWay; + public Double getChangeAmount() { + return ChangeAmount; } - public void setSettlementWay(String settlementWay) { - SettlementWay = settlementWay; - } - - public Long getBuildingId() { - return BuildingId; - } - - public void setBuildingId(Long buildingId) { - BuildingId = buildingId; + public void setChangeAmount(Double changeAmount) { + ChangeAmount = changeAmount; } public Long getAllocationProjectId() { @@ -149,6 +138,14 @@ public class DepotHeadModel implements Serializable AllocationProjectId = allocationProjectId; } + public Double getTotalPrice() { + return TotalPrice; + } + + public void setTotalPrice(Double totalPrice) { + TotalPrice = totalPrice; + } + public String getRemark() { return Remark; } @@ -157,30 +154,6 @@ public class DepotHeadModel implements Serializable Remark = remark; } - public String getState() { - return State; - } - - public void setState(String state) { - State = state; - } - - public String getReAuditPersonName() { - return ReAuditPersonName; - } - - public void setReAuditPersonName(String reAuditPersonName) { - ReAuditPersonName = reAuditPersonName; - } - - public String getReason() { - return Reason; - } - - public void setReason(String reason) { - Reason = reason; - } - public Long getDepotHeadID() { return depotHeadID; } diff --git a/src/com/jsh/model/vo/materials/DepotItemModel.java b/src/com/jsh/model/vo/materials/DepotItemModel.java index 01e9b4662..ea6d890eb 100644 --- a/src/com/jsh/model/vo/materials/DepotItemModel.java +++ b/src/com/jsh/model/vo/materials/DepotItemModel.java @@ -13,7 +13,7 @@ public class DepotItemModel implements Serializable private Long MaterialId; private Double OperNumber; private Double UnitPrice; - private Double Incidentals; + private Double AllPrice; private String Remark = ""; private String Img = ""; @@ -100,12 +100,12 @@ public class DepotItemModel implements Serializable UnitPrice = unitPrice; } - public Double getIncidentals() { - return Incidentals; + public Double getAllPrice() { + return AllPrice; } - public void setIncidentals(Double incidentals) { - Incidentals = incidentals; + public void setAllPrice(Double allPrice) { + AllPrice = allPrice; } public String getRemark() { diff --git a/src/com/jsh/model/vo/materials/PersonModel.java b/src/com/jsh/model/vo/materials/PersonModel.java index 251d4e436..d6c072714 100644 --- a/src/com/jsh/model/vo/materials/PersonModel.java +++ b/src/com/jsh/model/vo/materials/PersonModel.java @@ -8,10 +8,6 @@ public class PersonModel implements Serializable private PersonShowModel showModel = new PersonShowModel(); /**======开始接受页面参数=================**/ - /** - * ProjectId - */ - private Long ProjectId; /** * 类型 */ @@ -54,14 +50,6 @@ public class PersonModel implements Serializable this.showModel = showModel; } - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - public String getType() { return Type; } diff --git a/src/com/jsh/service/materials/BuildingIService.java b/src/com/jsh/service/materials/BuildingIService.java deleted file mode 100644 index 746fa52d0..000000000 --- a/src/com/jsh/service/materials/BuildingIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Building; - -public interface BuildingIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/BuildingService.java b/src/com/jsh/service/materials/BuildingService.java deleted file mode 100644 index acc1058b8..000000000 --- a/src/com/jsh/service/materials/BuildingService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.BuildingIDAO; -import com.jsh.model.po.Building; - -public class BuildingService extends BaseService implements BuildingIService -{ - @SuppressWarnings("unused") - private BuildingIDAO buildingDao; - - - public void setBuildingDao(BuildingIDAO buildingDao) { - this.buildingDao = buildingDao; - } - - - @Override - protected Class getEntityClass() - { - return Building.class; - } - -}
收货仓库： + 入库时间： + 单据日期： 供应商： + 供货单位： 采购人： + 经手人：
仓管员： - + 付款账户： + 结算方式： - + 付款金额： + 备注： - - 单据号： + 单据编号： - 单据备注： + +
商品列表：
仓管员：经手人：
仓管员：经手人：