采购入库，增加单行的金额，合计金额，付款账户，付款金额等字段，改动较大，为临时版本
This commit is contained in:
季圣华
parent
77e30a07c8
commit
adb6105fde
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,29 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
|
||||
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
|
||||
<hibernate-mapping>
|
||||
<class name="com.jsh.model.po.Building" table="jsh_building">
|
||||
<id name="Id" type="java.lang.Long">
|
||||
<column name="Id"/>
|
||||
<generator class="native"/>
|
||||
</id>
|
||||
<many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="ProjectId" not-null="true" />
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="Name" type="java.lang.String">
|
||||
<column length="20" name="Name">
|
||||
<comment>名称</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
<column length="50" name="Remark">
|
||||
<comment>备注</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Enabled" type="boolean">
|
||||
<column length="1" name="Enabled">
|
||||
<comment>启用</comment>
|
||||
</column>
|
||||
</property>
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
Binary file not shown.
@ -49,48 +49,33 @@
|
||||
</many-to-one>
|
||||
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
|
||||
<column name="HandsPersonId">
|
||||
<comment>采购/领料-经手人Id</comment>
|
||||
<comment>经手人Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<many-to-one name="WareHousePersonId" class="com.jsh.model.po.Person" lazy="false">
|
||||
<column name="WareHousePersonId" not-null="true">
|
||||
<comment>仓管员-经手人Id</comment>
|
||||
<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
|
||||
<column name="AccountId">
|
||||
<comment>账户Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="SettlementWay" type="java.lang.String">
|
||||
<column length="50" name="SettlementWay">
|
||||
<comment>现金/记账</comment>
|
||||
<property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
|
||||
<column name="ChangeAmount" precision="22" scale="3">
|
||||
<comment>变动金额(收款/付款)</comment>
|
||||
</column>
|
||||
</property>
|
||||
<many-to-one name="BuildingId" class="com.jsh.model.po.Building" lazy="false">
|
||||
<column name="BuildingId">
|
||||
<comment>单元Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<many-to-one name="AllocationProjectId" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="AllocationProjectId">
|
||||
<comment>调拨时，对方项目Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double">
|
||||
<column name="TotalPrice" precision="22" scale="3">
|
||||
<comment>合计金额</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
<column length="1000" name="Remark">
|
||||
<comment>备注</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="State" type="java.lang.String">
|
||||
<column length="50" name="State">
|
||||
<comment>草稿/已生效/废弃/待审核/未通过</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="ReAuditPersonName" type="java.lang.String">
|
||||
<column length="50" name="ReAuditPersonName">
|
||||
<comment>撤审人</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Reason" type="java.lang.String">
|
||||
<column length="100" name="Reason">
|
||||
<comment>撤审原因</comment>
|
||||
</column>
|
||||
</property>
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
|
||||
Binary file not shown.
@ -27,9 +27,9 @@
|
||||
<comment>单价</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Incidentals" type="java.lang.Double">
|
||||
<column name="Incidentals" precision="22" scale="3">
|
||||
<comment>运杂费</comment>
|
||||
<property generated="never" lazy="false" name="AllPrice" type="java.lang.Double">
|
||||
<column name="AllPrice" precision="22" scale="3">
|
||||
<comment>金额</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
|
||||
Binary file not shown.
@ -7,9 +7,6 @@
|
||||
<column name="Id"/>
|
||||
<generator class="native"/>
|
||||
</id>
|
||||
<many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="ProjectId" not-null="true" />
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="Type" type="java.lang.String">
|
||||
<column length="20" name="Type">
|
||||
<comment>类型</comment>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -36,7 +36,6 @@
|
||||
<mapping resource="com/jsh/model/po/Person.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Material.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Building.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/DepotHead.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Account.hbm.xml" />
|
||||
|
||||
@ -274,18 +274,6 @@
|
||||
</bean>
|
||||
<!--商品配置结束 -->
|
||||
|
||||
<!--单元配置开始 -->
|
||||
<bean id="buildingService" class="com.jsh.service.materials.BuildingService">
|
||||
<property name="baseDao" ref="baseDao"/>
|
||||
<property name="buildingDao" ref="buildingDao"/>
|
||||
</bean>
|
||||
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
|
||||
<bean id="buildingAction" class="com.jsh.action.materials.BuildingAction" scope="prototype">
|
||||
<property name="buildingService" ref="buildingService"/>
|
||||
<property name="logService" ref="logService"/>
|
||||
</bean>
|
||||
<!--单元配置结束 -->
|
||||
|
||||
<!--仓管通配置开始 -->
|
||||
<bean id="depotHeadService" class="com.jsh.service.materials.DepotHeadService">
|
||||
<property name="baseDao" ref="baseDao"/>
|
||||
|
||||
@ -40,8 +40,6 @@
|
||||
<bean id="materialCategoryDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialCategoryDAO"/>
|
||||
<!-- 配置materialDao组件 -->
|
||||
<bean id="materialDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialDAO"/>
|
||||
<!-- 配置buildingDao组件 -->
|
||||
<bean id="buildingDao" parent="daoTemplate" class="com.jsh.dao.materials.BuildingDAO"/>
|
||||
<!-- 配置depotHeadDao组件 -->
|
||||
<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>
|
||||
<!-- 配置depotItemDao组件 -->
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE struts PUBLIC
|
||||
"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
|
||||
"http://struts.apache.org/dtds/struts-2.1.7.dtd">
|
||||
<struts>
|
||||
<package name="building" namespace="/building" extends="json-default">
|
||||
<action name="*" class="buildingAction" method="{1}">
|
||||
<result type="json"/>
|
||||
</action>
|
||||
</package>
|
||||
</struts>
|
||||
@ -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;
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
|
||||
<a id="btnSetRole" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配角色'>分配角色</a>
|
||||
<a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配部门'>分配部门</a>
|
||||
<a id="btnSetDepart" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配仓库'>分配仓库</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -26,16 +26,15 @@
|
||||
<div id = "searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>仓库：</td>
|
||||
<td>姓名：</td>
|
||||
<td>
|
||||
<select name="searchProjectId" id="searchProjectId" style="width:230px;"></select>
|
||||
<input name="searchName" id="searchName" style="width:230px;"/>
|
||||
</td>
|
||||
<td>类型：</td>
|
||||
<td>
|
||||
<select name="searchType" id="searchType" style="width:230px;">
|
||||
<option value="">全部</option>
|
||||
<option value="仓管员">仓管员</option>
|
||||
<option value="采购员">采购员</option>
|
||||
<option value="财务员">财务员</option>
|
||||
</select>
|
||||
</td>
|
||||
@ -60,25 +59,20 @@
|
||||
<form id="personFM" method="post" novalidate>
|
||||
<table>
|
||||
<tr>
|
||||
<td>仓库</td>
|
||||
<td style="padding:5px">
|
||||
<select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>类型</td>
|
||||
<td style="padding:5px">
|
||||
<select name="Type" id="Type" style="width:230px;">
|
||||
<option value="">请选择</option>
|
||||
<option value="仓管员">仓管员</option>
|
||||
<option value="采购员">采购员</option>
|
||||
<option value="财务员">财务员</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>姓名</td>
|
||||
<td style="padding:5px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
|
||||
<td style="padding:5px">
|
||||
<input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
|
||||
@ -184,13 +178,12 @@
|
||||
pageList: initPageNum,
|
||||
columns:[[
|
||||
{ field: 'Id',width:35,align:"center",checkbox:true},
|
||||
{ title: '仓库',field: 'ProjectName',width:180},
|
||||
{ title: '姓名',field: 'Name',width:180},
|
||||
{ title: '类型',field: 'Type',width:180},
|
||||
{ title: '经手人',field: 'Name',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 += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + rowInfo + '\');"/> <a onclick="editPerson(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a> ';
|
||||
@ -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','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/> 编辑经手人信息');
|
||||
$(".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
|
||||
|
||||
@ -80,7 +80,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -31,11 +31,11 @@
|
||||
<td>
|
||||
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
|
||||
</td>
|
||||
<td>单据号：</td>
|
||||
<td>单据编号：</td>
|
||||
<td>
|
||||
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
|
||||
</td>
|
||||
<td>入库时间：</td>
|
||||
<td>单据日期：</td>
|
||||
<td>
|
||||
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
|
||||
</td>
|
||||
@ -64,39 +64,37 @@
|
||||
<tr>
|
||||
<td>收货仓库：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="ProjectId" id="ProjectId" style="width:120px;"></select>
|
||||
<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
|
||||
</td>
|
||||
<td>入库时间：</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
|
||||
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
|
||||
</td>
|
||||
<td>供应商：</td>
|
||||
<td>供货单位：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="OrganId" name="OrganId" style="width:120px;" />
|
||||
<input id="OrganId" name="OrganId" style="width:110px;" />
|
||||
</td>
|
||||
<td>采购人：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
|
||||
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>付款账户：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
<select name="AccountId" id="AccountId" style="width:110px;"></select>
|
||||
</td>
|
||||
<td>结算方式：</td>
|
||||
<td>付款金额：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="SettlementWay" id="SettlementWay" style="width:120px;">
|
||||
<option value="现金">现金</option>
|
||||
<option value="记账">记账</option>
|
||||
</select>
|
||||
<input id="ChangeAmount" name="ChangeAmount" style="width:110px;" />
|
||||
</td>
|
||||
<td>备注：</td>
|
||||
<td>单据编号：</td>
|
||||
<td style="padding:5px">
|
||||
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
|
||||
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
|
||||
</td>
|
||||
<td>单据号：</td>
|
||||
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
|
||||
<td>单据备注：</td>
|
||||
<td style="padding:5px">
|
||||
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -119,39 +117,39 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td>收货仓库：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="ProjectIdShow"></span>
|
||||
</td>
|
||||
<td>入库时间：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td>供应商：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<td>供货单位：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="OrganIdShow"></span>
|
||||
</td>
|
||||
<td>采购人：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="HandsPersonIdShow"></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="WareHousePersonIdShow"></span>
|
||||
<td>付款账户：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="AccountIdShow"></span>
|
||||
</td>
|
||||
<td>结算方式：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="SettlementWayShow"></span>
|
||||
<td>付款金额：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="ChangeAmountShow"></span>
|
||||
</td>
|
||||
<td>备注：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="RemarkShow"></span>
|
||||
</td>
|
||||
<td>单据号：</td>
|
||||
<td style="padding:5px">
|
||||
<td>单据编号：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td>单据备注：</td>
|
||||
<td style="padding:5px;width:110px;">
|
||||
<span id="RemarkShow"></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>商品列表：</td>
|
||||
@ -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 += '<option value="' + person.id + '">' + person.name + '</option>';
|
||||
}
|
||||
else if(person.type=="仓管员")
|
||||
{
|
||||
options2 += '<option value="' + person.id + '">' + person.name + '</option>';
|
||||
}
|
||||
}
|
||||
$("#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 += '<option value="' + account.id + '">' + account.name + '</option>';
|
||||
}
|
||||
$("#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 += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + rowInfo + '\');"/> <a onclick="showDepotHead(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">查看</a> ';
|
||||
@ -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','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/> 编辑采购入库信息');
|
||||
$(".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="<span style='color:red;'>"+audit+"</span>";
|
||||
$('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/> 查看采购入库信息'+audit);
|
||||
var TotalPrice = depotHeadInfo[14];
|
||||
$('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/> 查看采购入库信息');
|
||||
$(".window-mask").css({ width: webW ,height: webH});
|
||||
|
||||
depotHeadID = depotHeadInfo[0];
|
||||
initTableData_material_show(); //商品列表-查看状态
|
||||
initTableData_material_show(TotalPrice); //商品列表-查看状态
|
||||
}
|
||||
|
||||
//搜索处理
|
||||
@ -909,6 +968,58 @@
|
||||
$("#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;
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
//删除
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>仓管员：</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
<mapping resource="com/jsh/model/po/Person.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/MaterialCategory.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Material.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Building.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/DepotHead.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
|
||||
<mapping resource="com/jsh/model/po/Account.hbm.xml" />
|
||||
|
||||
@ -274,18 +274,6 @@
|
||||
</bean>
|
||||
<!--商品配置结束 -->
|
||||
|
||||
<!--单元配置开始 -->
|
||||
<bean id="buildingService" class="com.jsh.service.materials.BuildingService">
|
||||
<property name="baseDao" ref="baseDao"/>
|
||||
<property name="buildingDao" ref="buildingDao"/>
|
||||
</bean>
|
||||
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
|
||||
<bean id="buildingAction" class="com.jsh.action.materials.BuildingAction" scope="prototype">
|
||||
<property name="buildingService" ref="buildingService"/>
|
||||
<property name="logService" ref="logService"/>
|
||||
</bean>
|
||||
<!--单元配置结束 -->
|
||||
|
||||
<!--仓管通配置开始 -->
|
||||
<bean id="depotHeadService" class="com.jsh.service.materials.DepotHeadService">
|
||||
<property name="baseDao" ref="baseDao"/>
|
||||
|
||||
@ -40,8 +40,6 @@
|
||||
<bean id="materialCategoryDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialCategoryDAO"/>
|
||||
<!-- 配置materialDao组件 -->
|
||||
<bean id="materialDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialDAO"/>
|
||||
<!-- 配置buildingDao组件 -->
|
||||
<bean id="buildingDao" parent="daoTemplate" class="com.jsh.dao.materials.BuildingDAO"/>
|
||||
<!-- 配置depotHeadDao组件 -->
|
||||
<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>
|
||||
<!-- 配置depotItemDao组件 -->
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE struts PUBLIC
|
||||
"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
|
||||
"http://struts.apache.org/dtds/struts-2.1.7.dtd">
|
||||
<struts>
|
||||
<package name="building" namespace="/building" extends="json-default">
|
||||
<action name="*" class="buildingAction" method="{1}">
|
||||
<result type="json"/>
|
||||
</action>
|
||||
</package>
|
||||
</struts>
|
||||
File diff suppressed because one or more lines are too long
@ -40,7 +40,7 @@ public class DepotAction extends BaseAction<DepotModel>
|
||||
try
|
||||
{
|
||||
Map<String,Object> 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<DepotModel>
|
||||
depotService.find(pageUtil);
|
||||
List<Depot> 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<DepotModel>
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户对应部门显示
|
||||
* 用户对应仓库显示
|
||||
* @return
|
||||
*/
|
||||
public void findUserDepot()
|
||||
@ -292,7 +288,7 @@ public class DepotAction extends BaseAction<DepotModel>
|
||||
//开始拼接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<DepotModel>
|
||||
}
|
||||
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<DepotModel>
|
||||
}
|
||||
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<DepotModel>
|
||||
* 拼接搜索条件
|
||||
*/
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
condition.put("Id_s_order", "asc");
|
||||
condition.put("sort_s_order", "asc");
|
||||
return condition;
|
||||
}
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<BuildingModel>
|
||||
{
|
||||
private BuildingIService buildingService;
|
||||
private BuildingModel model = new BuildingModel();
|
||||
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
public String getBasicData()
|
||||
{
|
||||
Map<String,List> mapData = model.getShowModel().getMap();
|
||||
PageUtil pageUtil = new PageUtil();
|
||||
pageUtil.setPageSize(0);
|
||||
pageUtil.setCurPage(0);
|
||||
try
|
||||
{
|
||||
Map<String,Object> 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<Building> pageUtil = new PageUtil<Building>();
|
||||
pageUtil.setPageSize(model.getPageSize());
|
||||
pageUtil.setCurPage(model.getPageNo());
|
||||
pageUtil.setAdvSearch(getCondition());
|
||||
buildingService.find(pageUtil);
|
||||
List<Building> 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<String,Object> getCondition()
|
||||
{
|
||||
/**
|
||||
* 拼接搜索条件
|
||||
*/
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
@ -82,12 +82,11 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
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());
|
||||
depotHead.setState("草稿");
|
||||
depotHeadService.create(depotHead);
|
||||
|
||||
//========标识位===========
|
||||
@ -173,10 +172,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
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<DepotHeadModel>
|
||||
, 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<DepotHeadID.length;i++)
|
||||
{
|
||||
changeId=DepotHeadID[i].toString();
|
||||
DepotHead depotHead = depotHeadService.get(Long.parseLong(changeId));
|
||||
String state=model.getState();
|
||||
depotHead.setState(state); //状态
|
||||
String userName=state.equals("未通过")?getUser().getUsername():""; //判断状态
|
||||
depotHead.setReAuditPersonName(userName); //撤审人
|
||||
depotHead.setReason(model.getReason()); //撤审原因
|
||||
depotHeadService.update(depotHead);
|
||||
}
|
||||
flag = true;
|
||||
tipMsg = "成功";
|
||||
tipType = 0;
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>更新状态仓管通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<DepotHeadModel>
|
||||
depotHeadService.find(pageUtil);
|
||||
List<DepotHead> 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<DepotHeadModel>
|
||||
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("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<DepotHeadModel>
|
||||
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;
|
||||
}
|
||||
|
||||
@ -66,9 +66,8 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
|
||||
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<DepotItemModel>
|
||||
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<DepotItemModel>
|
||||
depotItemService.find(pageUtil);
|
||||
List<DepotItem> 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<DepotItemModel>
|
||||
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);
|
||||
|
||||
@ -271,7 +271,10 @@ public class MaterialAction extends BaseAction<MaterialModel>
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,7 +36,6 @@ public class PersonAction extends BaseAction<PersonModel>
|
||||
try
|
||||
{
|
||||
Map<String,Object> 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<PersonModel>
|
||||
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<PersonModel>
|
||||
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<PersonModel>
|
||||
{
|
||||
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<PersonModel>
|
||||
* 拼接搜索条件
|
||||
*/
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
condition.put("ProjectId_n_eq", model.getProjectId());
|
||||
condition.put("Name_s_like", model.getName());
|
||||
condition.put("Type_s_eq", model.getType());
|
||||
return condition;
|
||||
}
|
||||
|
||||
@ -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<Building> implements BuildingIDAO
|
||||
{
|
||||
/**
|
||||
* 设置dao映射基类
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Class<Building> getEntityClass()
|
||||
{
|
||||
return Building.class;
|
||||
}
|
||||
}
|
||||
@ -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<Building>
|
||||
{
|
||||
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
|
||||
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
|
||||
<hibernate-mapping>
|
||||
<class name="com.jsh.model.po.Building" table="jsh_building">
|
||||
<id name="Id" type="java.lang.Long">
|
||||
<column name="Id"/>
|
||||
<generator class="native"/>
|
||||
</id>
|
||||
<many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="ProjectId" not-null="true" />
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="Name" type="java.lang.String">
|
||||
<column length="20" name="Name">
|
||||
<comment>名称</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
<column length="50" name="Remark">
|
||||
<comment>备注</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Enabled" type="boolean">
|
||||
<column length="1" name="Enabled">
|
||||
<comment>启用</comment>
|
||||
</column>
|
||||
</property>
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -49,48 +49,33 @@
|
||||
</many-to-one>
|
||||
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
|
||||
<column name="HandsPersonId">
|
||||
<comment>采购/领料-经手人Id</comment>
|
||||
<comment>经手人Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<many-to-one name="WareHousePersonId" class="com.jsh.model.po.Person" lazy="false">
|
||||
<column name="WareHousePersonId" not-null="true">
|
||||
<comment>仓管员-经手人Id</comment>
|
||||
<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
|
||||
<column name="AccountId">
|
||||
<comment>账户Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="SettlementWay" type="java.lang.String">
|
||||
<column length="50" name="SettlementWay">
|
||||
<comment>现金/记账</comment>
|
||||
<property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
|
||||
<column name="ChangeAmount" precision="22" scale="3">
|
||||
<comment>变动金额(收款/付款)</comment>
|
||||
</column>
|
||||
</property>
|
||||
<many-to-one name="BuildingId" class="com.jsh.model.po.Building" lazy="false">
|
||||
<column name="BuildingId">
|
||||
<comment>单元Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<many-to-one name="AllocationProjectId" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="AllocationProjectId">
|
||||
<comment>调拨时，对方项目Id</comment>
|
||||
</column>
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double">
|
||||
<column name="TotalPrice" precision="22" scale="3">
|
||||
<comment>合计金额</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
<column length="1000" name="Remark">
|
||||
<comment>备注</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="State" type="java.lang.String">
|
||||
<column length="50" name="State">
|
||||
<comment>草稿/已生效/废弃/待审核/未通过</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="ReAuditPersonName" type="java.lang.String">
|
||||
<column length="50" name="ReAuditPersonName">
|
||||
<comment>撤审人</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Reason" type="java.lang.String">
|
||||
<column length="100" name="Reason">
|
||||
<comment>撤审原因</comment>
|
||||
</column>
|
||||
</property>
|
||||
</class>
|
||||
</hibernate-mapping>
|
||||
|
||||
@ -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 Double TotalPrice;
|
||||
private String Remark;
|
||||
private String State;
|
||||
private String ReAuditPersonName;
|
||||
private String Reason;
|
||||
|
||||
|
||||
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() {
|
||||
@ -141,28 +132,20 @@ public class DepotHead implements java.io.Serializable
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -27,9 +27,9 @@
|
||||
<comment>单价</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Incidentals" type="java.lang.Double">
|
||||
<column name="Incidentals" precision="22" scale="3">
|
||||
<comment>运杂费</comment>
|
||||
<property generated="never" lazy="false" name="AllPrice" type="java.lang.Double">
|
||||
<column name="AllPrice" precision="22" scale="3">
|
||||
<comment>金额</comment>
|
||||
</column>
|
||||
</property>
|
||||
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -7,9 +7,6 @@
|
||||
<column name="Id"/>
|
||||
<generator class="native"/>
|
||||
</id>
|
||||
<many-to-one name="depot" class="com.jsh.model.po.Depot" lazy="false">
|
||||
<column name="ProjectId" not-null="true" />
|
||||
</many-to-one>
|
||||
<property generated="never" lazy="false" name="Type" type="java.lang.String">
|
||||
<column length="20" name="Type">
|
||||
<comment>类型</comment>
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -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<String,List> map = new HashMap<String,List>();
|
||||
|
||||
public String getMsgTip()
|
||||
{
|
||||
return msgTip;
|
||||
}
|
||||
|
||||
public void setMsgTip(String msgTip)
|
||||
{
|
||||
this.msgTip = msgTip;
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public Map<String, List> getMap() {
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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<Building>
|
||||
{
|
||||
|
||||
}
|
||||
@ -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<Building> implements BuildingIService
|
||||
{
|
||||
@SuppressWarnings("unused")
|
||||
private BuildingIDAO buildingDao;
|
||||
|
||||
|
||||
public void setBuildingDao(BuildingIDAO buildingDao) {
|
||||
this.buildingDao = buildingDao;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected Class<Building> getEntityClass()
|
||||
{
|
||||
return Building.class;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user