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

礼品卡管理模块

Browse Source
This commit is contained in:
季圣华
2017-07-15 00:33:28 +08:00
parent 8f4cac02ef
commit 883890eb00
21 changed files with 1402 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/jsh_erp.sql
View File

File diff suppressed because one or more lines are too long

59
src/main/java/com/jsh/action/basic/DepotAction.java
View File

@@ -64,6 +64,7 @@ public class DepotAction extends BaseAction<DepotModel>
{
Depot depot = new Depot();
depot.setName(model.getName());
depot.setType(model.getType());
depot.setSort(model.getSort());
depot.setRemark(model.getRemark());
depotService.create(depot);
@@ -137,6 +138,7 @@ public class DepotAction extends BaseAction<DepotModel>
{
Depot depot = depotService.get(model.getDepotID());
depot.setName(model.getName());
depot.setType(model.getType());
depot.setSort(model.getSort());
depot.setRemark(model.getRemark());
depotService.update(depot);
@@ -249,6 +251,7 @@ public class DepotAction extends BaseAction<DepotModel>
item.put("id", depot.getId());
//供应商名称
item.put("name", depot.getName());
item.put("type", depot.getType());
item.put("sort", depot.getSort());
item.put("remark", depot.getRemark());
item.put("op", 1);
@@ -269,6 +272,46 @@ public class DepotAction extends BaseAction<DepotModel>
}
}
/**
* 查找礼品卡-虚拟仓库
* @return
*/
public void findGiftByType()
{
try
{
PageUtil<Depot> pageUtil = new PageUtil<Depot>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getConditionByType());
depotService.find(pageUtil);
List<Depot> dataList = pageUtil.getPageList();
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Depot depot:dataList)
{
JSONObject item = new JSONObject();
item.put("id", depot.getId());
//仓库名称
item.put("name", depot.getName());
dataArray.add(item);
}
}
//回写查询结果
toClient(dataArray.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>查找仓库信息异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>回写查询仓库信息结果异常", e);
}
}
/**
* 用户对应仓库显示
* @return
@@ -340,6 +383,22 @@ public class DepotAction extends BaseAction<DepotModel>
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("name_s_like", model.getName());
condition.put("remark_s_like", model.getRemark());
condition.put("type_n_eq", model.getType()); //0-仓库，1-礼品卡
condition.put("sort_s_order", "asc");
return condition;
}
/**
* 拼接搜索条件
* @return
*/
private Map<String,Object> getConditionByType()
{
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_n_eq", model.getType()); //0-仓库，1-礼品卡
condition.put("sort_s_order", "asc");
return condition;
}

56
src/main/java/com/jsh/action/basic/SupplierAction.java
View File

@@ -440,6 +440,46 @@ public class SupplierAction extends BaseAction<SupplierModel>
}
}
/**
* 查找非会员的id
*/
public void findBySelectRetailNoPeople()
{
try
{
PageUtil<Supplier> pageUtil = new PageUtil<Supplier>();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
pageUtil.setAdvSearch(getCondition_Select_retail_no_people());
supplierService.find(pageUtil);
List<Supplier> dataList = pageUtil.getPageList();
//存放数据json数组
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(Supplier supplier:dataList)
{
JSONObject item = new JSONObject();
item.put("id", supplier.getId());
//客户名称
item.put("supplier", supplier.getSupplier());
item.put("advanceIn", supplier.getAdvanceIn()); //预付款金额
dataArray.add(item);
}
}
//回写查询结果
toClient(dataArray.toString());
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>查找客户信息异常", e);
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e);
}
}
/**
* 拼接搜索条件
* @return
@@ -506,6 +546,22 @@ public class SupplierAction extends BaseAction<SupplierModel>
return condition;
}
/**
* 拼接搜索条件-非会员
* @return
*/
private Map<String,Object> getCondition_Select_retail_no_people()
{
/**
* 拼接搜索条件
*/
Map<String,Object> condition = new HashMap<String,Object>();
condition.put("type_s_like", "散户");
condition.put("isystem_n_eq", 0);
condition.put("id_s_order", "desc");
return condition;
}
//=============以下spring注入以及Model驱动公共方法，与Action处理无关==================
@Override
public SupplierModel getModel()

3
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -436,6 +436,9 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
private Map<String,Object> getConditionHead()
{
Map<String,Object> condition = new HashMap<String,Object>();
if(model.getProjectId()!=null) {
condition.put("ProjectId_n_eq", model.getProjectId());
}
condition.put("OperTime_s_lteq",model.getMonthTime() + "-31 00:00:00");
return condition;
}

41
src/main/java/com/jsh/action/materials/DepotItemAction.java
View File

@@ -198,18 +198,19 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount());
//存放数据json数组
Integer pid = model.getProjectId();
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject();
Integer prevSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Integer OutSum = sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double prevPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), false);
Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Integer OutSum = sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double prevPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
item.put("Id", depotItem.getId());
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
item.put("MaterialName", depotItem.getMaterialId().getName());
@@ -369,14 +370,15 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
List<DepotItem> dataList = pageUtil.getPageList();
JSONObject outer = new JSONObject();
Integer pid = model.getProjectId();
Double thisAllPrice = 0.0;
if(null != dataList)
{
for(DepotItem depotItem:dataList)
{
Double prevPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), false);
Double prevPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
thisAllPrice = thisAllPrice + (prevPrice + InPrice - OutPrice);
}
}
@@ -412,18 +414,19 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
List<DepotItem> dataList = pageUtil.getPageList();
//存放数据json数组
Integer pid = model.getProjectId();
JSONArray dataArray = new JSONArray();
if(null != dataList)
{
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject();
Integer prevSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Integer OutSum = sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double prevPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库", depotItem.getMaterialId().getId(), model.getMonthTime(), false);
Integer prevSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true);
Integer InSum = sumNumber("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Integer OutSum = sumNumber("出库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double prevPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", pid,depotItem.getMaterialId().getId(), model.getMonthTime(), true);
Double InPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false);
item.put("Id", depotItem.getId());
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
item.put("MaterialName", depotItem.getMaterialId().getName());
@@ -462,14 +465,14 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
* @return
*/
@SuppressWarnings("unchecked")
public Integer sumNumber(String type,Long MId,String MonthTime, Boolean isPrev) {
public Integer sumNumber(String type,Integer ProjectId,Long MId,String MonthTime, Boolean isPrev) {
Integer sumNumber = 0;
String allNumber = "";
PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
try {
depotItemService.findByType(pageUtil, type, MId, MonthTime, isPrev);
depotItemService.findByType(pageUtil, type, ProjectId, MId, MonthTime, isPrev);
allNumber = pageUtil.getPageList().toString();
allNumber = allNumber.substring(1,allNumber.length()-1);
if(allNumber.equals("null")){
@@ -493,14 +496,14 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
* @return
*/
@SuppressWarnings("unchecked")
public Double sumPrice(String type,Long MId,String MonthTime, Boolean isPrev) {
public Double sumPrice(String type,Integer ProjectId,Long MId,String MonthTime, Boolean isPrev) {
Double sumPrice = 0.0;
String allPrice = "";
PageUtil pageUtil = new PageUtil();
pageUtil.setPageSize(0);
pageUtil.setCurPage(0);
try {
depotItemService.findPriceByType(pageUtil, type, MId, MonthTime, isPrev);
depotItemService.findPriceByType(pageUtil, type, ProjectId, MId, MonthTime, isPrev);
allPrice = pageUtil.getPageList().toString();
allPrice = allPrice.substring(1,allPrice.length()-1);
if(allPrice.equals("null")){

34
src/main/java/com/jsh/dao/materials/DepotItemDAO.java
View File

@@ -23,15 +23,26 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
@SuppressWarnings("unchecked")
@Override
public void findByType(PageUtil<DepotItem> pageUtil,String type,Long MId,String MonthTime,Boolean isPrev) throws JshException
public void findByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId,String MonthTime,Boolean isPrev) throws JshException
{
//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便
Query query;
String queryString;
if(isPrev) {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
queryString = "select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'";
if(ProjectId!=null) {
queryString += " and ProjectId='" + ProjectId +"'";
}
queryString += " and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' ";
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
}
else {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
queryString = "select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'";
if(ProjectId!=null) {
queryString += " and ProjectId='" + ProjectId +"'";
}
queryString += " and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " ;
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
}
pageUtil.setTotalCount(query.list().size());
pageUtil.setPageList(query.list());
@@ -39,15 +50,26 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
@SuppressWarnings("unchecked")
@Override
public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Long MId,String MonthTime,Boolean isPrev) throws JshException
public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId,String MonthTime,Boolean isPrev) throws JshException
{
//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便
Query query;
String queryString;
if(isPrev) {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
queryString = "select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'";
if(ProjectId!=null) {
queryString += " and ProjectId='" + ProjectId +"'";
}
queryString += " and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' ";
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
}
else {
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
queryString = "select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"'";
if(ProjectId!=null) {
queryString += " and ProjectId='" + ProjectId +"'";
}
queryString += " and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' ";
query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
}
pageUtil.setTotalCount(query.list().size());
pageUtil.setPageList(query.list());

4
src/main/java/com/jsh/dao/materials/DepotItemIDAO.java
View File

@@ -8,9 +8,9 @@ import com.jsh.util.PageUtil;
public interface DepotItemIDAO extends BaseIDAO<DepotItem>
{
public void findByType(PageUtil<DepotItem> pageUtil,String type,Long MId, String MonthTime,Boolean isPrev) throws JshException;
public void findByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException;
public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Long MId, String MonthTime,Boolean isPrev) throws JshException;
public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException;
public void buyOrSale(PageUtil<DepotItem> pageUtil,String type, String subType,Long MId, String MonthTime, String sumType) throws JshException;
}

12
src/main/java/com/jsh/model/po/Depot.java
View File

@@ -5,6 +5,7 @@ public class Depot implements java.io.Serializable
{
private Long id;
private String name;
private Integer type;
private String sort;
private String remark;
@@ -18,9 +19,10 @@ public class Depot implements java.io.Serializable
this.id = id ;
}
public Depot(String name, String sort, String remark)
public Depot(String name,Integer type, String sort, String remark)
{
this.name = name;
this.type = type;
this.sort = sort;
this.remark = remark;
}
@@ -41,6 +43,14 @@ public class Depot implements java.io.Serializable
this.name = name;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getSort() {
return sort;
}

13
src/main/java/com/jsh/model/vo/basic/DepotModel.java
View File

@@ -18,6 +18,11 @@ public class DepotModel implements Serializable
*/
private String sort = "";
/**
* 类型
*/
private Integer type = 0;
/**
* 描述
*/
@@ -74,6 +79,14 @@ public class DepotModel implements Serializable
this.name = name;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getSort() {
return sort;
}

9
src/main/java/com/jsh/model/vo/materials/DepotItemModel.java
View File

@@ -24,6 +24,7 @@ public class DepotItemModel implements Serializable
private String HeadIds = ""; //表头集合列表
private String MaterialIds = ""; //材料列表
private String MonthTime = ""; //月份
private Integer ProjectId = null;
private String browserType = "";
/**
* 文件名称
@@ -204,6 +205,14 @@ public class DepotItemModel implements Serializable
MonthTime = monthTime;
}
public Integer getProjectId() {
return ProjectId;
}
public void setProjectId(Integer projectId) {
ProjectId = projectId;
}
public String getMaterialIds() {
return MaterialIds;
}

4
src/main/java/com/jsh/service/materials/DepotItemIService.java
View File

@@ -14,9 +14,9 @@ import com.jsh.util.PageUtil;
public interface DepotItemIService extends BaseIService<DepotItem>
{
void findByType(PageUtil<DepotItem> depotItem, String type, Long MId, String MonthTime,Boolean isPrev)throws JshException;
void findByType(PageUtil<DepotItem> depotItem, String type,Integer ProjectId, Long MId, String MonthTime,Boolean isPrev)throws JshException;
void findPriceByType(PageUtil<DepotItem> depotItem, String type, Long MId, String MonthTime,Boolean isPrev)throws JshException;
void findPriceByType(PageUtil<DepotItem> depotItem, String type,Integer ProjectId, Long MId, String MonthTime,Boolean isPrev)throws JshException;
void buyOrSale(PageUtil<DepotItem> depotItem, String type, String subType, Long MId, String MonthTime, String sumType)throws JshException;

8
src/main/java/com/jsh/service/materials/DepotItemService.java
View File

@@ -45,15 +45,15 @@ public class DepotItemService extends BaseService<DepotItem> implements DepotIte
}
@Override
public void findByType(PageUtil<DepotItem> pageUtil, String type,Long MId, String MonthTime,Boolean isPrev) throws JshException
public void findByType(PageUtil<DepotItem> pageUtil, String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException
{
depotItemDao.findByType(pageUtil, type, MId, MonthTime,isPrev);
depotItemDao.findByType(pageUtil, type, ProjectId, MId, MonthTime,isPrev);
}
@Override
public void findPriceByType(PageUtil<DepotItem> pageUtil, String type,Long MId, String MonthTime,Boolean isPrev) throws JshException
public void findPriceByType(PageUtil<DepotItem> pageUtil, String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException
{
depotItemDao.findPriceByType(pageUtil, type, MId, MonthTime,isPrev);
depotItemDao.findPriceByType(pageUtil, type, ProjectId, MId, MonthTime,isPrev);
}
@Override

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

@@ -12,6 +12,11 @@
<comment>仓库名称</comment>
</column>
</property>
<property generated="never" lazy="false" name="type" type="java.lang.Integer">
<column length="10" name="type">
<comment>类型</comment>
</column>
</property>
<property generated="never" lazy="false" name="sort" type="java.lang.String">
<column length="10" name="sort">
<comment>排序</comment>

80
src/main/webapp/js/pages/materials/in_out.js
View File

@@ -36,6 +36,7 @@
initSystemData_account();
initSelectInfo_account();
initSupplier(); //供应商
initGift(); //初始化礼品卡
initTableData();
ininPager();
initForm();
@@ -114,6 +115,20 @@
organUrl = supUrl;
amountNum = "DBCK";
}
else if(listTitle === "礼品充值列表"){
listType = "出库";
listSubType = "礼品充值";
payTypeTitle = "隐藏";
organUrl = supUrl;
amountNum = "LPCZ";
}
else if(listTitle === "礼品销售列表"){
listType = "出库";
listSubType = "礼品销售";
payTypeTitle = "隐藏";
organUrl = supUrl;
amountNum = "LPXS";
}
}
//初始化系统基础信息
function initSystemData_UB(){
@@ -241,6 +256,34 @@
});
}
//初始化-礼品卡
function initGift(){
if(listSubType == "礼品充值"|| listSubType == "礼品销售"){
$('#GiftId').combobox({
url: path + "/depot/findGiftByType.action?type=1",
valueField:'id',
textField:'name'
});
$('#searchGiftId').combobox({
url: path + "/depot/findGiftByType.action?type=1",
valueField:'id',
textField:'name'
});
}
if(listSubType == "礼品销售"){
$.ajax({
type:"post",
url: path + "/supplier/findBySelectRetailNoPeople.action", //散户接口
dataType: "json",
success: function (res){
if(res && res[0]){
orgDefaultId = res[0].id;
}
}
});
}
}
//初始化系统基础信息
function initSystemData_person(){
$.ajax({
@@ -842,7 +885,12 @@
function editDepotHead(depotHeadTotalInfo){
var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
$("#clientIp").val(clientIp);
if(listSubType==="礼品销售"){
$("#GiftId").combobox('setValue',depotHeadInfo[1]);
}
else{
$("#ProjectId").focus().val(depotHeadInfo[1]);
}
var ProjectId=depotHeadInfo[1];
if(ProjectId!='')
{
@@ -860,6 +908,9 @@
var TotalPrice = depotHeadInfo[14];
preTotalPrice = depotHeadInfo[14]; //记录前一次合计金额，用于扣预付款
$("#AllocationProjectId").val(depotHeadInfo[15]);
if(listSubType==="礼品充值"){
$("#GiftId").combobox('setValue', depotHeadInfo[15]);
}
//orgDepotHead = depotHeadInfo[1];
var editTitle = listTitle.replace("列表","信息");
$('#depotHeadDlg').dialog('open').dialog('setTitle','<img src="' + path + '/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑' + editTitle);
@@ -1086,15 +1137,27 @@
return;
}
}
var OrganId = null, AllocationProjectId = null;
var OrganId = null, ProjectId = null,AllocationProjectId = null;
var ChangeAmount = $.trim($("#ChangeAmount").val());
var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text();
if(listSubType !=="调拨"){
OrganId = $('#OrganId').combobox('getValue');
if(listSubType === "礼品销售") {
ProjectId = $('#GiftId').combobox('getValue'); //礼品卡
}
else {
ProjectId = $.trim($("#ProjectId").val());
}
if(listSubType ==="调拨"){
AllocationProjectId = $.trim($("#AllocationProjectId").val()); //收货仓库-对方
}
else if(listSubType ==="礼品充值"){
AllocationProjectId = $('#GiftId').combobox('getValue'); //礼品卡
}
if(listSubType === "礼品销售") {
OrganId = orgDefaultId;
}
else {
OrganId = $('#OrganId').combobox('getValue');
}
if(listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
//付款为负数
ChangeAmount = 0 - ChangeAmount;
@@ -1115,7 +1178,7 @@
data: ({
Type: listType,
SubType: listSubType,
ProjectId: $.trim($("#ProjectId").val()),
ProjectId: ProjectId,
AllocationProjectId: AllocationProjectId,
Number: $.trim($("#Number").val()),
OperTime: $("#OperTime").val(),
@@ -1221,12 +1284,19 @@
function showDepotHeadDetails(pageNo,pageSize){
var ProjectId = null;
if(listSubType === "礼品销售") {
ProjectId = $('#searchGiftId').combobox('getValue'); //礼品卡
}
else {
ProjectId = $.trim($("#searchProjectId").val());
}
$.ajax({
type:"post",
url: path + "/depotHead/findBy.action",
dataType: "json",
data: ({
ProjectId:$.trim($("#searchProjectId").val()),
ProjectId: ProjectId,
DepotIds: depotString,
Type: listType,
SubType:listSubType,

149
src/main/webapp/pages/financial/advance_in.jsp Normal file
View File

@@ -0,0 +1,149 @@
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>收预付款</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/financial/financial_base.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</td>
<td>单据日期：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="收预付款列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;"></input>
</td>
<td>经手人：</td>
<td style="padding:5px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
</tr>
<tr>
<td>付款会员：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="5">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 475px;"/>
</td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<span id="BillTimeShow"></span>
</td>
<td>优惠金额：</td>
<td style="padding:5px;width:120px;">
<span id="ChangeAmountShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px;width:120px;">
<span id="HandsPersonIdShow"></span>
</td>
</tr>
<tr>
<td>付款会员：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="5">
<span id="RemarkShow"></span>
</td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>
</html>

2
src/main/webapp/pages/manage/depot.jsp
View File

@@ -368,6 +368,7 @@
async : false,
data: ({
name : $.trim($("#name").val()),
type : 0,
sort : $.trim($("#sort").val()),
remark : $.trim($("#remark").val()),
clientIp:'<%=clientIp %>'
@@ -484,6 +485,7 @@
dataType: "json",
data: ({
name:$.trim($("#searchName").val()),
type: 0, //仓库
remark:$.trim($("#searchRemark").val()),
pageNo:pageNo,
pageSize:pageSize

529
src/main/webapp/pages/manage/depotGift.jsp Normal file
View File

@@ -0,0 +1,529 @@
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>礼品卡管理</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>礼品卡名称：</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:150px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td id="searchRemarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
<td>
<input type="text" name="searchRemark" id="searchRemark" style="width:150px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
<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>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品卡列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotFM" method="post" novalidate>
<table>
<tr>
<td><label id="nameLabel">礼品卡名称&nbsp;&nbsp;</label></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>
<tr>
<td><label id="sortLabel">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;</label></td>
<td style="padding:5px"><input name="sort" id="sort" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
</tr>
<tr>
<td><label id="remarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label></td>
<td style="padding:5px"><textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea></td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
</div>
<script type="text/javascript">
//初始化界面
$(function()
{
initTableData();
ininPager();
initForm();
browserFit();
});
//浏览器适配
function browserFit()
{
if(getOs()=='MSIE')
{
$("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
$("#nameLabel").empty().append("礼品卡名称&nbsp;&nbsp;");
$("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;");
$("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
}
else
{
$("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
$("#nameLabel").empty().append("礼品卡名称&nbsp;");
$("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;");
$("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
}
}
//防止表单提交重复
function initForm()
{
$('#depotFM').form({
onSubmit: function(){
return false;
}
});
}
//初始化表格数据
function initTableData()
{
$('#tableData').datagrid({
//title:'仓库列表',
//iconCls:'icon-save',
//width:700,
height:heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
animate:false,
//选中单行
singleSelect : true,
collapsible:false,
selectOnCheck:false,
//fitColumns:true,
//单击行是否选中
checkOnSelect : false,
url:'<%=path %>/depot/findBy.action?type=1&pageSize=' + initPageSize,
pagination: true,
//交替出现背景
striped : true,
//loadFilter: pagerFilter,
pageSize: initPageSize,
pageList: initPageNum,
columns:[[
{ field: 'id',width:35,align:"center",checkbox:true},
{ title: '礼品卡名称',field: 'name',width:200},
{ title: '排序',field: 'sort',width:200},
{ title: '描述',field: 'remark',width:200},
{ title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
{
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark;
if(1 == value)
{
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editDepot(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot('+ rec.id +');"/>&nbsp;<a onclick="deleteDepot('+ rec.id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
}
return str;
}
}
]],
toolbar:[
{
id:'addDepot',
text:'增加',
iconCls:'icon-add',
handler:function()
{
addDepot();
}
},
{
id:'deleteDepot',
text:'删除',
iconCls:'icon-remove',
handler:function()
{
batDeleteDepot();
}
}
],
onLoadError:function()
{
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return;
}
});
}
//初始化键盘enter事件
$(document).keydown(function(event)
{
//兼容 IE和firefox 事件
var e = window.event || event;
var k = e.keyCode||e.which||e.charCode;
//兼容 IE,firefox 兼容
var obj = e.srcElement ? e.srcElement : e.target;
//绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
if(k == "13"&&(obj.id=="name"||obj.id=="sort"|| obj.id=="remark" ))
{
$("#saveDepot").click();
}
//搜索按钮添加快捷键
if(k == "13"&&(obj.id=="searchName" || obj.id=="searchRemark" ))
{
$("#searchBtn").click();
}
});
//分页信息处理
function ininPager()
{
try
{
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
pager.pagination({
onSelectPage:function(pageNum, pageSize)
{
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber:pageNum,
pageSize:pageSize
});
showDepotDetails(pageNum,pageSize);
}
});
}
catch (e)
{
$.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error');
}
}
//删除供应商信息
function deleteDepot(depotID)
{
$.messager.confirm('删除确认','确定要删除此仓库信息吗？',function(r)
{
if (r)
{
$.ajax({
type:"post",
url: "<%=path %>/depot/delete.action",
dataType: "json",
data: ({
depotID : depotID,
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
var msg = tipInfo.showModel.msgTip;
if(msg == '成功')
{
//加载完以后重新初始化
$("#searchBtn").click();
}
else
$.messager.alert('删除提示','删除仓库信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除仓库信息异常，请稍后再试！','error');
return;
}
});
}
});
}
//批量删除供应商
function batDeleteDepot()
{
var row = $('#tableData').datagrid('getChecked');
if(row.length == 0)
{
$.messager.alert('删除提示','没有记录被选中！','info');
return;
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条仓库信息吗？',function(r)
{
if (r)
{
var ids = "";
for(var i = 0;i < row.length; i ++)
{
if(i == row.length-1)
{
ids += row[i].id;
break;
}
//alert(row[i].id);
ids += row[i].id + ",";
}
$.ajax({
type:"post",
url: "<%=path %>/depot/batchDelete.action",
dataType: "json",
async : false,
data: ({
depotIDs : ids,
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
var msg = tipInfo.showModel.msgTip;
if(msg == '成功')
{
//加载完以后重新初始化
$("#searchBtn").click();
$(":checkbox").attr("checked",false);
}
else
$.messager.alert('删除提示','删除仓库信息失败，请稍后再试！','error');
},
//此处添加错误处理
error:function()
{
$.messager.alert('删除提示','删除仓库信息异常，请稍后再试！','error');
return;
}
});
}
});
}
}
//增加
var url;
var depotID = 0;
//保存编辑前的名称
var orgDepot = "";
function addDepot()
{
$("#clientIp").val('<%=clientIp %>');
$("#sort").val("");
$("#remark").val("");
$('#depotDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
$(".window-mask").css({ width: webW ,height: webH});
$("#name").val("").focus();
//$('#depotFM').form('clear');
orgDepot = "";
depotID = 0;
url = '<%=path %>/depot/create.action';
}
//保存信息
$("#saveDepot").unbind().bind({
click:function()
{
if(!$('#depotFM').form('validate'))
return;
else if(checkDepotName())
return;
else
{
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
name : $.trim($("#name").val()),
type : 1,
sort : $.trim($("#sort").val()),
remark : $.trim($("#remark").val()),
clientIp:'<%=clientIp %>'
}),
success: function (tipInfo)
{
if(tipInfo)
{
$('#depotDlg').dialog('close');
var opts = $("#tableData").datagrid('options');
showDepotDetails(opts.pageNumber,opts.pageSize);
}
else
{
$.messager.show({
title: '错误提示',
msg: '保存仓库信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存仓库信息异常，请稍后再试！','error');
return;
}
});
}
}
});
//编辑信息
function editDepot(depotTotalInfo)
{
var depotInfo = depotTotalInfo.split("AaBb");
$("#clientIp").val('<%=clientIp %>');
$("#name").focus().val(depotInfo[1]);
$("#sort").val(depotInfo[2]);
$("#remark").val(depotInfo[3]);
orgDepot = depotInfo[1];
$('#depotDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
$(".window-mask").css({ width: webW ,height: webH});
depotID = depotInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(depotInfo[1]);
url = '<%=path %>/depot/update.action?depotID=' + depotInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
function checkDepotName()
{
var name = $.trim($("#name").val());
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if(name.length > 0 &&( orgDepot.length ==0 || name != orgDepot))
{
$.ajax({
type:"post",
url: "<%=path %>/depot/checkIsNameExist.action",
dataType: "json",
async : false,
data: ({
depotID : depotID,
name : name
}),
success: function (tipInfo)
{
flag = tipInfo;
if(tipInfo)
{
$.messager.alert('提示','仓库名称已经存在','info');
//alert("仓库名称已经存在");
//$("#name").val("");
return;
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','检查仓库名称是否存在异常，请稍后再试！','error');
return;
}
});
}
return flag;
}
//搜索处理
$("#searchBtn").unbind().bind({
click:function()
{
showDepotDetails(1,initPageSize);
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
opts.pageNumber = 1;
opts.pageSize = initPageSize;
pager.pagination('refresh',
{
pageNumber:1,
pageSize:initPageSize
});
}
});
function showDepotDetails(pageNo,pageSize)
{
$.ajax({
type:"post",
url: "<%=path %>/depot/findBy.action",
dataType: "json",
data: ({
name:$.trim($("#searchName").val()),
type: 1, // 礼品卡
remark:$.trim($("#searchRemark").val()),
pageNo:pageNo,
pageSize:pageSize
}),
success: function (data)
{
$("#tableData").datagrid('loadData',data);
},
//此处添加错误处理
error:function()
{
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//重置按钮
$("#searchResetBtn").unbind().bind({
click:function(){
$("#searchName").val("");
$("#searchRemark").val("");
//加载完以后重新初始化
$("#searchBtn").click();
}
});
//查看单元（设置）
$('#setBuilding').click(function () {
var currentRow = $("#tableData").datagrid("getChecked");
if (currentRow.length == 0) {
alert("请选择一条数据再操作！");
return false;
}
parent.addTab(currentRow[0].id + "单元", "<%=path %>/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
});
</script>
</body>
</html>

154
src/main/webapp/pages/materials/gift_out_list.jsp Normal file
View File

@@ -0,0 +1,154 @@
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>礼品销售</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>礼品卡：</td>
<td>
<input id="searchGiftId" name="searchGiftId" style="width:110px;" />
</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td>
<td>单据日期：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="礼品销售列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
<tr>
<td>礼品卡：</td>
<td style="padding:5px">
<input id="GiftId" name="GiftId" style="width:120px;" />
</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;"/>
</td>
<td>单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;"></td>
</tr>
<tr>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="3">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width:320px;"/>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>发货仓库：</td>
<td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<span id="NumberShow"></span>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;">
</td>
</tr>
<tr>
<td>经手人：</td>
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="3">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>
</html>

161
src/main/webapp/pages/materials/gift_recharge_list.jsp Normal file
View File

@@ -0,0 +1,161 @@
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>礼品充值</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>发货仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td>
<td>单据日期：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
</tr>
</table>
</div>
<!-- 数据显示table -->
<div id = "tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品充值列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
<tr>
<td>发货仓库：</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select>
</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;"/>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;"></td>
</tr>
<tr>
<td>礼品卡：</td>
<td style="padding:5px">
<input id="GiftId" name="GiftId" 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;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>发货仓库：</td>
<td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;">
</td>
</tr>
<tr>
<td>礼品卡：</td>
<td style="padding:5px;width:120px;">
<span id="AllocationProjectIdShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px">
<span id="NumberShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>
</html>

2
src/main/webapp/pages/materials/purchase_in_list.jsp
View File

@@ -67,7 +67,7 @@
<form id="depotHeadFM" method="post" novalidate>
<table>
<tr>
<td>收货仓库：</td>
<td>礼品卡：</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td>

110
src/main/webapp/pages/reports/in_out_stock_report.jsp
View File

@@ -20,19 +20,25 @@
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
<script>
var kid = ${sessionScope.user.id};
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td>
<td>&nbsp;</td>
<td>月份：</td>
<td>
<input type="text" name="searchMonth" id="searchMonth" onClick="WdatePicker({dateFmt:'yyyy-MM'})" class="txt Wdate" style="width:180px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
<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="exprotBtn">导出</a>
@@ -55,6 +61,12 @@
{
var thisDate = getNowFormatMonth(); //当前月份
$("#searchMonth").val(thisDate);
var userBusinessList=null;
var userdepot=null;
initSystemData_UB();
initSelectInfo_UB();
initSystemData_depot();
initSelectInfo_depot();
initTableData();
ininPager();
search();
@@ -75,6 +87,95 @@
});
}
//初始化系统基础信息
function initSystemData_UB(){
$.ajax({
type:"post",
url: "<%=path %>/userBusiness/getBasicData.action",
data: ({
KeyId:kid,
Type:"UserDepot"
}),
//设置为同步
async:false,
dataType: "json",
success: function (systemInfo)
{
if(systemInfo)
{
userBusinessList = systemInfo.showModel.map.userBusinessList;
var msgTip = systemInfo.showModel.msgTip;
if(msgTip == "exceptoin")
{
$.messager.alert('提示','查找UserBusiness异常,请与管理员联系！','error');
return;
}
}
else
{
userBusinessList=null;
}
}
});
}
//初始化页面选项卡
function initSelectInfo_UB(){
if(userBusinessList !=null)
{
if(userBusinessList.length>0)
{
//用户对应的仓库列表 [1][2][3]...
userdepot =userBusinessList[0].value;
}
}
}
//初始化系统基础信息
function initSystemData_depot(){
$.ajax({
type:"post",
url: "<%=path %>/depot/getBasicData.action",
//设置为同步
async:false,
dataType: "json",
success: function (systemInfo)
{
depotList = systemInfo.showModel.map.depotList;
var msgTip = systemInfo.showModel.msgTip;
if(msgTip == "exceptoin")
{
$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
return;
}
}
});
}
//初始化页面选项卡
function initSelectInfo_depot(){
var options = "";
if(depotList !=null)
{
options = "";
for(var i = 0 ;i < depotList.length;i++)
{
var depot = depotList[i];
if(userdepot!=null)
{
if(userdepot.indexOf("["+depot.id+"]")!=-1)
{
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
}
}
}
$("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
}
}
//初始化表格数据
function initTableData()
{
@@ -203,6 +304,7 @@
url: "<%=path %>/depotHead/findByMonth.action",
dataType: "json",
data: ({
ProjectId: $.trim($("#searchProjectId").val()),
MonthTime:$("#searchMonth").val()
}),
success: function (res)
@@ -219,7 +321,7 @@
var MIds = resNew.mIds;
if(MIds) {
if(pageSize === 3000) {
window.location.href = "<%=path%>/depotItem/exportExcel.action?browserType=" + getOs() + "&pageNo=" + pageNo + "&pageSize=" + pageSize + "&MonthTime=" + $("#searchMonth").val() + "&HeadIds=" + HeadIds + "&MaterialIds=" + MIds;
window.location.href = "<%=path%>/depotItem/exportExcel.action?browserType=" + getOs() + "&pageNo=" + pageNo + "&pageSize=" + pageSize + "&ProjectId="+ $.trim($("#searchProjectId").val()) +"&MonthTime=" + $("#searchMonth").val() + "&HeadIds=" + HeadIds + "&MaterialIds=" + MIds;
}
else {
$.ajax({
@@ -229,6 +331,7 @@
data: ({
pageNo:pageNo,
pageSize:pageSize,
ProjectId: $.trim($("#searchProjectId").val()),
MonthTime:$("#searchMonth").val(),
HeadIds:HeadIds,
MaterialIds:MIds
@@ -252,6 +355,7 @@
url: "<%=path %>/depotItem/totalCountMoney.action",
dataType: "json",
data: ({
ProjectId: $.trim($("#searchProjectId").val()),
MonthTime:$("#searchMonth").val(),
HeadIds:HeadIds,
MaterialIds:MIds