Skip to content
GitLab
"jetbrains:/idea/checkout/git" did not exist on "afdc892a72d547697374dd66acc03858be6f73b0"
Commit b08d349b authored by cjl's avatar cjl
Browse files

添加出库时开启序列号的商品强制附加使用序列号

parent b55e9d15
Show whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/in_out.js
View file @ b08d349b
......@@ -23,7 +23,8 @@
var organUrl = ""; //组织数据接口地址
var amountNum = ""; //单据编号开头字符
var depotString = ""; //店铺id列表
var orgDefaultId = 0; //单位默认编号
/**默认编号有意义吗，不如空着吧*/
var orgDefaultId=''; //单位默认编号
var orgDefaultList; //存储查询出来的会员列表
var accountList; //账户列表
var outItemList; //支出项目列表
......@@ -682,7 +683,7 @@
}
}
thisStock = (thisStock / loadRatio).toFixed(2);
body.find("[field='Stock']").find(input).val(thisStock).attr("data-stock", res.rows[0].thisSum); //加载库存数据
body.find("[field='Stock']").find(input).val(thisStock).attr("data-stock", res.data.page[0].thisSum); //加载库存数据
}
else {
body.find("[field='Stock']").find(input).val(0).attr("data-stock", 0); //加载库存数据
......@@ -757,14 +758,20 @@
anotherDepotTextField = "depotName";
}
if(listSubType == "礼品充值"){
/**
* who added the .action
* */
isShowAnotherDepot = false; //礼品充值时候显示礼品卡
anotherDepotHeadName = "礼品卡";
anotherDepotUrl = "/depot/findGiftByType.action?type=1";
anotherDepotUrl = "/depot/findGiftByType?type=1";
anotherDepotTextField = "name";
}
if(listSubType == "礼品销售"){
/**
* who added the .action
* */
depotHeadName = "礼品卡";
depotUrl = "/depot/findGiftByType.action?type=1";
depotUrl = "/depot/findGiftByType?type=1";
depotTextField = "name";
}
else {
......@@ -1290,8 +1297,12 @@
if (r) {
$.ajax({
type:"post",
url: "/depotHead/" + depotHeadID + "/delete",
// url: "/depotHead/" + depotHeadID + "/delete",
url: "/depotHead/deleteDepotHeadAndDetail",
dataType: "json",
data:{
id: depotHeadID
},
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
......@@ -1382,7 +1393,8 @@
//批量删除
$.ajax({
type:"post",
url: "/depotHead/batchDelete",
// url: "/depotHead/batchDelete",
url: "/depotHead/batchDeleteDepotHeadAndDetail",
dataType: "json",
async : false,
data: ({
......@@ -1560,7 +1572,7 @@
$("#addOrgan").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
});
url = '/depotHead/add';
url = '/depotHead/addDepotHeadAndDetail';
//零售单据修改收款时，自动计算找零
if(listSubType == "零售" || listSubType == "零售退货") {
......@@ -1628,7 +1640,7 @@
}
$("#Number").val(depotHeadInfo[2]).attr("data-defaultNumber",depotHeadInfo[2]);
$("#OperTime").val(depotHeadInfo[4]);
$('#OrganId').combobox('setValue', depotHeadInfo[5]);
$('#OrganId').combobox('setValue', depotHeadInfo[5]=='undefined'?'':depotHeadInfo[5]);
$("#HandsPersonId").val(depotHeadInfo[6]);
$("#AccountId").val(depotHeadInfo[7]);
$("#ChangeAmount").val(depotHeadInfo[8]);
......@@ -1715,7 +1727,7 @@
initTableData_material("edit",TotalPrice); //商品列表
reject(); //撤销下、刷新商品列表
url = '/depotHead/update?id=' + depotHeadInfo[0];
url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0];
}
//查看信息
......@@ -1899,6 +1911,18 @@
return flag;
}
//保存信息
/**
* 2019-01-25
* 我对这个方法的实现结果存在严重怀疑，决定重构
* 有如下疑点：
* 1、保存完主表，返回结果后，再发起请求去操作子表，如何保证事务的一致性（业务数据一致性）
* 2、保存完主表后，再通过selectmax的方式去获取主表主键id完全就是看人品的不可靠的思路
* 修改计划：
* 2019-01-25修改零售出库相关操作
* 修改方式，重写url，将主从表操作合并
*
*
* **/
$("#saveDepotHead").off("click").on("click",function(){
if(!$('#depotHeadFM').form('validate')){
return;
......@@ -1961,6 +1985,7 @@
$.messager.alert('提示', '选择多账户时的找零金额不能大于0！', 'warning');
return;
}
}
else if(listTitle === "销售出库列表"){
if(!$('#OrganId').combobox('getValue')){
......@@ -2052,13 +2077,7 @@
if($("#AccountId").val() === "many"){ //多账户
getAccountID = null;
}
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
info : JSON.stringify({
var infoStr=JSON.stringify({
Type: listType,
SubType: listSubType,
ProjectId: ProjectId,
......@@ -2083,7 +2102,24 @@
OtherMoneyList: $("#OtherMoney").attr("data-itemarr"), //支出项目列表-涉及费用
OtherMoneyItem: $("#OtherMoney").attr("data-itemmoneyarr"), //支出项目金额列表-涉及费用
AccountDay: $("#AccountDay").val() //结算天数
})
});
/**
* 零售出库，单独操作
* */
if(url.indexOf("/depotHead/addDepotHeadAndDetail")>=0){
addDepotHeadAndDetail(url,infoStr);
return;
}else if(url.indexOf("/depotHead/updateDepotHeadAndDetail")>=0){
updateDepotHeadAndDetail(url,infoStr,preTotalPrice);
return;
}
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
info:infoStr
}),
success: function (tipInfo)
{
......@@ -2955,7 +2991,103 @@
}
}
/**
* 新增单据主表及单据子表
* */
function addDepotHeadAndDetail(url,infoStr){
var inserted = $("#materialData").datagrid('getChanges', "inserted");
var deleted = $("#materialData").datagrid('getChanges', "deleted");
var updated = $("#materialData").datagrid('getChanges', "updated");
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
info:infoStr,
inserted: JSON.stringify(inserted),
deleted: JSON.stringify(deleted),
updated: JSON.stringify(updated)
}),
success: function (tipInfo){
if(tipInfo){
if(tipInfo.code!=200){
$.messager.alert('提示', tipInfo.msg, 'error');
return;
}
$.messager.alert('提示','保存成功！','info');
$('#depotHeadDlg').dialog('close');
var opts = $("#tableData").datagrid('options');
showDepotHeadDetails(opts.pageNumber,opts.pageSize);
}else {
$.messager.show({
title: '错误提示',
msg: '保存信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存信息异常，请稍后再试！','error');
return;
}
});
}
/**
* 修改单据主表及单据子表
* */
function updateDepotHeadAndDetail(url,infoStr,preTotalPrice){
var inserted = $("#materialData").datagrid('getChanges', "inserted");
var deleted = $("#materialData").datagrid('getChanges', "deleted");
var updated = $("#materialData").datagrid('getChanges', "updated");
$.ajax({
type:"post",
url: url,
dataType: "json",
async : false,
data: ({
id:url.substring(url.lastIndexOf("?id=")+4,url.length),
info:infoStr,
inserted: JSON.stringify(inserted),
deleted: JSON.stringify(deleted),
updated: JSON.stringify(updated),
preTotalPrice:preTotalPrice
}),
success: function (tipInfo){
if(tipInfo){
if(tipInfo.code!=200){
$.messager.alert('提示', tipInfo.msg, 'error');
return;
}
$.messager.alert('提示','保存成功！','info');
$('#depotHeadDlg').dialog('close');
var opts = $("#tableData").datagrid('options');
showDepotHeadDetails(opts.pageNumber,opts.pageSize);
if (endEditing()) {
$('#materialData').datagrid('acceptChanges');
}
}else {
$.messager.show({
title: '错误提示',
msg: '保存信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存信息异常，请稍后再试！','error');
return;
}
});
}
......
erp_web/pages/manage/serialNumber.html
View file @ b08d349b
......@@ -155,11 +155,11 @@
{title: '商品名称', field: 'materialName', width: 100},
{title: '序列号', field: 'serialNumber', width: 80},
{title: '已卖出', field: 'isSell', width: 150 , formatter: function (value) {
return value ? "是" : "否";
return value=='1' ? "是" : "否";
}
},
{title: '已删除', field: 'deleteFlag', width: 60, formatter: function (value) {
return value ? "是" : "否";
return value=='1' ? "是" : "否";
}
},
{title: '创建时间', field: 'createTime', width: 140,formatter: formatDatebox},
......
erp_web/pages/materials/material.html
View file @ b08d349b
......@@ -684,7 +684,7 @@
},
{
title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
return value ? "启用" : "禁用";
return value=='1' ? "启用" : "禁用";
}
}
]],
......@@ -1363,7 +1363,7 @@
// console.log("enableSerialNumber:"+(materialInfo[24]=='true'?'1':'0'));
// console.log("enableSerialNumber:"+materialInfo[24]);
// $("#enableSerialNumber").combobox('setValue',materialInfo[24]=='true'?'1':'0');
$("#enableSerialNumber").val(materialInfo[24]=='true'?'1':'0');
$("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
// console.log($("#enableSerialNumber").val());
var categoryName = ""; //类型名称
......
sql/jsh_erp.sql
View file @ b08d349b
......@@ -5219,5 +5219,25 @@ alter table jsh_material add enableSerialNumber bit(1) DEFAULT 0 COMMENT '是否
-- ----------------------------
delete from `jsh_functions` where Name='序列号';
INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('010104', '序列号', '0101', '../manage/serialNumber.html', b'0', '0246', b'1', '电脑版', '');
-- ----------------------------
-- 删除单据主表供应商id字段对应外键约束
-- ----------------------------
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_3;
-- ----------------------------
-- 序列号表添加单据主表id字段，用于跟踪序列号流向
-- ----------------------------
alter table jsh_serial_number add depothead_Id bigint(20) DEFAULT null COMMENT '单据主表id，用于跟踪序列号流向';
-- ----------------------------
-- 修改商品表enableSerialNumber字段类型为varchar(1)
-- ----------------------------
alter table jsh_material change enableSerialNumber enableSerialNumber varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是';
-- ----------------------------
-- 修改序列号表is_Sell字段类型为varchar(1)
-- 修改序列号表delete_Flag字段类型为varchar(1)
-- ----------------------------
alter table jsh_serial_number change is_Sell is_Sell varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出';
alter table jsh_serial_number change delete_Flag delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- ----------------------------
-- 删除单据子表单据主表id字段对应外键约束
-- ----------------------------
ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1;
\ No newline at end of file
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ b08d349b
......@@ -21,18 +21,45 @@ public class BusinessConstants {
* 默认的分页页数
*/
public static final String DEFAULT_PAGINATION_PAGE_SIZE = "10";
/**
* 商品是否开启序列号标识enableSerialNumber 0否false，1是true
*
* */
public static final boolean MATERIAL_ENABLE_SERIAL_NUMBER = true;
public static final boolean MATERIAL_NOT_ENABLE_SERIAL_NUMBER = false;
/**
* 单据主表出入库类型 type 入库 出库
* depothead
* */
public static final String DEPOTHEAD_TYPE_STORAGE = "入库";
public static final String DEPOTHEAD_TYPE_OUT = "出库";
/**
* 付款类型 payType //现付/预付款
* */
public static final String PAY_TYPE_PREPAID = "预付款";
public static final String PAY_TYPE_BY_CASH = "现付";
/**
* 删除标记 deleteFlag '0'未删除 '1'已删除
* */
public static final String DELETE_FLAG_DELETED = "1";
public static final String DELETE_FLAG_EXISTS = "0";
/**
* 是否卖出 isSell '0'未卖出 '1'已卖出
* */
public static final String IS_SELL_SELLED = "1";
public static final String IS_SELL_HOLD = "0";
/**
* 商品是否开启序列号标识enableSerialNumber '0'未启用 '1'启用
* */
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
/**
* 出入库分类
*采购、采购退货、其它、零售、销售、调拨、礼品充值
* */
public static final String SUB_TYPE_PURCHASE = "采购";
public static final String SUB_TYPE_PURCHASE_TETURNS = "采购退货";
public static final String SUB_TYPE_OTHER = "其它";
public static final String SUB_TYPE_RETAIL = "零售";
public static final String SUB_TYPE_SALES = "销售";
public static final String SUB_TYPE_TRANSFER = "调拨";
......
src/main/java/com/jsh/erp/constants/ExceptionConstants.java
View file @ b08d349b
......@@ -34,6 +34,9 @@ public class ExceptionConstants {
/**序列号不能为为空*/
public static final int SERIAL_NUMBERE_NOT_BE_EMPTY_CODE = 10500000;
public static final String SERIAL_NUMBERE_NOT_BE_EMPTY_MSG = "序列号不能为为空";
/**商品%s下序列号不充足，请补充后重试*/
public static final int MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE = 10500000;
public static final String MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG = "商品:%s下序列号不充足，请补充后重试";
......
src/main/java/com/jsh/erp/controller/DepotController.java
View file @ b08d349b
......@@ -92,7 +92,7 @@ public class DepotController {
return arr;
}
@GetMapping(value = "/findDepotByUserId")
@RequestMapping(value = "/findDepotByUserId")
public JSONArray findDepotByUserId(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
HttpServletRequest request) {
JSONArray arr = new JSONArray();
......@@ -128,7 +128,7 @@ public class DepotController {
* @param request
* @return
*/
@PostMapping(value = "/findGiftByType")
@RequestMapping(value = "/findGiftByType")
public JSONArray findGiftByType(@RequestParam("type") Integer type,
HttpServletRequest request) {
JSONArray arr = new JSONArray();
......
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @ b08d349b
......@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
......@@ -464,5 +465,75 @@ public class DepotHeadController {
}
return allMoney;
}
/**
* create by: cjl
* description:
* 新增单据主表及单据子表信息
* create time: 2019/1/25 14:36
* @Param: beanJson
 * @Param: inserted
 * @Param: deleted
 * @Param: updated
* @return java.lang.String
*/
@RequestMapping(value = "/addDepotHeadAndDetail")
public Object addDepotHeadAndDetail(@RequestParam("info") String beanJson,@RequestParam("inserted") String inserted,
@RequestParam("deleted") String deleted,
@RequestParam("updated") String updated) throws Exception{
JSONObject result = ExceptionConstants.standardSuccess();
depotHeadService.addDepotHeadAndDetail(beanJson,inserted,deleted,updated);
return result;
}
/**
* create by: cjl
* description:
* 更新单据主表及单据子表信息
* create time: 2019/1/28 14:47
* @Param: id
 * @Param: beanJson
 * @Param: inserted
 * @Param: deleted
 * @Param: updated
 * @Param: preTotalPrice
* @return java.lang.Object
*/
@RequestMapping(value = "/updateDepotHeadAndDetail")
public Object updateDepotHeadAndDetail(@RequestParam("id") Long id,@RequestParam("info") String beanJson,@RequestParam("inserted") String inserted,
@RequestParam("deleted") String deleted,
@RequestParam("updated") String updated,@RequestParam("preTotalPrice") BigDecimal preTotalPrice) throws Exception{
JSONObject result = ExceptionConstants.standardSuccess();
depotHeadService.updateDepotHeadAndDetail(id,beanJson,inserted,deleted,updated,preTotalPrice);
return result;
}
/**
* create by: cjl
* description:
* 删除单据主表及子表信息
* create time: 2019/1/28 17:29
* @Param: id
* @return java.lang.Object
*/
@RequestMapping(value = "/deleteDepotHeadAndDetail")
public Object deleteDepotHeadAndDetail(@RequestParam("id") Long id) throws Exception{
JSONObject result = ExceptionConstants.standardSuccess();
depotHeadService.deleteDepotHeadAndDetail(id);
return result;
}
/**
* create by: cjl
* description:
* 删除单据主表及子表信息
* create time: 2019/1/28 17:29
* @Param: id
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteDepotHeadAndDetail")
public Object batchDeleteDepotHeadAndDetail(@RequestParam("ids") String ids) throws Exception{
JSONObject result = ExceptionConstants.standardSuccess();
depotHeadService.batchDeleteDepotHeadAndDetail(ids);
return result;
}
}
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ b08d349b
......@@ -262,7 +262,7 @@ public class DepotItemController {
@RequestParam("deleted") String deleted,
@RequestParam("updated") String updated,
@RequestParam("headerId") Long headerId,
HttpServletRequest request) {
HttpServletRequest request) throws Exception{
Map<String, Object> objectMap = new HashMap<String, Object>();
try {
depotItemService.saveDetials(inserted,deleted,updated,headerId);
......
src/main/java/com/jsh/erp/controller/SupplierController.java
View file @ b08d349b
......@@ -176,7 +176,12 @@ public class SupplierController {
item.put("AdvanceIn", supplier.getAdvancein());
item.put("BeginNeedGet", supplier.getBeginneedget());
item.put("BeginNeedPay", supplier.getBeginneedpay());
/**
* 2018-01-28这里会有空指针异常
* */
if(supplier.getIsystem()!=null){
item.put("isystem", supplier.getIsystem() == (short) 0 ? "是" : "否");
}
item.put("description", supplier.getDescription());
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
......
src/main/java/com/jsh/erp/datasource/entities/Material.java
View file @ b08d349b
......@@ -190,7 +190,7 @@ public class Material {
* 2019-01-21新增字段enableSerialNumber
*是否开启序列号
* */
private Boolean enableSerialNumber;
private String enableSerialNumber;
/**
* This method was generated by MyBatis Generator.
......@@ -744,11 +744,11 @@ public class Material {
this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
}
public Boolean getEnableSerialNumber() {
public String getEnableSerialNumber() {
return enableSerialNumber;
}
public void setEnableSerialNumber(Boolean enableSerialNumber) {
public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
View file @ b08d349b
......@@ -1704,6 +1704,72 @@ public class MaterialExample {
addCriterion("OtherField3 not between", value1, value2, "otherfield3");
return (Criteria) this;
}
public Criteria andEnableSerialNumberIsNull() {
addCriterion("enableSerialNumber is null");
return (Criteria) this;
}
public Criteria andEnableSerialNumberIsNotNull() {
addCriterion("enableSerialNumber is not null");
return (Criteria) this;
}
public Criteria andEnableSerialNumberEqualTo(String value) {
addCriterion("enableSerialNumber =", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberNotEqualTo(String value) {
addCriterion("enableSerialNumber <>", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberGreaterThan(String value) {
addCriterion("enableSerialNumber >", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberGreaterThanOrEqualTo(String value) {
addCriterion("enableSerialNumber >=", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberLessThan(String value) {
addCriterion("enableSerialNumber <", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberLessThanOrEqualTo(String value) {
addCriterion("enableSerialNumber <=", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberLike(String value) {
addCriterion("enableSerialNumber like", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberNotLike(String value) {
addCriterion("enableSerialNumber not like", value, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberIn(List<String> values) {
addCriterion("enableSerialNumber in", values, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberNotIn(List<String> values) {
addCriterion("enableSerialNumber not in", values, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberBetween(String value1, String value2) {
addCriterion("enableSerialNumber between", value1, value2, "enableSerialNumber");
return (Criteria) this;
}
public Criteria andEnableSerialNumberNotBetween(String value1, String value2) {
addCriterion("enableSerialNumber not between", value1, value2, "enableSerialNumber");
return (Criteria) this;
}
}
/**
......
src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View file @ b08d349b
......@@ -59,7 +59,7 @@ public class MaterialVo4Unit {
* 2019-01-21新增字段enableSerialNumber
*是否开启序列号
* */
private Boolean enableSerialNumber;
private String enableSerialNumber;
public Long getId() {
return id;
......@@ -269,11 +269,11 @@ public class MaterialVo4Unit {
this.materialOther = materialOther;
}
public Boolean getEnableSerialNumber() {
public String getEnableSerialNumber() {
return enableSerialNumber;
}
public void setEnableSerialNumber(Boolean enableSerialNumber) {
public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
View file @ b08d349b
......@@ -33,7 +33,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
private Boolean isSell;
private String isSell;
/**
* This field was generated by MyBatis Generator.
......@@ -49,7 +49,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
private Boolean deleteFlag;
private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
......@@ -82,6 +82,10 @@ public class SerialNumber {
* @mbggenerated
*/
private Long updater;
/**
* 单据主表id，用于跟踪序列号流向
* */
private Long depotheadId;
/**
* This method was generated by MyBatis Generator.
......@@ -163,7 +167,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
public Boolean getIsSell() {
public String getIsSell() {
return isSell;
}
......@@ -175,7 +179,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
public void setIsSell(Boolean isSell) {
public void setIsSell(String isSell) {
this.isSell = isSell;
}
......@@ -211,7 +215,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
public Boolean getDeleteFlag() {
public String getDeleteFlag() {
return deleteFlag;
}
......@@ -223,7 +227,7 @@ public class SerialNumber {
*
* @mbggenerated
*/
public void setDeleteFlag(Boolean deleteFlag) {
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
......@@ -322,4 +326,13 @@ public class SerialNumber {
public void setUpdater(Long updater) {
this.updater = updater;
}
public Long getDepotheadId() {
return depotheadId;
}
public void setDepotheadId(Long depotheadId) {
this.depotheadId = depotheadId;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
View file @ b08d349b
......@@ -395,52 +395,61 @@ public class SerialNumberExample {
return (Criteria) this;
}
public Criteria andIsSellEqualTo(Boolean value) {
public Criteria andIsSellEqualTo(String value) {
addCriterion("is_Sell =", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotEqualTo(Boolean value) {
public Criteria andIsSellNotEqualTo(String value) {
addCriterion("is_Sell <>", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellGreaterThan(Boolean value) {
public Criteria andIsSellGreaterThan(String value) {
addCriterion("is_Sell >", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellGreaterThanOrEqualTo(Boolean value) {
public Criteria andIsSellGreaterThanOrEqualTo(String value) {
addCriterion("is_Sell >=", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellLessThan(Boolean value) {
public Criteria andIsSellLessThan(String value) {
addCriterion("is_Sell <", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellLessThanOrEqualTo(Boolean value) {
public Criteria andIsSellLessThanOrEqualTo(String value) {
addCriterion("is_Sell <=", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellIn(List<Boolean> values) {
public Criteria andIsSellLike(String value) {
addCriterion("isSell like", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotLike(String value) {
addCriterion("isSell not like", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellIn(List<String> values) {
addCriterion("is_Sell in", values, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotIn(List<Boolean> values) {
public Criteria andIsSellNotIn(List<String> values) {
addCriterion("is_Sell not in", values, "isSell");
return (Criteria) this;
}
public Criteria andIsSellBetween(Boolean value1, Boolean value2) {
public Criteria andIsSellBetween(String value1, String value2) {
addCriterion("is_Sell between", value1, value2, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotBetween(Boolean value1, Boolean value2) {
public Criteria andIsSellNotBetween(String value1, String value2) {
addCriterion("is_Sell not between", value1, value2, "isSell");
return (Criteria) this;
}
......@@ -525,52 +534,59 @@ public class SerialNumberExample {
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(Boolean value) {
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(Boolean value) {
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(Boolean value) {
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(Boolean value) {
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(Boolean value) {
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(Boolean value) {
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<Boolean> values) {
public Criteria andDeleteFlagLike(String value) {
addCriterion("deleteFlag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("deleteFlag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<Boolean> values) {
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(Boolean value1, Boolean value2) {
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(Boolean value1, Boolean value2) {
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
return (Criteria) this;
}
......@@ -814,6 +830,68 @@ public class SerialNumberExample {
addCriterion("updater not between", value1, value2, "updater");
return (Criteria) this;
}
public Criteria andDepotheadIdIsNull() {
addCriterion("depotheadId is null");
return (Criteria) this;
}
public Criteria andDepotheadIdIsNotNull() {
addCriterion("depotheadId is not null");
return (Criteria) this;
}
public Criteria andDepotheadIdEqualTo(Long value) {
addCriterion("depotheadId =", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotEqualTo(Long value) {
addCriterion("depotheadId <>", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdGreaterThan(Long value) {
addCriterion("depotheadId >", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
addCriterion("depotheadId >=", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdLessThan(Long value) {
addCriterion("depotheadId <", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
addCriterion("depotheadId <=", value, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdIn(List<Long> values) {
addCriterion("depotheadId in", values, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotIn(List<Long> values) {
addCriterion("depotheadId not in", values, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdBetween(Long value1, Long value2) {
addCriterion("depotheadId between", value1, value2, "depotheadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
addCriterion("depotheadId not between", value1, value2, "depotheadId");
return (Criteria) this;
}
}
/**
......
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View file @ b08d349b
......@@ -101,87 +101,6 @@ public interface DepotHeadMapper {
*/
int updateByPrimaryKey(DepotHead record);
List<DepotHeadVo4List> selectByConditionDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds);
Long getMaxId();
String findMaterialsListByHeaderId(
@Param("id") Long id);
List<DepotHeadVo4InDetail> findByAll(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findInOutMaterialCountTotal(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4StatementAccount> findStatementAccount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStatementAccountCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType);
BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("subType") String subType,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<DepotHeadVo4List> getDetailByNumber(
@Param("number") String number);
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java 0 → 100644
View file @ b08d349b
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
/**
* Description
*
* @Author: cjl
* @Date: 2019/1/25 14:50
*/
public interface DepotHeadMapperEx {
List<DepotHeadVo4List> selectByConditionDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("number") String number,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("dhIds") String dhIds);
Long getMaxId();
String findMaterialsListByHeaderId(
@Param("id") Long id);
List<DepotHeadVo4InDetail> findByAll(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findInOutMaterialCountTotal(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("type") String type,
@Param("pid") Integer pid,
@Param("dids") String dids,
@Param("oId") Integer oId);
List<DepotHeadVo4StatementAccount> findStatementAccount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStatementAccountCount(
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Integer organId,
@Param("supType") String supType);
BigDecimal findAllMoney(
@Param("supplierId") Integer supplierId,
@Param("type") String type,
@Param("subType") String subType,
@Param("modeName") String modeName,
@Param("endTime") String endTime);
List<DepotHeadVo4List> getDetailByNumber(
@Param("number") String number);
/**
* 新增单据主表信息，并反显单据主表id
* */
int adddepotHead(DepotHead depotHead);
/**
* 更新单据主表信息
* */
void updatedepotHead(DepotHead depotHead);
}
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java
View file @ b08d349b
......@@ -96,123 +96,6 @@ public interface DepotItemMapper {
*/
int updateByPrimaryKey(DepotItem record);
List<DepotItem> selectByConditionDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark);
List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
@Param("materialParam") String materialParam,
@Param("depotIds") String depotIds);
List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
@Param("mId") Long mId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList(
@Param("mId") Long mId,
@Param("monthTime") String monthTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStockNumByMaterialIdCounts(
@Param("mId") Long mId,
@Param("monthTime") String monthTime);
int findByTypeAndMaterialIdIn(
@Param("mId") Long mId);
int findByTypeAndMaterialIdOut(
@Param("mId") Long mId);
List<DepotItemVo4WithInfoEx> getDetailList(
@Param("headerId") Long headerId);
List<DepotItemVo4WithInfoEx> findByAll(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds);
BigDecimal findByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal buyOrSaleNumber(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal buyOrSalePrice(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal findGiftByTypeIn(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
BigDecimal findGiftByTypeOut(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java 0 → 100644
View file @ b08d349b
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.*;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
/**
* Description
*
* @Author: cjl
* @Date: 2019/1/24 16:59
*/
public interface DepotItemMapperEx {
List<DepotItem> selectByConditionDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByDepotItem(
@Param("name") String name,
@Param("type") Integer type,
@Param("remark") String remark);
List<DepotItemVo4HeaderId> getHeaderIdByMaterial(
@Param("materialParam") String materialParam,
@Param("depotIds") String depotIds);
List<DepotItemVo4DetailByTypeAndMId> findDetailByTypeAndMaterialIdList(
@Param("mId") Long mId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList(
@Param("mId") Long mId,
@Param("monthTime") String monthTime,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findStockNumByMaterialIdCounts(
@Param("mId") Long mId,
@Param("monthTime") String monthTime);
int findByTypeAndMaterialIdIn(
@Param("mId") Long mId);
int findByTypeAndMaterialIdOut(
@Param("mId") Long mId);
List<DepotItemVo4WithInfoEx> getDetailList(
@Param("headerId") Long headerId);
List<DepotItemVo4WithInfoEx> findByAll(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int findByAllCount(
@Param("headIds") String headIds,
@Param("materialIds") String materialIds);
BigDecimal findByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeInIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal findPriceByTypeOutIsNotPrev(
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime);
BigDecimal buyOrSaleNumber(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal buyOrSalePrice(
@Param("type") String type,
@Param("subType") String subType,
@Param("MId") Long MId,
@Param("MonthTime") String MonthTime,
@Param("sumType") String sumType);
BigDecimal findGiftByTypeIn(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
BigDecimal findGiftByTypeOut(
@Param("subType") String subType,
@Param("ProjectId") Integer ProjectId,
@Param("MId") Long MId);
/**
* create by: cjl
* description:
* 通过单据主表id查询所有单据子表数据
* create time: 2019/1/24 16:56
* @Param: depotheadId
* @return java.util.List<com.jsh.erp.datasource.entities.DepotItem>
*/
List<DepotItem> findDepotItemListBydepotheadId(@Param("depotheadId")Long depotheadId,
@Param("enableSerialNumber")String enableSerialNumber);
/**
* 根据单据主表id删除单据子表数据
* */
int deleteDepotItemByDepotHeadIds(@Param("depotheadIds")Long []depotHeadIds);
}
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