purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购入库，增加单行的金额，合计金额，付款账户，付款金额等字段，改动较大，为临时版本

Browse Source
This commit is contained in:
季圣华
2016-12-24 23:57:50 +08:00
parent 77e30a07c8
commit adb6105fde
65 changed files with 1292 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/BuildingAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingDAO.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/dao/materials/BuildingIDAO.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/po/Building.class
View File

Binary file not shown.

29
WebRoot/WEB-INF/classes/com/jsh/model/po/Building.hbm.xml
View File

@@ -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>

BIN
WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.class
View File

Binary file not shown.

39
WebRoot/WEB-INF/classes/com/jsh/model/po/DepotHead.hbm.xml
View File

@@ -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>

BIN
WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.class
View File

Binary file not shown.

6
WebRoot/WEB-INF/classes/com/jsh/model/po/DepotItem.hbm.xml
View File

@@ -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">

BIN
WebRoot/WEB-INF/classes/com/jsh/model/po/Person.class
View File

Binary file not shown.

3
WebRoot/WEB-INF/classes/com/jsh/model/po/Person.hbm.xml
View File

@@ -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>

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/BuildingModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotHeadModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/DepotItemModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/materials/PersonModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingIService.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/service/materials/BuildingService.class
View File

Binary file not shown.

93
WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml
View File

@@ -1,47 +1,46 @@
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<!--
<property name="hibernate.connection.driver_class">
com.mysql.jdbc.Driver
</property>
<property name="hibernate.connection.url">
jdbc:mysql:///myshop
</property>
<property name="hibernate.connection.username">root</property>
<property name="connection.password">root</property>
-->
<property name="hibernate.dialect">
org.hibernate.dialect.MySQL5Dialect
</property>
<property name="show_sql">true</property>
<!-- 一般重新建库用create(慎用)，只更新字段用update -->
<property name="hbm2ddl.auto">update</property>
<!-- 对应的实体映射 -->
<mapping resource="com/jsh/model/po/Supplier.hbm.xml" />
<mapping resource="com/jsh/model/po/Logdetails.hbm.xml" />
<mapping resource="com/jsh/model/po/Assetname.hbm.xml" />
<mapping resource="com/jsh/model/po/Category.hbm.xml" />
<mapping resource="com/jsh/model/po/Basicuser.hbm.xml" />
<mapping resource="com/jsh/model/po/Asset.hbm.xml" />
<mapping resource="com/jsh/model/po/Depot.hbm.xml" />
<mapping resource="com/jsh/model/po/App.hbm.xml" />
<mapping resource="com/jsh/model/po/Role.hbm.xml" />
<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
<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" />
<mapping resource="com/jsh/model/po/InOutItem.hbm.xml" />
<mapping resource="com/jsh/model/po/AccountHead.hbm.xml" />
<mapping resource="com/jsh/model/po/AccountItem.hbm.xml" />
</session-factory>
</hibernate-configuration>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<!--
<property name="hibernate.connection.driver_class">
com.mysql.jdbc.Driver
</property>
<property name="hibernate.connection.url">
jdbc:mysql:///myshop
</property>
<property name="hibernate.connection.username">root</property>
<property name="connection.password">root</property>
-->
<property name="hibernate.dialect">
org.hibernate.dialect.MySQL5Dialect
</property>
<property name="show_sql">true</property>
<!-- 一般重新建库用create(慎用)，只更新字段用update -->
<property name="hbm2ddl.auto">update</property>
<!-- 对应的实体映射 -->
<mapping resource="com/jsh/model/po/Supplier.hbm.xml" />
<mapping resource="com/jsh/model/po/Logdetails.hbm.xml" />
<mapping resource="com/jsh/model/po/Assetname.hbm.xml" />
<mapping resource="com/jsh/model/po/Category.hbm.xml" />
<mapping resource="com/jsh/model/po/Basicuser.hbm.xml" />
<mapping resource="com/jsh/model/po/Asset.hbm.xml" />
<mapping resource="com/jsh/model/po/Depot.hbm.xml" />
<mapping resource="com/jsh/model/po/App.hbm.xml" />
<mapping resource="com/jsh/model/po/Role.hbm.xml" />
<mapping resource="com/jsh/model/po/Functions.hbm.xml" />
<mapping resource="com/jsh/model/po/UserBusiness.hbm.xml" />
<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/DepotHead.hbm.xml" />
<mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
<mapping resource="com/jsh/model/po/Account.hbm.xml" />
<mapping resource="com/jsh/model/po/InOutItem.hbm.xml" />
<mapping resource="com/jsh/model/po/AccountHead.hbm.xml" />
<mapping resource="com/jsh/model/po/AccountItem.hbm.xml" />
</session-factory>
</hibernate-configuration>

708
WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml
View File

@@ -1,360 +1,348 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 指定Spring配置文件的Schema信息 -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
<!-- 装载属性配置文件 -->
<bean id="propertyConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations" value="classpath:common/jdbc.properties">
</property>
</bean>
<!-- 配置数据源C3P0 -->
<bean id="dataSource"
class="com.mchange.v2.c3p0.ComboPooledDataSource"
destroy-method="close">
<property name="jdbcUrl" value="${jdbcUrl}"></property>
<property name="driverClass" value="${driverClass}"></property>
<property name="user" value="${user}"></property>
<property name="password" value="${password}"></property>
<!--初始化时获取的连接数，取值应在minPoolSize与maxPoolSize之间。Default: 3 -->
<property name="initialPoolSize" value="10"/>
<!--连接池中保留的最大连接数。Default: 15 -->
<property name="maxPoolSize" value="80"/>
<!--连接池中保留的最小连接数。-->
<property name="minPoolSize" value="3"/>
<!--最大空闲时间,60秒内未使用则连接被丢弃。若为0则永不丢弃。Default: 0 -->
<property name="maxIdleTime" value="60" />
<property name="maxStatements" value="6000"/>
<!--当连接池中的连接耗尽的时候c3p0一次同时获取的连接数。Default: 3 -->
<property name="acquireIncrement" value="10"/>
<!--每60秒检查所有连接池中的空闲连接。Default: 0 -->
<property name="idleConnectionTestPeriod" value="60" />
</bean>
<!-- 配置SessionFactory -->
<bean id="sessionFactory"
class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="configLocation" value="classpath:hibernate/hibernate.cfg.xml"/>
</bean>
<!-- 配置Hibernate的局部事务管理器，使用HibernateTransactionManager类 -->
<!-- 该类实现PlatformTransactionManager接口，是针对Hibernate的特定实现-->
<bean id="transactionManager"
class="org.springframework.orm.hibernate3.HibernateTransactionManager">
<!-- 配置HibernateTransactionManager时需要依注入SessionFactory的引用 -->
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- 配置事务切面Bean,指定事务管理器 -->
<tx:advice id="txAdvice" transaction-manager="transactionManager">
<!-- 用于配置详细的事务语义 -->
<tx:attributes>
<!-- 所有以'get'开头的方法是read-only的 -->
<tx:method name="get*" read-only="true"/>
<!-- 其他方法使用默认的事务设置 -->
<tx:method name="*"/>
</tx:attributes>
</tx:advice>
<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
<bean id="serviceTemplate" abstract="true">
<!-- 为DAO组件注入SessionFactory引用 -->
<property name="baseDao" ref="baseDao"/>
</bean>
<!--通用baseservice配置开始 -->
<!-- <bean id="baseService" class="com.jsh.base.BaseService" abstract="true">
为DAO组件注入SessionFactory引用
<property name="baseDao" ref="baseDao"/>
</bean> -->
<!--用户配置开始 -->
<bean id="userService" class="com.jsh.service.basic.UserService">
<property name="baseDao" ref="baseDao"/>
<property name="userDao" ref="userDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="userAction" class="com.jsh.action.basic.UserAction" scope="prototype">
<property name="userService" ref="userService"/>
<property name="logService" ref="logService"/>
</bean>
<!--用户配置结束 -->
<!--日志配置开始 -->
<bean id="logService" class="com.jsh.service.basic.LogService">
<property name="baseDao" ref="baseDao"/>
<property name="logDao" ref="logDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="logAction" class="com.jsh.action.basic.LogAction" scope="prototype">
<property name="logService" ref="logService"/>
<property name="userService" ref="userService"/>
</bean>
<!--日志配置结束 -->
<!--供应商配置开始 -->
<bean id="supplierService" class="com.jsh.service.basic.SupplierService">
<property name="baseDao" ref="baseDao"/>
<property name="supplierDao" ref="supplierDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype">
<property name="supplierService" ref="supplierService"/>
<property name="logService" ref="logService"/>
</bean>
<!--供应商配置结束 -->
<!--分类配置开始 -->
<bean id="categoryService" class="com.jsh.service.basic.CategoryService">
<property name="baseDao" ref="baseDao"/>
<property name="categoryDao" ref="categoryDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="categoryAction" class="com.jsh.action.basic.CategoryAction" scope="prototype">
<property name="categoryService" ref="categoryService"/>
<property name="logService" ref="logService"/>
</bean>
<!--分类配置结束 -->
<!--仓库配置开始 -->
<bean id="depotService" class="com.jsh.service.basic.DepotService">
<property name="baseDao" ref="baseDao"/>
<property name="depotDao" ref="depotDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotAction" class="com.jsh.action.basic.DepotAction" scope="prototype">
<property name="depotService" ref="depotService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓库配置结束 -->
<!--应用配置开始 -->
<bean id="appService" class="com.jsh.service.basic.AppService">
<property name="baseDao" ref="baseDao"/>
<property name="appDao" ref="appDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="appAction" class="com.jsh.action.basic.AppAction" scope="prototype">
<property name="appService" ref="appService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--应用配置结束 -->
<!--角色配置开始 -->
<bean id="roleService" class="com.jsh.service.basic.RoleService">
<property name="baseDao" ref="baseDao"/>
<property name="roleDao" ref="roleDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="roleAction" class="com.jsh.action.basic.RoleAction" scope="prototype">
<property name="roleService" ref="roleService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--角色配置结束 -->
<!--功能配置开始 -->
<bean id="functionsService" class="com.jsh.service.basic.FunctionsService">
<property name="baseDao" ref="baseDao"/>
<property name="functionsDao" ref="functionsDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="functionsAction" class="com.jsh.action.basic.FunctionsAction" scope="prototype">
<property name="functionsService" ref="functionsService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--功能配置结束 -->
<!--用户对应关系配置开始 -->
<bean id="userBusinessService" class="com.jsh.service.basic.UserBusinessService">
<property name="baseDao" ref="baseDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="userBusinessAction" class="com.jsh.action.basic.UserBusinessAction" scope="prototype">
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--用户对应关系配置结束 -->
<!--资产名称配置开始 -->
<bean id="assetnameService" class="com.jsh.service.basic.AssetNameService">
<property name="baseDao" ref="baseDao"/>
<property name="assetNameDao" ref="assetNameDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="assetNameAction" class="com.jsh.action.basic.AssetNameAction" scope="prototype">
<property name="assetnameService" ref="assetnameService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产名称配置结束 -->
<!--资产配置开始 -->
<bean id="assetService" class="com.jsh.service.asset.AssetService">
<property name="baseDao" ref="baseDao"/>
<property name="assetDao" ref="assetDao"/>
<property name="assetNameDao" ref="assetNameDao"/>
<property name="categoryDao" ref="categoryDao"/>
<property name="supplierDao" ref="supplierDao"/>
<property name="userDao" ref="userDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="assetAction" class="com.jsh.action.asset.AssetAction" scope="prototype">
<property name="assetService" ref="assetService"/>
<property name="categoryService" ref="categoryService"/>
<property name="supplierService" ref="supplierService"/>
<property name="userService" ref="userService"/>
<property name="assetnameService" ref="assetnameService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产配置结束 -->
<!-- 资产报表配置开始 -->
<bean id="reportService" class="com.jsh.service.asset.ReportService">
<property name="reportDao" ref="reportDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="reportAction" class="com.jsh.action.asset.ReportAction" scope="prototype">
<property name="reportService" ref="reportService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产报表配置结束 -->
<!--经手人配置开始 -->
<bean id="personService" class="com.jsh.service.materials.PersonService">
<property name="baseDao" ref="baseDao"/>
<property name="personDao" ref="personDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="personAction" class="com.jsh.action.materials.PersonAction" scope="prototype">
<property name="personService" ref="personService"/>
<property name="logService" ref="logService"/>
</bean>
<!--经手人配置结束 -->
<!--商品类别配置开始 -->
<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
<property name="baseDao" ref="baseDao"/>
<property name="materialCategoryDao" ref="materialCategoryDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="materialCategoryAction" class="com.jsh.action.materials.MaterialCategoryAction" scope="prototype">
<property name="materialCategoryService" ref="materialCategoryService"/>
<property name="logService" ref="logService"/>
</bean>
<!--商品类别配置结束 -->
<!--商品配置开始 -->
<bean id="materialService" class="com.jsh.service.materials.MaterialService">
<property name="baseDao" ref="baseDao"/>
<property name="materialDao" ref="materialDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="materialAction" class="com.jsh.action.materials.MaterialAction" scope="prototype">
<property name="materialService" ref="materialService"/>
<property name="logService" ref="logService"/>
</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"/>
<property name="depotHeadDao" ref="depotHeadDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotHeadAction" class="com.jsh.action.materials.DepotHeadAction" scope="prototype">
<property name="depotHeadService" ref="depotHeadService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓管通配置结束 -->
<!--仓管通明细配置开始 -->
<bean id="depotItemService" class="com.jsh.service.materials.DepotItemService">
<property name="baseDao" ref="baseDao"/>
<property name="depotItemDao" ref="depotItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype">
<property name="depotItemService" ref="depotItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓管通明细配置结束 -->
<!--结算账户配置开始 -->
<bean id="accountService" class="com.jsh.service.basic.AccountService">
<property name="baseDao" ref="baseDao"/>
<property name="accountDao" ref="accountDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
<property name="accountService" ref="accountService"/>
<property name="logService" ref="logService"/>
</bean>
<!--结算账户配置结束 -->
<!--收支项目配置开始 -->
<bean id="inOutItemService" class="com.jsh.service.basic.InOutItemService">
<property name="baseDao" ref="baseDao"/>
<property name="inOutItemDao" ref="inOutItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="inOutItemAction" class="com.jsh.action.basic.InOutItemAction" scope="prototype">
<property name="inOutItemService" ref="inOutItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--收支项目配置结束 -->
<!--账户抬头配置开始 -->
<bean id="accountHeadService" class="com.jsh.service.materials.AccountHeadService">
<property name="baseDao" ref="baseDao"/>
<property name="accountHeadDao" ref="accountHeadDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountHeadAction" class="com.jsh.action.materials.AccountHeadAction" scope="prototype">
<property name="accountHeadService" ref="accountHeadService"/>
<property name="logService" ref="logService"/>
</bean>
<!--账户抬头配置结束 -->
<!--账户明细配置开始 -->
<bean id="accountItemService" class="com.jsh.service.materials.AccountItemService">
<property name="baseDao" ref="baseDao"/>
<property name="accountItemDao" ref="accountItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountItemAction" class="com.jsh.action.materials.AccountItemAction" scope="prototype">
<property name="accountItemService" ref="accountItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--账户明细配置结束 -->
</beans>
<?xml version="1.0" encoding="utf-8"?>
<!-- 指定Spring配置文件的Schema信息 -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
<!-- 装载属性配置文件 -->
<bean id="propertyConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations" value="classpath:common/jdbc.properties">
</property>
</bean>
<!-- 配置数据源C3P0 -->
<bean id="dataSource"
class="com.mchange.v2.c3p0.ComboPooledDataSource"
destroy-method="close">
<property name="jdbcUrl" value="${jdbcUrl}"></property>
<property name="driverClass" value="${driverClass}"></property>
<property name="user" value="${user}"></property>
<property name="password" value="${password}"></property>
<!--初始化时获取的连接数，取值应在minPoolSize与maxPoolSize之间。Default: 3 -->
<property name="initialPoolSize" value="10"/>
<!--连接池中保留的最大连接数。Default: 15 -->
<property name="maxPoolSize" value="80"/>
<!--连接池中保留的最小连接数。-->
<property name="minPoolSize" value="3"/>
<!--最大空闲时间,60秒内未使用则连接被丢弃。若为0则永不丢弃。Default: 0 -->
<property name="maxIdleTime" value="60" />
<property name="maxStatements" value="6000"/>
<!--当连接池中的连接耗尽的时候c3p0一次同时获取的连接数。Default: 3 -->
<property name="acquireIncrement" value="10"/>
<!--每60秒检查所有连接池中的空闲连接。Default: 0 -->
<property name="idleConnectionTestPeriod" value="60" />
</bean>
<!-- 配置SessionFactory -->
<bean id="sessionFactory"
class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="configLocation" value="classpath:hibernate/hibernate.cfg.xml"/>
</bean>
<!-- 配置Hibernate的局部事务管理器，使用HibernateTransactionManager类 -->
<!-- 该类实现PlatformTransactionManager接口，是针对Hibernate的特定实现-->
<bean id="transactionManager"
class="org.springframework.orm.hibernate3.HibernateTransactionManager">
<!-- 配置HibernateTransactionManager时需要依注入SessionFactory的引用 -->
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- 配置事务切面Bean,指定事务管理器 -->
<tx:advice id="txAdvice" transaction-manager="transactionManager">
<!-- 用于配置详细的事务语义 -->
<tx:attributes>
<!-- 所有以'get'开头的方法是read-only的 -->
<tx:method name="get*" read-only="true"/>
<!-- 其他方法使用默认的事务设置 -->
<tx:method name="*"/>
</tx:attributes>
</tx:advice>
<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
<bean id="serviceTemplate" abstract="true">
<!-- 为DAO组件注入SessionFactory引用 -->
<property name="baseDao" ref="baseDao"/>
</bean>
<!--通用baseservice配置开始 -->
<!-- <bean id="baseService" class="com.jsh.base.BaseService" abstract="true">
为DAO组件注入SessionFactory引用
<property name="baseDao" ref="baseDao"/>
</bean> -->
<!--用户配置开始 -->
<bean id="userService" class="com.jsh.service.basic.UserService">
<property name="baseDao" ref="baseDao"/>
<property name="userDao" ref="userDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="userAction" class="com.jsh.action.basic.UserAction" scope="prototype">
<property name="userService" ref="userService"/>
<property name="logService" ref="logService"/>
</bean>
<!--用户配置结束 -->
<!--日志配置开始 -->
<bean id="logService" class="com.jsh.service.basic.LogService">
<property name="baseDao" ref="baseDao"/>
<property name="logDao" ref="logDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="logAction" class="com.jsh.action.basic.LogAction" scope="prototype">
<property name="logService" ref="logService"/>
<property name="userService" ref="userService"/>
</bean>
<!--日志配置结束 -->
<!--供应商配置开始 -->
<bean id="supplierService" class="com.jsh.service.basic.SupplierService">
<property name="baseDao" ref="baseDao"/>
<property name="supplierDao" ref="supplierDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype">
<property name="supplierService" ref="supplierService"/>
<property name="logService" ref="logService"/>
</bean>
<!--供应商配置结束 -->
<!--分类配置开始 -->
<bean id="categoryService" class="com.jsh.service.basic.CategoryService">
<property name="baseDao" ref="baseDao"/>
<property name="categoryDao" ref="categoryDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="categoryAction" class="com.jsh.action.basic.CategoryAction" scope="prototype">
<property name="categoryService" ref="categoryService"/>
<property name="logService" ref="logService"/>
</bean>
<!--分类配置结束 -->
<!--仓库配置开始 -->
<bean id="depotService" class="com.jsh.service.basic.DepotService">
<property name="baseDao" ref="baseDao"/>
<property name="depotDao" ref="depotDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotAction" class="com.jsh.action.basic.DepotAction" scope="prototype">
<property name="depotService" ref="depotService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓库配置结束 -->
<!--应用配置开始 -->
<bean id="appService" class="com.jsh.service.basic.AppService">
<property name="baseDao" ref="baseDao"/>
<property name="appDao" ref="appDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="appAction" class="com.jsh.action.basic.AppAction" scope="prototype">
<property name="appService" ref="appService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--应用配置结束 -->
<!--角色配置开始 -->
<bean id="roleService" class="com.jsh.service.basic.RoleService">
<property name="baseDao" ref="baseDao"/>
<property name="roleDao" ref="roleDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="roleAction" class="com.jsh.action.basic.RoleAction" scope="prototype">
<property name="roleService" ref="roleService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--角色配置结束 -->
<!--功能配置开始 -->
<bean id="functionsService" class="com.jsh.service.basic.FunctionsService">
<property name="baseDao" ref="baseDao"/>
<property name="functionsDao" ref="functionsDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="functionsAction" class="com.jsh.action.basic.FunctionsAction" scope="prototype">
<property name="functionsService" ref="functionsService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--功能配置结束 -->
<!--用户对应关系配置开始 -->
<bean id="userBusinessService" class="com.jsh.service.basic.UserBusinessService">
<property name="baseDao" ref="baseDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="userBusinessAction" class="com.jsh.action.basic.UserBusinessAction" scope="prototype">
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/>
</bean>
<!--用户对应关系配置结束 -->
<!--资产名称配置开始 -->
<bean id="assetnameService" class="com.jsh.service.basic.AssetNameService">
<property name="baseDao" ref="baseDao"/>
<property name="assetNameDao" ref="assetNameDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="assetNameAction" class="com.jsh.action.basic.AssetNameAction" scope="prototype">
<property name="assetnameService" ref="assetnameService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产名称配置结束 -->
<!--资产配置开始 -->
<bean id="assetService" class="com.jsh.service.asset.AssetService">
<property name="baseDao" ref="baseDao"/>
<property name="assetDao" ref="assetDao"/>
<property name="assetNameDao" ref="assetNameDao"/>
<property name="categoryDao" ref="categoryDao"/>
<property name="supplierDao" ref="supplierDao"/>
<property name="userDao" ref="userDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="assetAction" class="com.jsh.action.asset.AssetAction" scope="prototype">
<property name="assetService" ref="assetService"/>
<property name="categoryService" ref="categoryService"/>
<property name="supplierService" ref="supplierService"/>
<property name="userService" ref="userService"/>
<property name="assetnameService" ref="assetnameService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产配置结束 -->
<!-- 资产报表配置开始 -->
<bean id="reportService" class="com.jsh.service.asset.ReportService">
<property name="reportDao" ref="reportDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="reportAction" class="com.jsh.action.asset.ReportAction" scope="prototype">
<property name="reportService" ref="reportService"/>
<property name="logService" ref="logService"/>
</bean>
<!--资产报表配置结束 -->
<!--经手人配置开始 -->
<bean id="personService" class="com.jsh.service.materials.PersonService">
<property name="baseDao" ref="baseDao"/>
<property name="personDao" ref="personDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="personAction" class="com.jsh.action.materials.PersonAction" scope="prototype">
<property name="personService" ref="personService"/>
<property name="logService" ref="logService"/>
</bean>
<!--经手人配置结束 -->
<!--商品类别配置开始 -->
<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
<property name="baseDao" ref="baseDao"/>
<property name="materialCategoryDao" ref="materialCategoryDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="materialCategoryAction" class="com.jsh.action.materials.MaterialCategoryAction" scope="prototype">
<property name="materialCategoryService" ref="materialCategoryService"/>
<property name="logService" ref="logService"/>
</bean>
<!--商品类别配置结束 -->
<!--商品配置开始 -->
<bean id="materialService" class="com.jsh.service.materials.MaterialService">
<property name="baseDao" ref="baseDao"/>
<property name="materialDao" ref="materialDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="materialAction" class="com.jsh.action.materials.MaterialAction" scope="prototype">
<property name="materialService" ref="materialService"/>
<property name="logService" ref="logService"/>
</bean>
<!--商品配置结束 -->
<!--仓管通配置开始 -->
<bean id="depotHeadService" class="com.jsh.service.materials.DepotHeadService">
<property name="baseDao" ref="baseDao"/>
<property name="depotHeadDao" ref="depotHeadDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotHeadAction" class="com.jsh.action.materials.DepotHeadAction" scope="prototype">
<property name="depotHeadService" ref="depotHeadService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓管通配置结束 -->
<!--仓管通明细配置开始 -->
<bean id="depotItemService" class="com.jsh.service.materials.DepotItemService">
<property name="baseDao" ref="baseDao"/>
<property name="depotItemDao" ref="depotItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype">
<property name="depotItemService" ref="depotItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--仓管通明细配置结束 -->
<!--结算账户配置开始 -->
<bean id="accountService" class="com.jsh.service.basic.AccountService">
<property name="baseDao" ref="baseDao"/>
<property name="accountDao" ref="accountDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
<property name="accountService" ref="accountService"/>
<property name="logService" ref="logService"/>
</bean>
<!--结算账户配置结束 -->
<!--收支项目配置开始 -->
<bean id="inOutItemService" class="com.jsh.service.basic.InOutItemService">
<property name="baseDao" ref="baseDao"/>
<property name="inOutItemDao" ref="inOutItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="inOutItemAction" class="com.jsh.action.basic.InOutItemAction" scope="prototype">
<property name="inOutItemService" ref="inOutItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--收支项目配置结束 -->
<!--账户抬头配置开始 -->
<bean id="accountHeadService" class="com.jsh.service.materials.AccountHeadService">
<property name="baseDao" ref="baseDao"/>
<property name="accountHeadDao" ref="accountHeadDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountHeadAction" class="com.jsh.action.materials.AccountHeadAction" scope="prototype">
<property name="accountHeadService" ref="accountHeadService"/>
<property name="logService" ref="logService"/>
</bean>
<!--账户抬头配置结束 -->
<!--账户明细配置开始 -->
<bean id="accountItemService" class="com.jsh.service.materials.AccountItemService">
<property name="baseDao" ref="baseDao"/>
<property name="accountItemDao" ref="accountItemDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="accountItemAction" class="com.jsh.action.materials.AccountItemAction" scope="prototype">
<property name="accountItemService" ref="accountItemService"/>
<property name="logService" ref="logService"/>
</bean>
<!--账户明细配置结束 -->
</beans>

112
WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml
View File

@@ -1,57 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 指定Spring配置文件的DTD信息 -->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
<bean id="daoTemplate" abstract="true">
<!-- 为DAO组件注入SessionFactory引用 -->
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- 配置通用baseDao组件 -->
<bean id="baseDao" parent="daoTemplate" class="com.jsh.base.BaseDAO" scope="prototype"/>
<!-- 配置userDao组件 -->
<bean id="userDao" parent="daoTemplate" class="com.jsh.dao.basic.UserDAO"/>
<!-- 配置logDao组件 -->
<bean id="logDao" parent="daoTemplate" class="com.jsh.dao.basic.LogDAO"/>
<!-- 配置supplierDao组件 -->
<bean id="supplierDao" parent="daoTemplate" class="com.jsh.dao.basic.SupplierDAO"/>
<!-- 配置categoryDao组件 -->
<bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/>
<!-- 配置depotDao组件 -->
<bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/>
<!-- 配置assetDao组件 -->
<bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/>
<!-- 配置assetDao组件 -->
<bean id="assetDao" parent="daoTemplate" class="com.jsh.dao.asset.AssetDAO"/>
<!-- 配置assetDao组件 -->
<bean id="reportDao" parent="daoTemplate" class="com.jsh.dao.asset.ReportDAO"/>
<!-- 配置appDao组件 -->
<bean id="appDao" parent="daoTemplate" class="com.jsh.dao.basic.AppDAO"/>
<!-- 配置roleDao组件 -->
<bean id="roleDao" parent="daoTemplate" class="com.jsh.dao.basic.RoleDAO"/>
<!-- 配置functionsDao组件 -->
<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>
<!-- 配置userBusinessDao组件 -->
<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>
<!-- 配置personDao组件 -->
<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>
<!-- 配置materialCategoryDao组件 -->
<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组件 -->
<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>
<!-- 配置accountDao组件 -->
<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>
<!-- 配置inOutItemDao组件 -->
<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>
<!-- 配置accountHeadDao组件 -->
<bean id="accountHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountHeadDAO"/>
<!-- 配置accountItemDao组件 -->
<bean id="accountItemDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountItemDAO"/>
</beans>
<?xml version="1.0" encoding="utf-8"?>
<!-- 指定Spring配置文件的DTD信息 -->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<!-- 配置daoTemplate，作为所有DAO组件的模板 -->
<bean id="daoTemplate" abstract="true">
<!-- 为DAO组件注入SessionFactory引用 -->
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- 配置通用baseDao组件 -->
<bean id="baseDao" parent="daoTemplate" class="com.jsh.base.BaseDAO" scope="prototype"/>
<!-- 配置userDao组件 -->
<bean id="userDao" parent="daoTemplate" class="com.jsh.dao.basic.UserDAO"/>
<!-- 配置logDao组件 -->
<bean id="logDao" parent="daoTemplate" class="com.jsh.dao.basic.LogDAO"/>
<!-- 配置supplierDao组件 -->
<bean id="supplierDao" parent="daoTemplate" class="com.jsh.dao.basic.SupplierDAO"/>
<!-- 配置categoryDao组件 -->
<bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/>
<!-- 配置depotDao组件 -->
<bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/>
<!-- 配置assetDao组件 -->
<bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/>
<!-- 配置assetDao组件 -->
<bean id="assetDao" parent="daoTemplate" class="com.jsh.dao.asset.AssetDAO"/>
<!-- 配置assetDao组件 -->
<bean id="reportDao" parent="daoTemplate" class="com.jsh.dao.asset.ReportDAO"/>
<!-- 配置appDao组件 -->
<bean id="appDao" parent="daoTemplate" class="com.jsh.dao.basic.AppDAO"/>
<!-- 配置roleDao组件 -->
<bean id="roleDao" parent="daoTemplate" class="com.jsh.dao.basic.RoleDAO"/>
<!-- 配置functionsDao组件 -->
<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>
<!-- 配置userBusinessDao组件 -->
<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>
<!-- 配置personDao组件 -->
<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>
<!-- 配置materialCategoryDao组件 -->
<bean id="materialCategoryDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialCategoryDAO"/>
<!-- 配置materialDao组件 -->
<bean id="materialDao" parent="daoTemplate" class="com.jsh.dao.materials.MaterialDAO"/>
<!-- 配置depotHeadDao组件 -->
<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>
<!-- 配置depotItemDao组件 -->
<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>
<!-- 配置accountDao组件 -->
<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>
<!-- 配置inOutItemDao组件 -->
<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>
<!-- 配置accountHeadDao组件 -->
<bean id="accountHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountHeadDAO"/>
<!-- 配置accountItemDao组件 -->
<bean id="accountItemDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountItemDAO"/>
</beans>

11
WebRoot/WEB-INF/classes/struts2/building-struts.xml
View File

@@ -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>

12
WebRoot/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js
View File

@@ -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;

2
WebRoot/pages/manage/user.jsp
View File

@@ -46,7 +46,7 @@
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>&nbsp;&nbsp;
<a id="btnSetRole" class='easyui-linkbutton iframe iframe_LargeForm' href='#' title='分配角色'>分配角色</a>&nbsp;&nbsp;
<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>

2
WebRoot/pages/materials/allocation_out_list.jsp
View File

@@ -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>

2
WebRoot/pages/materials/other_in_list.jsp
View File

@@ -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>

2
WebRoot/pages/materials/other_out_list.jsp
View File

@@ -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>

33
WebRoot/pages/materials/person.jsp
View File

@@ -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: '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 += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editPerson(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -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"/>&nbsp;编辑经手人信息');
$(".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

2
WebRoot/pages/materials/purchase_back_list.jsp
View File

@@ -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>

337
WebRoot/pages/materials/purchase_in_list.jsp
View File

@@ -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,40 +64,38 @@
<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>
<tr>
<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;"/>
</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;"/>
<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="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
</tr>
<tr>
<td>商品列表：</td>
@@ -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>
<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 + '\');"/>&nbsp;<a onclick="showDepotHead(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">查看</a>&nbsp;&nbsp;';
@@ -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"/>&nbsp;编辑采购入库信息');
$(".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"/>&nbsp;查看采购入库信息'+audit);
var TotalPrice = depotHeadInfo[14];
$('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看采购入库信息');
$(".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();
}
}
//删除

2
WebRoot/pages/materials/sale_back_list.jsp
View File

@@ -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>

2
WebRoot/pages/materials/sale_out_list.jsp
View File

@@ -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>