Skip to content
GitLab
Commit a07c71fd authored by 乾坤平台's avatar 乾坤平台 Committed by 季圣华
Browse files

!30 修改新增采购订单、销售订单的功能数据插入方式 

Merge pull request !30 from 乾坤平台/master
parents 01feda93 92b3d21d
Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/in_out.js
View file @ a07c71fd
...@@ -1065,7 +1065,7 @@ ...@@ -1065,7 +1065,7 @@
iconCls:'icon-remove', iconCls:'icon-remove',
handler:function() handler:function()
{ {
removeit(); //删除 batchDel(); //删除
} }
}, },
{ {
...@@ -2839,6 +2839,31 @@ ...@@ -2839,6 +2839,31 @@
} }
} }
//删除 //删除
function batchDel(){
/**
* 重写一下删除的逻辑
* 获取所有选中行,直接从列表中移除
* 点击保存时，将需要后台删除的数据提交到服务器
* **/
var materialData=$('#materialData');
var row = materialData.datagrid('getChecked');
if(row.length == 0)
{
$.messager.alert('删除提示','没有记录被选中！','info');
return;
}
if(row.length > 0)
{
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r)
{
if (r) {
for(var i = 0 ;i < row.length;i++) {
materialData.datagrid('deleteRow',materialData.datagrid("getRowIndex",row[i]));
}
}
});
}
}
function removeit(){ function removeit(){
if (editIndex == undefined) { return } if (editIndex == undefined) { return }
$('#materialData').datagrid('cancelEdit', editIndex) $('#materialData').datagrid('cancelEdit', editIndex)
......
erp_web/login.html
View file @ a07c71fd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<title>ERP系统</title> <title>ERP系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=8" >
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link type="text/css" rel="stylesheet" href="/css/css.css"/> <link type="text/css" rel="stylesheet" href="/css/css.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script> <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
...@@ -122,6 +123,7 @@ ...@@ -122,6 +123,7 @@
} }
//跳转到用户管理界面 //跳转到用户管理界面
else if (loginInfoTip.indexOf("user can login") != -1 || loginInfoTip == "user already login") { else if (loginInfoTip.indexOf("user can login") != -1 || loginInfoTip == "user already login") {
console.log("user can login");
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/user/getUserSession", url: "/user/getUserSession",
...@@ -129,8 +131,10 @@ ...@@ -129,8 +131,10 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
if(res.data.user) { if(res.data.user) {
console.log("user");
var user = res.data.user; var user = res.data.user;
sessionStorage.setItem("userId", user.id); sessionStorage.setItem("userId", user.id);
console.log("http://" + location.host + "/index.html");
top.location.href = "http://" + location.host + "/index.html"; top.location.href = "http://" + location.host + "/index.html";
} }
} }
......
erp_web/pages/manage/depot.html
View file @ a07c71fd
...@@ -76,6 +76,14 @@ ...@@ -76,6 +76,14 @@
data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元 data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元
</td> </td>
</tr> </tr>
<tr>
<td>负责人</td>
<td style="padding:5px">
<input name="principalName" id="principalName"
style="width: 230px;height: 20px" readonly="readonly"/>
<input name="principal" id="principal" type="hidden"/>
</td>
</tr>
<tr> <tr>
<td>排序</td> <td>排序</td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -145,7 +153,7 @@ ...@@ -145,7 +153,7 @@
formatter: function (value, rec) { formatter: function (value, rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb' var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+ rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage; + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+rec.principalName+rec.principal;
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>'; str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
return str; return str;
...@@ -155,6 +163,7 @@ ...@@ -155,6 +163,7 @@
{title: '仓库地址', field: 'address', width: 200}, {title: '仓库地址', field: 'address', width: 200},
{title: '仓储费', field: 'warehousing', width: 60}, {title: '仓储费', field: 'warehousing', width: 60},
{title: '搬运费', field: 'truckage', width: 60}, {title: '搬运费', field: 'truckage', width: 60},
{title: '负责人', field: 'principalName', width: 60},
{title: '排序', field: 'sort', width: 60}, {title: '排序', field: 'sort', width: 60},
{title: '描述', field: 'remark', width: 120} {title: '描述', field: 'remark', width: 120}
]], ]],
...@@ -419,7 +428,7 @@ ...@@ -419,7 +428,7 @@
var remark = $.trim($("#searchRemark").val()); var remark = $.trim($("#searchRemark").val());
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/depot/list", url: "/depot/getDepotList",
dataType: "json", dataType: "json",
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
......
pom.xml
View file @ a07c71fd
...@@ -98,6 +98,11 @@ ...@@ -98,6 +98,11 @@
<version>1.7.25</version> <version>1.7.25</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.10</version>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
......
sql/jsh_erp.sql
View file @ a07c71fd
...@@ -1230,13 +1230,26 @@ delete from jsh_functions where id in (213,214,215,216); ...@@ -1230,13 +1230,26 @@ delete from jsh_functions where id in (213,214,215,216);
-- ---------------------------- -- ----------------------------
-- 新增采购订单、销售订单的功能数据 -- 新增采购订单、销售订单的功能数据
-- 主键自增长，直接指定主键插入数据的方式可能会和本地数据冲突
-- ---------------------------- -- ----------------------------
insert into `jsh_functions` values ('242', '050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', ''); insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', '');
insert into `jsh_functions` values ('243', '060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', ''); insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', '');
-- ---------------------------- -- ----------------------------
-- 改管理员的功能权限 -- 改管理员的功能权限
-- ---------------------------- -- ----------------------------
update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4', update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4',
Value = '[13][12][16][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][242][33][199][243][41][200][201][202][40][232][233][197][203][204][205][206][212]' Value = '[13][12][16][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][242][33][199][243][41][200][201][202][40][232][233][197][203][204][205][206][212]'
where Id = 5; where Id = 5;
\ No newline at end of file
-- ----------------------------
-- 时间：2019年2月25日
-- version：1.0.4
-- 此次更新仓库添加负责人信息，负责人信息从用户表获取
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
-- ----------------------------
-- ----------------------------
-- 仓库表添加字段principal，负责人
-- ----------------------------
alter table jsh_depot add principal bigint(20) DEFAULT null COMMENT '负责人';
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ a07c71fd
...@@ -16,11 +16,15 @@ public class BusinessConstants { ...@@ -16,11 +16,15 @@ public class BusinessConstants {
/** /**
* 默认的分页起始页页码 * 默认的分页起始页页码
*/ */
public static final String DEFAULT_PAGINATION_PAGE_NUMBER = "1"; public static final Integer DEFAULT_PAGINATION_PAGE_NUMBER = 1;
/** /**
* 默认的分页页数 * 无数据时列表返回的默认数据条数
*/ */
public static final String DEFAULT_PAGINATION_PAGE_SIZE = "10"; public static final Long DEFAULT_LIST_NULL_NUMBER = 0L;
/**
* 默认的分页条数
*/
public static final Integer DEFAULT_PAGINATION_PAGE_SIZE = 10;
/** /**
* 单据主表出入库类型 type 入库 出库 * 单据主表出入库类型 type 入库 出库
* depothead * depothead
......
src/main/java/com/jsh/erp/controller/DepotController.java
View file @ a07c71fd
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.Depot; import com.jsh.erp.datasource.entities.Depot;
import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depot.DepotService;
import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
...@@ -14,7 +20,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,7 +20,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.*;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/** /**
* @author ji sheng hua 752*718*920 * @author ji sheng hua 752*718*920
...@@ -121,4 +129,49 @@ public class DepotController { ...@@ -121,4 +129,49 @@ public class DepotController {
} }
return arr; return arr;
} }
/**
* create by: cjl
* description:
* 查询仓库列表信息
* create time: 2019/2/25 14:32
* @Param: pageSize
 * @Param: currentPage
 * @Param: search
* @return java.lang.String
*/
@RequestMapping(value = "/getDepotList")
public String getDepotList(
@RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize,
@RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage,
@RequestParam(value = Constants.SEARCH, required = false) String search) {
Map<String, Object> parameterMap = new HashMap<String, Object>();
//查询参数
JSONObject obj=JSON.parseObject(search);
Set<String> key= obj.keySet();
for(String keyEach: key){
parameterMap.put(keyEach,obj.getString(keyEach));
}
PageQueryInfo queryInfo = new PageQueryInfo();
Map<String, Object> objectMap = new HashMap<String, Object>();
if (pageSize == null || pageSize <= 0) {
pageSize = BusinessConstants.DEFAULT_PAGINATION_PAGE_SIZE;
}
if (currentPage == null || currentPage <= 0) {
currentPage = BusinessConstants.DEFAULT_PAGINATION_PAGE_NUMBER;
}
PageHelper.startPage(currentPage,pageSize,false);
List<DepotEx> list = depotService.getDepotList(parameterMap);
//获取分页查询后的数据
PageInfo<DepotEx> pageInfo = new PageInfo<>(list);
objectMap.put("page", queryInfo);
if (list == null) {
queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
}
queryInfo.setRows(list);
queryInfo.setTotal(pageInfo.getTotal());
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
}
} }
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ a07c71fd
...@@ -2,6 +2,7 @@ package com.jsh.erp.controller; ...@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService; import com.jsh.erp.service.material.MaterialService;
...@@ -113,7 +114,7 @@ public class DepotItemController { ...@@ -113,7 +114,7 @@ public class DepotItemController {
objectMap.put("page", queryInfo); objectMap.put("page", queryInfo);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(dataArray); queryInfo.setRows(dataArray);
...@@ -169,7 +170,7 @@ public class DepotItemController { ...@@ -169,7 +170,7 @@ public class DepotItemController {
objectMap.put("page", dataArray); objectMap.put("page", dataArray);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);
...@@ -223,7 +224,7 @@ public class DepotItemController { ...@@ -223,7 +224,7 @@ public class DepotItemController {
objectMap.put("page", dataArray); objectMap.put("page", dataArray);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);
......
src/main/java/com/jsh/erp/controller/ResourceController.java
View file @ a07c71fd
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.service.CommonQueryManager; import com.jsh.erp.service.CommonQueryManager;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
...@@ -49,7 +50,7 @@ public class ResourceController { ...@@ -49,7 +50,7 @@ public class ResourceController {
objectMap.put("page", queryInfo); objectMap.put("page", queryInfo);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);
......
src/main/java/com/jsh/erp/controller/UserController.java
View file @ a07c71fd
...@@ -36,6 +36,7 @@ public class UserController { ...@@ -36,6 +36,7 @@ public class UserController {
HttpServletRequest request) { HttpServletRequest request) {
logger.info("============用户登录 login 方法调用开始=============="); logger.info("============用户登录 login 方法调用开始==============");
String msgTip = ""; String msgTip = "";
User user=null;
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
String username = loginame.trim(); String username = loginame.trim();
...@@ -81,7 +82,7 @@ public class UserController { ...@@ -81,7 +82,7 @@ public class UserController {
default: default:
try { try {
//验证通过 ，可以登录，放入session，记录登录日志 //验证通过 ，可以登录，放入session，记录登录日志
User user = userService.getUserByUserName(username); user = userService.getUserByUserName(username);
// logService.create(new Logdetails(user, "登录系统", model.getClientIp(), // logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
// new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统")); // new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
msgTip = "user can login"; msgTip = "user can login";
...@@ -93,6 +94,13 @@ public class UserController { ...@@ -93,6 +94,13 @@ public class UserController {
} }
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("msgTip", msgTip); data.put("msgTip", msgTip);
/**
* 在IE模式下，无法获取到user数据，
* 在此处明确添加上user信息
* */
if(user!=null){
data.put("user",user);
}
res.code = 200; res.code = 200;
res.data = data; res.data = data;
logger.info("===============用户登录 login 方法调用结束==============="); logger.info("===============用户登录 login 方法调用结束===============");
......
src/main/java/com/jsh/erp/datasource/entities/Depot.java
View file @ a07c71fd
...@@ -67,6 +67,14 @@ public class Depot { ...@@ -67,6 +67,14 @@ public class Depot {
*/ */
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.principal
*
* @mbggenerated
*/
private Long principal;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id * This method returns the value of the database column jsh_depot.id
...@@ -258,4 +266,28 @@ public class Depot { ...@@ -258,4 +266,28 @@ public class Depot {
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.principal
*
* @return the value of jsh_depot.principal
*
* @mbggenerated
*/
public Long getPrincipal() {
return principal;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.principal
*
* @param principal the value for jsh_depot.principal
*
* @mbggenerated
*/
public void setPrincipal(Long principal) {
this.principal = principal;
}
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/DepotEx.java 0 → 100644
View file @ a07c71fd
package com.jsh.erp.datasource.entities;
/**
* Description
*
* @Author: cjl
* @Date: 2019/2/25 11:40
*/
public class DepotEx extends Depot{
//负责人名字
private String principalName;
public String getPrincipalName() {
return principalName;
}
public void setPrincipalName(String principalName) {
this.principalName = principalName;
}
}
src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View file @ a07c71fd
...@@ -714,6 +714,66 @@ public class DepotExample { ...@@ -714,6 +714,66 @@ public class DepotExample {
addCriterion("remark not between", value1, value2, "remark"); addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPrincipalIsNull() {
addCriterion("principal is null");
return (Criteria) this;
}
public Criteria andPrincipalIsNotNull() {
addCriterion("principal is not null");
return (Criteria) this;
}
public Criteria andPrincipalEqualTo(Long value) {
addCriterion("principal =", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalNotEqualTo(Long value) {
addCriterion("principal <>", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalGreaterThan(Long value) {
addCriterion("principal >", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalGreaterThanOrEqualTo(Long value) {
addCriterion("principal >=", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalLessThan(Long value) {
addCriterion("principal <", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalLessThanOrEqualTo(Long value) {
addCriterion("principal <=", value, "principal");
return (Criteria) this;
}
public Criteria andPrincipalIn(List<Long> values) {
addCriterion("principal in", values, "principal");
return (Criteria) this;
}
public Criteria andPrincipalNotIn(List<Long> values) {
addCriterion("principal not in", values, "principal");
return (Criteria) this;
}
public Criteria andPrincipalBetween(Long value1, Long value2) {
addCriterion("principal between", value1, value2, "principal");
return (Criteria) this;
}
public Criteria andPrincipalNotBetween(Long value1, Long value2) {
addCriterion("principal not between", value1, value2, "principal");
return (Criteria) this;
}
} }
/** /**
......
src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
View file @ a07c71fd
...@@ -18,7 +18,7 @@ public interface AccountHeadMapperEx { ...@@ -18,7 +18,7 @@ public interface AccountHeadMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccountHead( Long countsByAccountHead(
@Param("type") String type, @Param("type") String type,
@Param("billNo") String billNo, @Param("billNo") String billNo,
@Param("beginTime") String beginTime, @Param("beginTime") String beginTime,
......
src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java
View file @ a07c71fd
...@@ -16,7 +16,7 @@ public interface AccountItemMapperEx { ...@@ -16,7 +16,7 @@ public interface AccountItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccountItem( Long countsByAccountItem(
@Param("name") String name, @Param("name") String name,
@Param("type") Integer type, @Param("type") Integer type,
@Param("remark") String remark); @Param("remark") String remark);
......
src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java
View file @ a07c71fd
...@@ -17,7 +17,7 @@ public interface AccountMapperEx { ...@@ -17,7 +17,7 @@ public interface AccountMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccount( Long countsByAccount(
@Param("name") String name, @Param("name") String name,
@Param("serialNo") String serialNo, @Param("serialNo") String serialNo,
@Param("remark") String remark); @Param("remark") String remark);
......
src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java
View file @ a07c71fd
...@@ -14,7 +14,7 @@ public interface AppMapperEx { ...@@ -14,7 +14,7 @@ public interface AppMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByApp( Long countsByApp(
@Param("name") String name, @Param("name") String name,
@Param("type") String type); @Param("type") String type);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View file @ a07c71fd
...@@ -27,7 +27,7 @@ public interface DepotHeadMapperEx { ...@@ -27,7 +27,7 @@ public interface DepotHeadMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByDepotHead( Long countsByDepotHead(
@Param("type") String type, @Param("type") String type,
@Param("subType") String subType, @Param("subType") String subType,
@Param("number") String number, @Param("number") String number,
......
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View file @ a07c71fd
...@@ -20,7 +20,7 @@ public interface DepotItemMapperEx { ...@@ -20,7 +20,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByDepotItem( Long countsByDepotItem(
@Param("name") String name, @Param("name") String name,
@Param("type") Integer type, @Param("type") Integer type,
@Param("remark") String remark); @Param("remark") String remark);
...@@ -34,7 +34,7 @@ public interface DepotItemMapperEx { ...@@ -34,7 +34,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts( Long findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId); @Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList( List<DepotItemVo4Material> findStockNumByMaterialIdList(
...@@ -43,7 +43,7 @@ public interface DepotItemMapperEx { ...@@ -43,7 +43,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int findStockNumByMaterialIdCounts( Long findStockNumByMaterialIdCounts(
@Param("mId") Long mId, @Param("mId") Long mId,
@Param("monthTime") String monthTime); @Param("monthTime") String monthTime);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment