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

no commit message

Browse Source
This commit is contained in:
季圣华
2017-08-30 00:12:55 +08:00
parent 0c917016d3
commit b9bc613c60
15 changed files with 356 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/common/jdbc.properties
View File

@@ -1,4 +1,4 @@
jdbcUrl= jdbc\:mysql\://localhost\:3306/jsh_erp?useUnicode\=true&characterEncoding\=UTF-8 jdbcUrl= jdbc\:mysql\://localhost\:3306/jsh_erp20170717?useUnicode\=true&characterEncoding\=UTF-8
driverClass= com.mysql.jdbc.Driver driverClass= com.mysql.jdbc.Driver
user= root user= root
password=1234 password=1234

17
src/main/resources/hibernate/Depot.hbm.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping> <hibernate-mapping>
<class name="com.jsh.model.po.Depot" table="jsh_depot"> <class name="com.jsh.model.po.Depot" table="jsh_depot">
<id name="id" type="java.lang.Long"> <id name="id" type="java.lang.Long">
@@ -12,6 +12,21 @@
<comment>仓库名称</comment> <comment>仓库名称</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="address" type="java.lang.String">
<column length="50" name="address">
<comment>仓库地址</comment>
</column>
</property>
<property generated="never" lazy="false" name="warehousing" type="java.lang.Double">
<column name="warehousing" precision="22" scale="3">
<comment>仓储费</comment>
</column>
</property>
<property generated="never" lazy="false" name="truckage" type="java.lang.Double">
<column name="truckage" precision="22" scale="3">
<comment>搬运费</comment>
</column>
</property>
<property generated="never" lazy="false" name="type" type="java.lang.Integer"> <property generated="never" lazy="false" name="type" type="java.lang.Integer">
<column length="10" name="type"> <column length="10" name="type">
<comment>类型</comment> <comment>类型</comment>

82
src/main/resources/hibernate/DepotHead.hbm.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping> <hibernate-mapping>
<class name="com.jsh.model.po.DepotHead" table="jsh_depothead"> <class name="com.jsh.model.po.DepotHead" table="jsh_depothead">
<id name="Id" type="java.lang.Long"> <id name="Id" type="java.lang.Long">
@@ -14,14 +14,19 @@
</property> </property>
<property generated="never" lazy="false" name="SubType" type="java.lang.String"> <property generated="never" lazy="false" name="SubType" type="java.lang.String">
<column length="50" name="SubType"> <column length="50" name="SubType">
<comment>出入库分类</comment> <comment>出入库分类（销售、采购、调拨等）</comment>
</column> </column>
</property> </property>
<many-to-one name="ProjectId" class="com.jsh.model.po.Depot" lazy="false"> <many-to-one name="ProjectId" class="com.jsh.model.po.Depot" lazy="false">
<column name="ProjectId" not-null="true"> <column name="ProjectId">
<comment>项目Id</comment> <comment>仓库id（停用）</comment>
</column> </column>
</many-to-one> </many-to-one>
<property generated="never" lazy="false" name="DefaultNumber" type="java.lang.String">
<column length="50" name="DefaultNumber">
<comment>初始票据号</comment>
</column>
</property>
<property generated="never" lazy="false" name="Number" type="java.lang.String"> <property generated="never" lazy="false" name="Number" type="java.lang.String">
<column length="50" name="Number"> <column length="50" name="Number">
<comment>票据号</comment> <comment>票据号</comment>
@@ -44,7 +49,7 @@
</property> </property>
<many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false"> <many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false">
<column name="OrganId"> <column name="OrganId">
<comment>供应商Id</comment> <comment>供应商或客户Id</comment>
</column> </column>
</many-to-one> </many-to-one>
<many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false"> <many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
@@ -52,6 +57,11 @@
<comment>经手人Id</comment> <comment>经手人Id</comment>
</column> </column>
</many-to-one> </many-to-one>
<property generated="never" lazy="false" name="Salesman" type="java.lang.String">
<column length="50" name="Salesman">
<comment>业务员（可以多个）</comment>
</column>
</property>
<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false"> <many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
<column name="AccountId"> <column name="AccountId">
<comment>账户Id</comment> <comment>账户Id</comment>
@@ -59,13 +69,58 @@
</many-to-one> </many-to-one>
<property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double"> <property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
<column name="ChangeAmount" precision="22" scale="3"> <column name="ChangeAmount" precision="22" scale="3">
<comment>变动金额(收款/付款)</comment> <comment>单据总金额(收款/付款)</comment>
</column>
</property>
<property generated="never" lazy="false" name="AccountIdList" type="java.lang.String">
<column length="50" name="AccountIdList">
<comment>多账户ID列表</comment>
</column>
</property>
<property generated="never" lazy="false" name="AccountMoneyList" type="java.lang.String">
<column length="200" name="AccountMoneyList">
<comment>多账户金额列表</comment>
</column>
</property>
<property generated="never" lazy="false" name="Discount" type="java.lang.Double">
<column name="Discount" precision="22" scale="3">
<comment>优惠率</comment>
</column>
</property>
<property generated="never" lazy="false" name="DiscountMoney" type="java.lang.Double">
<column name="DiscountMoney" precision="22" scale="3">
<comment>优惠金额</comment>
</column>
</property>
<property generated="never" lazy="false" name="DiscountLastMoney" type="java.lang.Double">
<column name="DiscountLastMoney" precision="22" scale="3">
<comment>优惠后金额</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherMoney" type="java.lang.Double">
<column name="OtherMoney" precision="22" scale="3">
<comment>销售或采购费用</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherMoneyList" type="java.lang.String">
<column length="200" name="OtherMoneyList">
<comment>销售或采购费用涉及项目Id数组（包括快递、招待等）</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherMoneyItem" type="java.lang.String">
<column length="200" name="OtherMoneyItem">
<comment>销售或采购费用涉及项目（包括快递、招待等）</comment>
</column>
</property>
<property generated="never" lazy="false" name="AccountDay" type="java.lang.Integer">
<column name="AccountDay" length="10">
<comment>结算天数</comment>
</column> </column>
</property> </property>
<many-to-one name="AllocationProjectId" class="com.jsh.model.po.Depot" lazy="false"> <many-to-one name="AllocationProjectId" class="com.jsh.model.po.Depot" lazy="false">
<column name="AllocationProjectId"> <column name="AllocationProjectId">
<comment>调拨时，对方项目Id</comment> <comment>调拨时，对方仓库Id（停用）</comment>
</column> </column>
</many-to-one> </many-to-one>
<property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double"> <property generated="never" lazy="false" name="TotalPrice" type="java.lang.Double">
<column name="TotalPrice" precision="22" scale="3"> <column name="TotalPrice" precision="22" scale="3">
@@ -74,7 +129,12 @@
</property> </property>
<property generated="never" lazy="false" name="PayType" type="java.lang.String"> <property generated="never" lazy="false" name="PayType" type="java.lang.String">
<column length="50" name="PayType"> <column length="50" name="PayType">
<comment>付款类型</comment> <comment>付款类型(现金、记账等)</comment>
</column>
</property>
<property generated="never" lazy="false" name="Status" type="boolean">
<column length="1" name="Status">
<comment>单据状态(未审核、已审核)</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String"> <property generated="never" lazy="false" name="Remark" type="java.lang.String">

84
src/main/resources/hibernate/DepotItem.hbm.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping> <hibernate-mapping>
<class name="com.jsh.model.po.DepotItem" table="jsh_depotitem"> <class name="com.jsh.model.po.DepotItem" table="jsh_depotitem">
<id name="Id" type="java.lang.Long"> <id name="Id" type="java.lang.Long">
@@ -8,39 +8,99 @@
<generator class="native"/> <generator class="native"/>
</id> </id>
<many-to-one name="HeaderId" class="com.jsh.model.po.DepotHead" lazy="false"> <many-to-one name="HeaderId" class="com.jsh.model.po.DepotHead" lazy="false">
<column name="HeaderId" not-null="true"> <column name="HeaderId" not-null="true">
<comment>表头Id</comment> <comment>主表Id</comment>
</column> </column>
</many-to-one> </many-to-one>
<many-to-one name="MaterialId" class="com.jsh.model.po.Material" lazy="false"> <many-to-one name="MaterialId" class="com.jsh.model.po.Material" lazy="false">
<column name="MaterialId" not-null="true"> <column name="MaterialId" not-null="true">
<comment>材料Id</comment> <comment>商品Id</comment>
</column> </column>
</many-to-one> </many-to-one>
<property generated="never" lazy="false" name="MUnit" type="java.lang.String">
<column length="20" name="MUnit">
<comment>商品计量单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="OperNumber" type="java.lang.Double"> <property generated="never" lazy="false" name="OperNumber" type="java.lang.Double">
<column name="OperNumber" precision="22" scale="3"> <column name="OperNumber" precision="22" scale="3">
<comment>数量</comment> <comment>数量</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="BasicNumber" type="java.lang.Double">
<column name="BasicNumber" precision="22" scale="3">
<comment>基础数量，如kg、瓶</comment>
</column>
</property>
<property generated="never" lazy="false" name="UnitPrice" type="java.lang.Double"> <property generated="never" lazy="false" name="UnitPrice" type="java.lang.Double">
<column name="UnitPrice" precision="22" scale="3"> <column name="UnitPrice" precision="22" scale="3">
<comment>单价</comment> <comment>单价</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="TaxUnitPrice" type="java.lang.Double">
<column name="TaxUnitPrice" precision="22" scale="3">
<comment>含税单价</comment>
</column>
</property>
<property generated="never" lazy="false" name="AllPrice" type="java.lang.Double"> <property generated="never" lazy="false" name="AllPrice" type="java.lang.Double">
<column name="AllPrice" precision="22" scale="3"> <column name="AllPrice" precision="22" scale="3">
<comment>金额</comment> <comment>金额</comment>
</column> </column>
</property> </property>
<many-to-one name="DepotId" class="com.jsh.model.po.Depot" lazy="false">
<column name="DepotId">
<comment>仓库ID（库存是统计出来的）</comment>
</column>
</many-to-one>
<many-to-one name="AnotherDepotId" class="com.jsh.model.po.Depot" lazy="false">
<column name="AnotherDepotId">
<comment>调拨时，对方仓库Id</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="TaxRate" type="java.lang.Double">
<column name="TaxRate" precision="22" scale="3">
<comment>税率</comment>
</column>
</property>
<property generated="never" lazy="false" name="TaxMoney" type="java.lang.Double">
<column name="TaxMoney" precision="22" scale="3">
<comment>税额</comment>
</column>
</property>
<property generated="never" lazy="false" name="TaxLastMoney" type="java.lang.Double">
<column name="TaxLastMoney" precision="22" scale="3">
<comment>价税合计</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherField1" type="java.lang.String">
<column length="50" name="OtherField1">
<comment>自定义字段1-品名</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherField2" type="java.lang.String">
<column length="50" name="OtherField2">
<comment>自定义字段2-型号</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherField3" type="java.lang.String">
<column length="50" name="OtherField3">
<comment>自定义字段3-制造商</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherField4" type="java.lang.String">
<column length="50" name="OtherField4">
<comment>自定义字段4</comment>
</column>
</property>
<property generated="never" lazy="false" name="OtherField5" type="java.lang.String">
<column length="50" name="OtherField5">
<comment>自定义字段5</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String"> <property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="200" name="Remark"> <column length="200" name="Remark">
<comment>描述</comment> <comment>描述</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="Img" type="java.lang.String">
<column length="50" name="Img">
<comment>图片</comment>
</column>
</property>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

5
src/main/resources/hibernate/Functions.hbm.xml
View File

@@ -47,6 +47,11 @@
<comment>类型</comment> <comment>类型</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="PushBtn" type="java.lang.String">
<column length="50" name="PushBtn">
<comment>功能按钮</comment>
</column>
</property>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

42
src/main/resources/hibernate/Material.hbm.xml
View File

@@ -15,6 +15,21 @@
<comment>名称</comment> <comment>名称</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="Mfrs" type="java.lang.String">
<column length="50" name="Mfrs">
<comment>制造商</comment>
</column>
</property>
<property generated="never" lazy="false" name="Packing" type="java.lang.Double">
<column name="Packing" precision="22" scale="3">
<comment>包装（KG/包）</comment>
</column>
</property>
<property generated="never" lazy="false" name="SafetyStock" type="java.lang.Double">
<column name="SafetyStock" precision="22" scale="3">
<comment>安全存量（KG）</comment>
</column>
</property>
<property generated="never" lazy="false" name="Model" type="java.lang.String"> <property generated="never" lazy="false" name="Model" type="java.lang.String">
<column length="50" name="Model"> <column length="50" name="Model">
<comment>型号</comment> <comment>型号</comment>
@@ -32,7 +47,27 @@
</property> </property>
<property generated="never" lazy="false" name="Unit" type="java.lang.String"> <property generated="never" lazy="false" name="Unit" type="java.lang.String">
<column length="50" name="Unit"> <column length="50" name="Unit">
<comment>单位</comment> <comment>单位-单个</comment>
</column>
</property>
<many-to-one name="UnitId" class="com.jsh.model.po.Unit" lazy="false">
<column name="UnitId">
<comment>多单位</comment>
</column>
</many-to-one>
<property generated="never" lazy="false" name="FirstOutUnit" type="java.lang.String">
<column length="50" name="FirstOutUnit">
<comment>首选出库单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="FirstInUnit" type="java.lang.String">
<column length="50" name="FirstInUnit">
<comment>首选入库单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="PriceStrategy" type="java.lang.String">
<column length="500" name="PriceStrategy">
<comment>价格策略</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double"> <property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double">
@@ -60,5 +95,10 @@
<comment>备注</comment> <comment>备注</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="Enabled" type="boolean">
<column length="1" name="Enabled">
<comment>启用</comment>
</column>
</property>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

43
src/main/resources/hibernate/Supplier.hbm.xml
View File

@@ -9,7 +9,7 @@
</id> </id>
<property name="supplier" type="java.lang.String"> <property name="supplier" type="java.lang.String">
<column name="supplier" not-null="true"> <column name="supplier" not-null="true">
<comment>供应商名称</comment> <comment>名称</comment>
</column> </column>
</property> </property>
<property name="type" type="java.lang.String"> <property name="type" type="java.lang.String">
@@ -24,7 +24,17 @@
</property> </property>
<property name="phonenum" type="java.lang.String"> <property name="phonenum" type="java.lang.String">
<column name="phonenum" length="30"> <column name="phonenum" length="30">
<comment>联系电话</comment> <comment>电话</comment>
</column>
</property>
<property name="fax" type="java.lang.String">
<column name="fax" length="30">
<comment>传真</comment>
</column>
</property>
<property name="telephone" type="java.lang.String">
<column name="telephone" length="30">
<comment>手机</comment>
</column> </column>
</property> </property>
<property name="email" type="java.lang.String"> <property name="email" type="java.lang.String">
@@ -32,11 +42,36 @@
<comment>电子邮箱</comment> <comment>电子邮箱</comment>
</column> </column>
</property> </property>
<property name="address" type="java.lang.String">
<column name="address" length="50">
<comment>地址</comment>
</column>
</property>
<property generated="never" lazy="false" name="AdvanceIn" type="java.lang.Double"> <property generated="never" lazy="false" name="AdvanceIn" type="java.lang.Double">
<column name="AdvanceIn" precision="22" scale="3"> <column name="AdvanceIn" precision="22" scale="3">
<comment>预收款</comment> <comment>预收款</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="taxNum" type="java.lang.String">
<column name="taxNum " length="50">
<comment>纳税人识别号</comment>
</column>
</property>
<property generated="never" lazy="false" name="bankName" type="java.lang.String">
<column name="bankName " length="50">
<comment>开户行</comment>
</column>
</property>
<property generated="never" lazy="false" name="accountNumber" type="java.lang.String">
<column name="accountNumber" length="50">
<comment>账号</comment>
</column>
</property>
<property generated="never" lazy="false" name="taxRate" type="java.lang.Double">
<column name="taxRate" precision="22" scale="3">
<comment>税率</comment>
</column>
</property>
<property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double"> <property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double">
<column name="BeginNeedGet" precision="22" scale="3"> <column name="BeginNeedGet" precision="22" scale="3">
<comment>期初应收</comment> <comment>期初应收</comment>
@@ -58,7 +93,9 @@
</column> </column>
</property> </property>
<property name="description" type="java.lang.String"> <property name="description" type="java.lang.String">
<column name="description" length="500" /> <column name="description" length="500">
<comment>备注</comment>
</column>
</property> </property>
<property name="isystem" type="java.lang.Short"> <property name="isystem" type="java.lang.Short">
<column name="isystem" not-null="true"> <column name="isystem" not-null="true">

16
src/main/resources/hibernate/Unit.hbm.xml Normal file
View File

@@ -0,0 +1,16 @@
<?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.Unit" table="jsh_unit">
<id name="id" type="java.lang.Long">
<column name="id"/>
<generator class="native"/>
</id>
<property generated="never" lazy="false" name="UName" type="java.lang.String">
<column length="50" name="UName">
<comment>单位名称</comment>
</column>
</property>
</class>
</hibernate-mapping>

5
src/main/resources/hibernate/UserBusiness.hbm.xml
View File

@@ -22,5 +22,10 @@
<comment>值</comment> <comment>值</comment>
</column> </column>
</property> </property>
<property generated="never" lazy="false" name="BtnStr" type="java.lang.String">
<column length="2000" name="BtnStr">
<comment>按钮权限</comment>
</column>
</property>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

1
src/main/resources/hibernate/hibernate.cfg.xml
View File

@@ -29,6 +29,7 @@
<mapping resource="hibernate/Basicuser.hbm.xml" /> <mapping resource="hibernate/Basicuser.hbm.xml" />
<mapping resource="hibernate/Asset.hbm.xml" /> <mapping resource="hibernate/Asset.hbm.xml" />
<mapping resource="hibernate/Depot.hbm.xml" /> <mapping resource="hibernate/Depot.hbm.xml" />
<mapping resource="hibernate/Unit.hbm.xml" />
<mapping resource="hibernate/App.hbm.xml" /> <mapping resource="hibernate/App.hbm.xml" />
<mapping resource="hibernate/Role.hbm.xml" /> <mapping resource="hibernate/Role.hbm.xml" />
<mapping resource="hibernate/Functions.hbm.xml" /> <mapping resource="hibernate/Functions.hbm.xml" />

15
src/main/resources/spring/basic-applicationContext.xml
View File

@@ -106,10 +106,12 @@
<bean id="supplierService" class="com.jsh.service.basic.SupplierService"> <bean id="supplierService" class="com.jsh.service.basic.SupplierService">
<property name="baseDao" ref="baseDao"/> <property name="baseDao" ref="baseDao"/>
<property name="supplierDao" ref="supplierDao"/> <property name="supplierDao" ref="supplierDao"/>
<property name="userBusinessDao" ref="userBusinessDao"/>
</bean> </bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 --> <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype"> <bean id="supplierAction" class="com.jsh.action.basic.SupplierAction" scope="prototype">
<property name="supplierService" ref="supplierService"/> <property name="supplierService" ref="supplierService"/>
<property name="userBusinessService" ref="userBusinessService"/>
<property name="logService" ref="logService"/> <property name="logService" ref="logService"/>
</bean> </bean>
<!--供应商配置结束 --> <!--供应商配置结束 -->
@@ -140,6 +142,18 @@
<property name="logService" ref="logService"/> <property name="logService" ref="logService"/>
</bean> </bean>
<!--仓库配置结束 --> <!--仓库配置结束 -->
<!--计量单位开始 -->
<bean id="unitService" class="com.jsh.service.basic.UnitService">
<property name="baseDao" ref="baseDao"/>
<property name="unitDao" ref="unitDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="unitAction" class="com.jsh.action.basic.UnitAction" scope="prototype">
<property name="unitService" ref="unitService"/>
<property name="logService" ref="logService"/>
</bean>
<!--计量单位结束 -->
<!--应用配置开始 --> <!--应用配置开始 -->
<bean id="appService" class="com.jsh.service.basic.AppService"> <bean id="appService" class="com.jsh.service.basic.AppService">
@@ -294,6 +308,7 @@
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 --> <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype"> <bean id="depotItemAction" class="com.jsh.action.materials.DepotItemAction" scope="prototype">
<property name="depotItemService" ref="depotItemService"/> <property name="depotItemService" ref="depotItemService"/>
<property name="materialService" ref="materialService"/>
<property name="logService" ref="logService"/> <property name="logService" ref="logService"/>
</bean> </bean>
<!--仓管通明细配置结束 --> <!--仓管通明细配置结束 -->

2
src/main/resources/spring/dao-applicationContext.xml
View File

@@ -20,6 +20,8 @@
<bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/> <bean id="categoryDao" parent="daoTemplate" class="com.jsh.dao.basic.CategoryDAO"/>
<!-- 配置depotDao组件 --> <!-- 配置depotDao组件 -->
<bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/> <bean id="depotDao" parent="daoTemplate" class="com.jsh.dao.basic.DepotDAO"/>
<!-- 配置unitDao组件 -->
<bean id="unitDao" parent="daoTemplate" class="com.jsh.dao.basic.UnitDAO"/>
<!-- 配置assetDao组件 --> <!-- 配置assetDao组件 -->
<bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/> <bean id="assetNameDao" parent="daoTemplate" class="com.jsh.dao.basic.AssetNameDAO"/>
<!-- 配置assetDao组件 --> <!-- 配置assetDao组件 -->

19
src/main/resources/struts2/material-struts.xml
View File

@@ -7,5 +7,24 @@
<action name="*" class="materialAction" method="{1}"> <action name="*" class="materialAction" method="{1}">
<result type="json"/> <result type="json"/>
</action> </action>
<!--导入excel表格 -->
<action name="importExcel" class="materialAction" method="importExcel">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
<result name="success">/pages/materials/material.jsp</result>
</action>
<!--导出excel表格 -->
<action name="exportExcel" class="materialAction" method="exportExcel">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
</action>
</package> </package>
</struts> </struts>

41
src/main/resources/struts2/supplier-struts.xml
View File

@@ -7,5 +7,46 @@
<action name="*" class="supplierAction" method="{1}"> <action name="*" class="supplierAction" method="{1}">
<result type="json"/> <result type="json"/>
</action> </action>
<!--导入excel表格 -->
<action name="importExcelVendor" class="supplierAction" method="importExcelVendor">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
<result name="success">/pages/manage/vendor.jsp</result>
</action>
<!--导入excel表格 -->
<action name="importExcelCustomer" class="supplierAction" method="importExcelCustomer">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
<result name="success">/pages/manage/customer.jsp</result>
</action>
<!--导入excel表格 -->
<action name="importExcelMember" class="supplierAction" method="importExcelMember">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
<result name="success">/pages/manage/member.jsp</result>
</action>
<!--导出excel表格 -->
<action name="exportExcel" class="supplierAction" method="exportExcel">
<result name="excel" type="stream">
<param name="contentType">application/vnd.ms-excel</param>
<param name="inputName">excelStream</param>
<param name="contentDisposition">attachment;filename="${fileName}"</param>
<param name="bufferSize">1024</param>
</result>
</action>
</package> </package>
</struts> </struts>

11
src/main/resources/struts2/unit-struts.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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="unit" namespace="/unit" extends="json-default">
<action name="*" class="unitAction" method="{1}">
<result type="json"/>
</action>
</package>
</struts>