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-04 22:32:35 +08:00
parent c8f80894f1
commit 227cf3b2de
93 changed files with 2140 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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/basic/SupplierAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/basic/VisitAccountAction.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/base/BaseDAO.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountDAO.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/dao/basic/VisitAccountIDAO.class
View File

Binary file not shown.

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

Binary file not shown.

98
WebRoot/WEB-INF/classes/com/jsh/model/po/Material.hbm.xml
View File

@@ -1,39 +1,59 @@
<?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.Material" table="jsh_material">
<id name="Id" type="java.lang.Long">
<column name="Id"/>
<generator class="native"/>
</id>
<many-to-one name="materialCategory" class="com.jsh.model.po.MaterialCategory" lazy="false">
<column name="CategoryId" />
</many-to-one>
<property generated="never" lazy="false" name="Name" type="java.lang.String">
<column length="50" name="Name">
<comment>名称</comment>
</column>
</property>
<property generated="never" lazy="false" name="Model" type="java.lang.String">
<column length="50" name="Model">
<comment>型号</comment>
</column>
</property>
<property generated="never" lazy="false" name="Color" type="java.lang.String">
<column length="50" name="Color">
<comment>颜色</comment>
</column>
</property>
<property generated="never" lazy="false" name="Unit" type="java.lang.String">
<column length="50" name="Unit">
<comment>单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="100" name="Remark">
<comment>备注</comment>
</column>
</property>
</class>
</hibernate-mapping>
<?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.Material" table="jsh_material">
<id name="Id" type="java.lang.Long">
<column name="Id"/>
<generator class="native"/>
</id>
<many-to-one name="materialCategory" class="com.jsh.model.po.MaterialCategory" lazy="false">
<column name="CategoryId" />
</many-to-one>
<property generated="never" lazy="false" name="Name" type="java.lang.String">
<column length="50" name="Name">
<comment>名称</comment>
</column>
</property>
<property generated="never" lazy="false" name="Model" type="java.lang.String">
<column length="50" name="Model">
<comment>型号</comment>
</column>
</property>
<property generated="never" lazy="false" name="Color" type="java.lang.String">
<column length="50" name="Color">
<comment>颜色</comment>
</column>
</property>
<property generated="never" lazy="false" name="Unit" type="java.lang.String">
<column length="50" name="Unit">
<comment>单位</comment>
</column>
</property>
<property generated="never" lazy="false" name="RetailPrice" type="java.lang.Double">
<column name="RetailPrice" precision="22" scale="3">
<comment>零售价</comment>
</column>
</property>
<property generated="never" lazy="false" name="LowPrice" type="java.lang.Double">
<column name="LowPrice" precision="22" scale="3">
<comment>最低售价</comment>
</column>
</property>
<property generated="never" lazy="false" name="PresetPriceOne" type="java.lang.Double">
<column name="PresetPriceOne" precision="22" scale="3">
<comment>预设售价一</comment>
</column>
</property>
<property generated="never" lazy="false" name="PresetPriceTwo" type="java.lang.Double">
<column name="PresetPriceTwo" precision="22" scale="3">
<comment>预设售价二</comment>
</column>
</property>
<property generated="never" lazy="false" name="Remark" type="java.lang.String">
<column length="100" name="Remark">
<comment>备注</comment>
</column>
</property>
</class>
</hibernate-mapping>

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

Binary file not shown.

118
WebRoot/WEB-INF/classes/com/jsh/model/po/Supplier.hbm.xml
View File

@@ -1,49 +1,69 @@
<?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.Supplier" table="jsh_supplier">
<id name="id" type="java.lang.Long">
<column name="id" />
<generator class="native"/>
</id>
<property name="supplier" type="java.lang.String">
<column name="supplier" not-null="true">
<comment>供应商名称</comment>
</column>
</property>
<property name="type" type="java.lang.String">
<column name="type" length="20">
<comment>类型</comment>
</column>
</property>
<property name="contacts" type="java.lang.String">
<column name="contacts" length="100">
<comment>联系人</comment>
</column>
</property>
<property name="phonenum" type="java.lang.String">
<column name="phonenum" length="30">
<comment>联系电话</comment>
</column>
</property>
<property name="email" type="java.lang.String">
<column name="email" length="50">
<comment>电子邮箱</comment>
</column>
</property>
<property name="description" type="java.lang.String">
<column name="description" length="500" />
</property>
<property name="isystem" type="java.lang.Short">
<column name="isystem" not-null="true">
<comment>是否系统自带 0==系统 1==非系统</comment>
</column>
</property>
<property generated="never" lazy="false" name="enabled" type="boolean">
<column length="1" name="enabled">
<comment>启用</comment>
</column>
</property>
</class>
</hibernate-mapping>
<?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.Supplier" table="jsh_supplier">
<id name="id" type="java.lang.Long">
<column name="id" />
<generator class="native"/>
</id>
<property name="supplier" type="java.lang.String">
<column name="supplier" not-null="true">
<comment>供应商名称</comment>
</column>
</property>
<property name="type" type="java.lang.String">
<column name="type" length="20">
<comment>类型</comment>
</column>
</property>
<property name="contacts" type="java.lang.String">
<column name="contacts" length="100">
<comment>联系人</comment>
</column>
</property>
<property name="phonenum" type="java.lang.String">
<column name="phonenum" length="30">
<comment>联系电话</comment>
</column>
</property>
<property name="email" type="java.lang.String">
<column name="email" length="50">
<comment>电子邮箱</comment>
</column>
</property>
<property generated="never" lazy="false" name="BeginNeedGet" type="java.lang.Double">
<column name="BeginNeedGet" precision="22" scale="3">
<comment>期初应收</comment>
</column>
</property>
<property generated="never" lazy="false" name="BeginNeedPay" type="java.lang.Double">
<column name="BeginNeedPay" precision="22" scale="3">
<comment>期初应付</comment>
</column>
</property>
<property generated="never" lazy="false" name="AllNeedGet" type="java.lang.Double">
<column name="AllNeedGet" precision="22" scale="3">
<comment>累计应收</comment>
</column>
</property>
<property generated="never" lazy="false" name="AllNeedPay" type="java.lang.Double">
<column name="AllNeedPay" precision="22" scale="3">
<comment>累计应付</comment>
</column>
</property>
<property name="description" type="java.lang.String">
<column name="description" length="500" />
</property>
<property name="isystem" type="java.lang.Short">
<column name="isystem" not-null="true">
<comment>是否系统自带 0==系统 1==非系统</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/VisitAccount.class
View File

Binary file not shown.

49
WebRoot/WEB-INF/classes/com/jsh/model/po/VisitAccount.hbm.xml
View File

@@ -1,49 +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.VisitAccount" table="jsh_visitaccount">
<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="LouHao" type="java.lang.String">
<column length="50" name="LouHao">
<comment>楼号</comment>
</column>
</property>
<property generated="never" lazy="false" name="HuHao" type="java.lang.String">
<column length="50" name="HuHao">
<comment>户号</comment>
</column>
</property>
<property generated="never" lazy="false" name="HuiFang" type="java.lang.String">
<column length="50" name="HuiFang">
<comment>回访情况</comment>
</column>
</property>
<property generated="never" lazy="false" name="LuoShi" type="java.lang.String">
<column length="50" name="LuoShi">
<comment>落实情况</comment>
</column>
</property>
<property generated="never" lazy="false" name="Name" type="java.lang.String">
<column length="50" name="Name">
<comment>住户姓名</comment>
</column>
</property>
<property generated="never" lazy="false" name="Tel" type="java.lang.String">
<column length="50" name="Tel">
<comment>电话 </comment>
</column>
</property>
<property name="AddTime" type="java.sql.Timestamp">
<column length="19" name="AddTime">
<comment>时间 </comment>
</column>
</property>
</class>
</hibernate-mapping>

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/SupplierModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountModel.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/model/vo/basic/VisitAccountShowModel.class
View File

Binary file not shown.

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

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountIService.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/service/basic/VisitAccountService.class
View File

Binary file not shown.

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

@@ -33,7 +33,6 @@
<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/VisitAccount.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" />

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

@@ -238,18 +238,6 @@
</bean>
<!--资产报表配置结束 -->
<!--回访台帐配置开始 -->
<bean id="visitAccountService" class="com.jsh.service.basic.VisitAccountService">
<property name="baseDao" ref="baseDao"/>
<property name="visitAccountDao" ref="visitAccountDao"/>
</bean>
<!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
<bean id="visitAccountAction" class="com.jsh.action.basic.VisitAccountAction" scope="prototype">
<property name="visitAccountService" ref="visitAccountService"/>
<property name="logService" ref="logService"/>
</bean>
<!--回访台帐配置结束 -->
<!--经手人配置开始 -->
<bean id="personService" class="com.jsh.service.materials.PersonService">
<property name="baseDao" ref="baseDao"/>
@@ -262,7 +250,7 @@
</bean>
<!--经手人配置结束 -->
<!--物料类别配置开始 -->
<!--商品类别配置开始 -->
<bean id="materialCategoryService" class="com.jsh.service.materials.MaterialCategoryService">
<property name="baseDao" ref="baseDao"/>
<property name="materialCategoryDao" ref="materialCategoryDao"/>
@@ -272,9 +260,9 @@
<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"/>
@@ -284,7 +272,7 @@
<property name="materialService" ref="materialService"/>
<property name="logService" ref="logService"/>
</bean>
<!--物料配置结束 -->
<!--商品配置结束 -->
<!--单元配置开始 -->
<bean id="buildingService" class="com.jsh.service.materials.BuildingService">

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

@@ -34,8 +34,6 @@
<bean id="functionsDao" parent="daoTemplate" class="com.jsh.dao.basic.FunctionsDAO"/>
<!-- 配置userBusinessDao组件 -->
<bean id="userBusinessDao" parent="daoTemplate" class="com.jsh.dao.basic.UserBusinessDAO"/>
<!-- 配置visitAccountDao组件 -->
<bean id="visitAccountDao" parent="daoTemplate" class="com.jsh.dao.basic.VisitAccountDAO"/>
<!-- 配置personDao组件 -->
<bean id="personDao" parent="daoTemplate" class="com.jsh.dao.materials.PersonDAO"/>
<!-- 配置materialCategoryDao组件 -->

11
WebRoot/WEB-INF/classes/struts2/visitAccount-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="visitAccount" namespace="/visitAccount" extends="json-default">
<action name="*" class="visitAccountAction" method="{1}">
<result type="json"/>
</action>
</package>
</struts>