Skip to content
GitLab
"vscode:/vscode.git/clone" did not exist on "c432d018315f06154fe3790a6aa5f3abbc4abedf"
Commit 458c9088 authored by 乾坤平台's avatar 乾坤平台 Committed by 季圣华
Browse files

!27 修改商品类别展示方式为树形结构 

Merge pull request !27 from 乾坤平台/master
parents 9fff3f2a ccfdd236
Expand all Show whitespace changes
Inline Side-by-side
erp_web/pages/materials/material.html
View file @ 458c9088
...@@ -32,13 +32,6 @@ ...@@ -32,13 +32,6 @@
<input name="searchModel" id="searchModel" style="width:80px;"/> <input name="searchModel" id="searchModel" style="width:80px;"/>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>类别：</td>
<td>
<select name="searchCategoryId_f" id="searchCategoryId_f" style="width:100px;"></select>
<select name="searchCategoryId_s" id="searchCategoryId_s" style="width:100px;"></select>
<select name="searchCategoryId_t" id="searchCategoryId_t" style="width:100px;"></select>
</td>
<td>&nbsp;</td>
<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-search" id="searchBtn">查询</a>&nbsp;&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a> <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
...@@ -82,18 +75,17 @@ ...@@ -82,18 +75,17 @@
<tr> <tr>
<td style="height:30px;">类别</td> <td style="height:30px;">类别</td>
<td style="padding:5px" colspan="3"> <td style="padding:5px" colspan="3">
<select name="CategoryId_f" id="CategoryId_f" style="width:152px;height: 20px"></select> <input name="parentName" id="parentName" style="width: 180px;height: 20px" readonly="readonly"/>
<select name="CategoryId_s" id="CategoryId_s" style="width:152px;height: 20px"></select> <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
<select name="CategoryId_t" id="CategoryId_t" style="width:152px;height: 20px"></select> <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
<label id="mTypeName"></label> <input name="parentid" id="parentid" type="hidden"/>
<a href="#" id="mTypeChange">修改</a>
</td> </td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td style="width:80px;">序列号</td> <td style="width:80px;">序列号</td>
<td style="padding:5px;width:180px;"> <td style="padding:5px;width:180px;">
<select name="enableSerialNumber" id="enableSerialNumber" style="width:152px;height: 20px"> <select name="enableSerialNumber" id="enableSerialNumber" style="width: 180px;height: 20px">
<option value="1">启用</option> <option value="1">启用</option>
<option value="0">禁用</option> <option value="0">禁用</option>
</select> </select>
...@@ -276,11 +268,10 @@ ...@@ -276,11 +268,10 @@
</div> </div>
</form> </form>
</div> </div>
<script type="text/javascript"> <div id="forSelectMaterialCategoryDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<script type="text/javascript">
var materialCategoryList = null; var materialCategoryList = null;
var materialID = null;
var parentid_search = null;
var lei = null;
var types = ""; var types = "";
var setCategoryId = "1"; var setCategoryId = "1";
var cid = 1; var cid = 1;
...@@ -365,113 +356,9 @@ ...@@ -365,113 +356,9 @@
types += materialCategory.id + ','; types += materialCategory.id + ',';
} }
} }
if (lei == "search_first") {
$("#searchCategoryId_f").empty().append('<option value="">全部</option>').append(options);
}
else if (lei == "search_second") {
$("#searchCategoryId_s").empty().append('<option value="">全部</option>').append(options);
}
else if (lei == "search_three") {
$("#searchCategoryId_t").empty().append('<option value="">全部</option>').append(options);
}
else if (lei == "edit_first") {
$("#CategoryId_f").empty().append('<option value="">全部</option>').append(options);
}
else if (lei == "edit_second") {
$("#CategoryId_s").empty().append('<option value="">全部</option>').append(options);
}
else if (lei == "edit_three") {
$("#CategoryId_t").empty().append('<option value="">全部</option>').append(options);
}
} }
} }
//一级目录-查询方法
var searchFirst = function () {
var parentid_search = $("#searchCategoryId_f").val();
if (parentid_search != '') {
types += parentid_search + ',';
initSystemData(parentid_search);
initSelectInfo("search_second");
var arr = types.split(',');
for (var i = 0; i < arr.length; i++) {
if (arr[i] != '' && arr[i] != parentid_search) {
initSystemData(arr[i]);
initSelectInfo("type_second");
}
}
types = types.substring(0, types.length - 1);
setCategoryId = types;
types = "";
}
else {
setCategoryId = "1";
$("#searchCategoryId_s").empty().append('<option value="">全部</option>');
$("#searchCategoryId_t").empty().append('<option value="">全部</option>');
}
}
//一级目录-查询事件
$("#searchCategoryId_f").change(
function () {
searchFirst();
}
);
//二级目录-查询方法
var searchSecond = function () {
var parentid_search = $("#searchCategoryId_s").val();
if (parentid_search != '') {
initSystemData(parentid_search);
initSelectInfo("search_three");
types = types.substring(0, types.length - 1);
setCategoryId = types;
types = "";
}
else {
searchFirst();
$("#searchCategoryId_t").empty().append('<option value="">全部</option>');
}
}
//二级目录-查询事件
$("#searchCategoryId_s").change(
function () {
searchSecond();
}
);
//三级目录-查询事件
$("#searchCategoryId_t").change(
function () {
var parentid_search = $("#searchCategoryId_t").val();
if (parentid_search != '') {
types = parentid_search;
setCategoryId = types;
types = "";
}
else {
searchSecond();
}
}
);
//一级目录-编辑
$("#CategoryId_f").change(
function () {
var CategoryId_f = $("#CategoryId_f").val();
if (CategoryId_f != '') {
initSystemData(CategoryId_f);
initSelectInfo("edit_second");
}
}
);
//二级目录-编辑
$("#CategoryId_s").change(
function () {
var CategoryId_s = $("#CategoryId_s").val();
if (CategoryId_s != '') {
initSystemData(CategoryId_s);
initSelectInfo("edit_three");
}
}
);
//防止表单提交重复 //防止表单提交重复
function initForm() { function initForm() {
...@@ -629,6 +516,7 @@ ...@@ -629,6 +516,7 @@
}, },
{title: '品名', field: 'name', width: 100}, {title: '品名', field: 'name', width: 100},
{title: '型号', field: 'model', width: 80}, {title: '型号', field: 'model', width: 80},
{title: '类别', field: 'categoryName', width: 80},
{title: '扩展信息', field: 'materialOther', width: 150}, {title: '扩展信息', field: 'materialOther', width: 150},
{title: '单位', field: 'unit', width: 60}, {title: '单位', field: 'unit', width: 60},
{title: '安全存量', field: 'safetystock', width: 70}, {title: '安全存量', field: 'safetystock', width: 70},
...@@ -1065,7 +953,6 @@ ...@@ -1065,7 +953,6 @@
window.location.href = "/material/exportExcel?browserType=" + getOs() window.location.href = "/material/exportExcel?browserType=" + getOs()
+ "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId; + "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId;
} }
//增加 //增加
var url; var url;
var materialID = 0; var materialID = 0;
...@@ -1162,18 +1049,9 @@ ...@@ -1162,18 +1049,9 @@
bindMProperty(); //根据商品属性绑定 bindMProperty(); //根据商品属性绑定
// $("#enableSerialNumber").combobox('setValue','0'); // $("#enableSerialNumber").combobox('setValue','0');
$("#enableSerialNumber").val('0'); $("#enableSerialNumber").val('0');
$('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息'); $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
$("#Name").val("").focus(); $("#Name").val("").focus();
$("#CategoryId_f").show();
$("#CategoryId_s").show();
$("#CategoryId_t").show(); //全部显示
$("#mTypeName").hide();
$("#mTypeChange").hide(); //按钮隐藏
$("#CategoryId_s").empty();
$("#CategoryId_t").empty(); //清空类型下拉
$("#manyUnitCheck").prop("checked", false); $("#manyUnitCheck").prop("checked", false);
//当前为不选中状态 //当前为不选中状态
$("#Unit").show(); $("#Unit").show();
...@@ -1269,16 +1147,6 @@ ...@@ -1269,16 +1147,6 @@
if (checkIsExist()) { if (checkIsExist()) {
return; return;
} }
var parent = 1;
if ($("#CategoryId_f").val() != "" && $("#CategoryId_f").val() != null) {
parent = $("#CategoryId_f").val();
}
if ($("#CategoryId_s").val() != "" && $("#CategoryId_s").val() != null) {
parent = $("#CategoryId_s").val();
}
if ($("#CategoryId_t").val() != "" && $("#CategoryId_t").val() != null) {
parent = $("#CategoryId_t").val();
}
//构造价格列表json //构造价格列表json
var priceStrategy = []; var priceStrategy = [];
var basicList = {}; var basicList = {};
...@@ -1304,7 +1172,7 @@ ...@@ -1304,7 +1172,7 @@
var objInfo = $("#materialFM").serializeObject(); var objInfo = $("#materialFM").serializeObject();
objInfo.UnitId = $("#manyUnit").val(); objInfo.UnitId = $("#manyUnit").val();
objInfo.CategoryId = parent; objInfo.CategoryId =$("#parentid").val();
objInfo.PriceStrategy = JSON.stringify(priceStrategy); //价格列表 objInfo.PriceStrategy = JSON.stringify(priceStrategy); //价格列表
$.ajax({ $.ajax({
type: "post", type: "post",
...@@ -1331,7 +1199,6 @@ ...@@ -1331,7 +1199,6 @@
}); });
var mId = 0, mName = ""; var mId = 0, mName = "";
//根据id查询类型信息 //根据id查询类型信息
function findByTypeId(Id) { function findByTypeId(Id) {
$.ajax({ $.ajax({
...@@ -1355,55 +1222,16 @@ ...@@ -1355,55 +1222,16 @@
//编辑信息 //编辑信息
function editMaterial(materialTotalInfo) { function editMaterial(materialTotalInfo) {
var materialInfo = materialTotalInfo.split("AaBb"); var materialInfo = materialTotalInfo.split("AaBb");
bindMProperty(); //根据商品属性绑定 bindMProperty(); //根据商品属性绑定
$("#Name").focus().val(materialInfo[1]); $("#Name").focus().val(materialInfo[1]);
$("#Color").focus().val(materialInfo[11]); $("#Color").focus().val(materialInfo[11]);
// 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]=='1'?'1':'0'); $("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
// console.log($("#enableSerialNumber").val()); //商品类别id
$("#parentid").val(materialInfo[14]);
var categoryName = ""; //类型名称 //商品类别名称
$("#parentName").val(materialInfo[15]);
mId = materialInfo[14]; mId = materialInfo[14];
mName = materialInfo[15]; mName = materialInfo[15];
//拼接类型名称-多级拼接
if (mId != 1) {
findByTypeId(mId);
if (mId != 1) {
categoryName = mName + ">" + categoryName;
findByTypeId(mId);
if (mId != 1) {
categoryName = mName + ">" + categoryName;
findByTypeId(mId);
if (mId != 1) {
categoryName = mName + ">" + categoryName;
findByTypeId(mId);
}
else {
categoryName = mName + ">" + categoryName;
}
}
else {
categoryName = mName + ">" + categoryName;
}
}
else {
categoryName = mName + ">" + categoryName;
}
}
else {
categoryName = mName + categoryName;
}
$("#CategoryId_s").empty();
$("#CategoryId_t").empty(); //清空类型下拉
$("#CategoryId_f").hide();
$("#CategoryId_s").hide();
$("#CategoryId_t").hide(); //全部隐藏
$("#mTypeName").text(categoryName).show(); //类型显示
$("#mTypeChange").show(); //按钮显示
$("#Packing").focus().val(materialInfo[12]); $("#Packing").focus().val(materialInfo[12]);
$("#SafetyStock").focus().val(materialInfo[13]=="undefined" ? "" : materialInfo[13]); $("#SafetyStock").focus().val(materialInfo[13]=="undefined" ? "" : materialInfo[13]);
$("#Model").val(materialInfo[2]); $("#Model").val(materialInfo[2]);
...@@ -1506,13 +1334,6 @@ ...@@ -1506,13 +1334,6 @@
url = '/material/update?id=' + materialInfo[0]; url = '/material/update?id=' + materialInfo[0];
} }
$("#mTypeChange").off("click").on("click", function () {
$(this).hide();
$("#mTypeName").hide();
$("#CategoryId_f").show();
$("#CategoryId_s").show();
$("#CategoryId_t").show(); //全部显示
});
//搜索处理 //搜索处理
$("#searchBtn").unbind().bind({ $("#searchBtn").unbind().bind({
...@@ -1573,11 +1394,6 @@ ...@@ -1573,11 +1394,6 @@
$("#searchResetBtn").unbind().bind({ $("#searchResetBtn").unbind().bind({
click: function () { click: function () {
$("#searchName").val(""); $("#searchName").val("");
$("#searchCategoryId_f").val("");
$("#searchCategoryId_s").val("");
$("#searchCategoryId_t").val("");
$("#searchCategoryId_s").empty();
$("#searchCategoryId_t").empty(); //清空类型下拉
setCategoryId = "1"; setCategoryId = "1";
//加载完以后重新初始化 //加载完以后重新初始化
$("#searchBtn").click(); $("#searchBtn").click();
...@@ -1654,7 +1470,21 @@ ...@@ -1654,7 +1470,21 @@
}, 3300); }, 3300);
}); });
} }
//查询父级商品类别
$("#lookForSelectMaterialCategory").on("click", function () {
$('#forSelectMaterialCategoryDlg').dialog({
title: '商品类别选择',
width: webW/2,
height: webH/2,
closed: false,
cache: false,
href: '/pages/materials/materialcategory_forselect.html',
modal: true,
resizable:true
});
});
</script> </script>
</div>
</body> </body>
</html> </html>
erp_web/pages/materials/materialcategory_forselect.html 0 → 100644
View file @ 458c9088
<!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="/images/favicon.ico" type="image/x-icon"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/>
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 数据显示table -->
<div>
<ul id="ttForSelect"></ul>
</div>
<script type="text/javascript">
$(function () {
$('#ttForSelect').tree({
url: '/materialCategory/getMaterialCategoryTree',
animate: true,
onDblClick: function (node) {
//双击修改
forSelectMaterialCategory(node);
}
});
function forSelectMaterialCategory(node) {
console.log(node);
$("#parentName").val(node.text);
$("#parentid").val(node.id);
$('#forSelectMaterialCategoryDlg').dialog('close');
}
});
</script>
</body>
</html>
\ No newline at end of file
sql/jsh_erp.sql
View file @ 458c9088
...@@ -5291,3 +5291,51 @@ end; ...@@ -5291,3 +5291,51 @@ end;
// //
DELIMITER ; DELIMITER ;
   
-- ----------------------------
-- 时间：2019年2月18日
-- version：1.0.3
-- 此次更新修改产品类型表jsh_materialcategory，添加一些字段
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
-- ----------------------------
-- ----------------------------
-- 产品类型表添加字段sort，显示顺序
-- ----------------------------
alter table jsh_materialcategory add sort varchar(10) DEFAULT null COMMENT '显示顺序';
-- ----------------------------
-- 产品类型表添加字段status，状态，0系统默认，1启用，2删除
-- ----------------------------
alter table jsh_materialcategory add status varchar(1) DEFAULT '0' COMMENT '状态，0系统默认，1启用，2删除';
-- ----------------------------
-- 产品类型表添加字段serial_no，编号
-- ----------------------------
alter table jsh_materialcategory add serial_no varchar(100) DEFAULT null COMMENT '编号';
-- ----------------------------
-- 产品类型表添加字段remark，备注
-- ----------------------------
alter table jsh_materialcategory add remark varchar(1024) DEFAULT null COMMENT '备注';
-- ----------------------------
-- 产品类型表添加字段create_time，创建时间
-- ----------------------------
alter table jsh_materialcategory add create_time datetime DEFAULT null COMMENT '创建时间';
-- ----------------------------
-- 产品类型表添加字段creator，创建人
-- ----------------------------
alter table jsh_materialcategory add creator bigint(20) DEFAULT null COMMENT '创建人';
-- ----------------------------
-- 产品类型表添加字段update_time，更新时间
-- ----------------------------
alter table jsh_materialcategory add update_time datetime DEFAULT null COMMENT '更新时间';
-- ----------------------------
-- 产品类型表添加字段updater，更新人
-- ----------------------------
alter table jsh_materialcategory add updater bigint(20) DEFAULT null COMMENT '更新人';
-- ----------------------------
-- 去掉jsh_materialcategory外键
-- ----------------------------
ALTER TABLE jsh_materialcategory DROP FOREIGN KEY FK3EE7F725237A77D8;
-- ----------------------------
-- 修改根目录父节点id为-1
-- ----------------------------
update jsh_materialcategory set ParentId='-1' where id='1'
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ 458c9088
...@@ -70,6 +70,19 @@ public class BusinessConstants { ...@@ -70,6 +70,19 @@ public class BusinessConstants {
public static final String SEQ_TO_STRING_LESS_INSERT = "0"; public static final String SEQ_TO_STRING_LESS_INSERT = "0";
//单据编号 //单据编号
public static final String DEPOT_NUMBER_SEQ = "depot_number_seq"; public static final String DEPOT_NUMBER_SEQ = "depot_number_seq";
/**
* 商品类别根目录id
* */
public static final Long MATERIAL_CATEGORY_ROOT_ID = 1L;
/**
* 商品类别状态
* 0系统默认，1启用，2删除
* */
public static final String MATERIAL_CATEGORY_STATUS_DEFAULT = "0";
public static final String MATERIAL_CATEGORY_STATUS_ENABLE = "1";
public static final String MATERIAL_CATEGORY_STATUS_DELETE = "2";
......
src/main/java/com/jsh/erp/constants/ExceptionConstants.java
View file @ 458c9088
...@@ -59,6 +59,22 @@ public class ExceptionConstants { ...@@ -59,6 +59,22 @@ public class ExceptionConstants {
//商品库存不足 //商品库存不足
public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004; public static final int MATERIAL_STOCK_NOT_ENOUGH_CODE = 8000004;
public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足"; public static final String MATERIAL_STOCK_NOT_ENOUGH_MSG = "商品:%s库存不足";
/**
* 商品类别信息
* type = 75
* */
//添加商品类别信息失败
public static final int MATERIAL_CATEGORY_ADD_FAILED_CODE = 7500000;
public static final String MATERIAL_CATEGORY_ADD_FAILED_MSG = "添加商品类别信息失败";
//删除商品类别信息失败
public static final int MATERIAL_CATEGORY_DELETE_FAILED_CODE = 7500001;
public static final String MATERIAL_CATEGORY_DELETE_FAILED_MSG = "删除商品类别信息失败";
//修改商品类别信息失败
public static final int MATERIAL_CATEGORY_EDIT_FAILED_CODE = 7500002;
public static final String MATERIAL_CATEGORY_EDIT_FAILED_MSG = "添加商品类别信息失败";
//商品类别编号已存在
public static final int MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE = 7500003;
public static final String MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG = "商品类别编号已存在";
/** /**
* 标准正常返回/操作成功返回 * 标准正常返回/操作成功返回
......
src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
View file @ 458c9088
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.google.gson.JsonObject;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.MaterialCategory; import com.jsh.erp.datasource.entities.MaterialCategory;
import com.jsh.erp.datasource.entities.SerialNumberEx;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.materialCategory.MaterialCategoryService; import com.jsh.erp.service.materialCategory.MaterialCategoryService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -45,7 +54,7 @@ public class MaterialCategoryController { ...@@ -45,7 +54,7 @@ public class MaterialCategoryController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/findById") @RequestMapping(value = "/findById")
public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) { public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
...@@ -53,8 +62,16 @@ public class MaterialCategoryController { ...@@ -53,8 +62,16 @@ public class MaterialCategoryController {
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
if (null != dataList) { if (null != dataList) {
for (MaterialCategory mc : dataList) { for (MaterialCategory mc : dataList) {
outer.put("id", mc.getId());
outer.put("name", mc.getName()); outer.put("name", mc.getName());
outer.put("parentId", mc.getParentid()); outer.put("parentId", mc.getParentid());
List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentid());
if(dataParentList!=null&&dataParentList.size()>0){
outer.put("parentName", dataParentList.get(0).getName());
}
outer.put("sort", mc.getSort());
outer.put("serialNo", mc.getSerialNo());
outer.put("remark", mc.getRemark());
} }
} }
res.code = 200; res.code = 200;
...@@ -66,4 +83,81 @@ public class MaterialCategoryController { ...@@ -66,4 +83,81 @@ public class MaterialCategoryController {
} }
return res; return res;
} }
/**
* create by: cjl
* description:
* 获取商品类别树数据
* create time: 2019/2/19 11:49
* @Param:
* @return com.alibaba.fastjson.JSONArray
*/
@RequestMapping(value = "/getMaterialCategoryTree")
public JSONArray getMaterialCategoryTree() throws Exception{
JSONArray arr=new JSONArray();
List<TreeNode> materialCategoryTree = materialCategoryService.getMaterialCategoryTree();
if(materialCategoryTree!=null&&materialCategoryTree.size()>0){
for(TreeNode node:materialCategoryTree){
String str=JSON.toJSONString(node);
JSONObject obj=JSON.parseObject(str);
arr.add(obj) ;
}
}
return arr;
}
/**
* create by: cjl
* description:
* 新增商品类别数据
* create time: 2019/2/19 17:17
* @Param: beanJson
* @return java.lang.Object
*/
@RequestMapping(value = "/addMaterialCategory")
public Object addMaterialCategory(@RequestParam("info") String beanJson) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class);
int i= materialCategoryService.addMaterialCategory(mc);
if(i<1){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE,
ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG);
}
return result;
}
/**
* create by: cjl
* description:
* 修改商品类别数据
* create time: 2019/2/20 9:30
* @Param: beanJson
* @return java.lang.Object
*/
@RequestMapping(value = "/editMaterialCategory")
public Object editMaterialCategory(@RequestParam("info") String beanJson) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class);
int i= materialCategoryService.editMaterialCategory(mc);
if(i<1){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE,
ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG);
}
return result;
}
/**
* create by: cjl
* description:
* 批量删除商品类别信息
* create time: 2019/2/19 17:26
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteMaterialCategory")
public Object batchDeleteMaterialCategory(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= materialCategoryService.batchDeleteMaterialCategoryByIds(ids);
if(i<1){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_DELETE_FAILED_CODE,
ExceptionConstants.MATERIAL_CATEGORY_DELETE_FAILED_MSG);
}
return result;
}
} }
src/main/java/com/jsh/erp/datasource/entities/MaterialCategory.java
View file @ 458c9088
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.util.Date;
public class MaterialCategory { public class MaterialCategory {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
...@@ -33,6 +35,70 @@ public class MaterialCategory { ...@@ -33,6 +35,70 @@ public class MaterialCategory {
*/ */
private Long parentid; private Long parentid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.status
*
* @mbggenerated
*/
private String status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.serial_no
*
* @mbggenerated
*/
private String serialNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.create_time
*
* @mbggenerated
*/
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.creator
*
* @mbggenerated
*/
private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.update_time
*
* @mbggenerated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.updater
*
* @mbggenerated
*/
private Long updater;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Id * This method returns the value of the database column jsh_materialcategory.Id
...@@ -128,4 +194,196 @@ public class MaterialCategory { ...@@ -128,4 +194,196 @@ public class MaterialCategory {
public void setParentid(Long parentid) { public void setParentid(Long parentid) {
this.parentid = parentid; this.parentid = parentid;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.sort
*
* @return the value of jsh_materialcategory.sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.sort
*
* @param sort the value for jsh_materialcategory.sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.status
*
* @return the value of jsh_materialcategory.status
*
* @mbggenerated
*/
public String getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.status
*
* @param status the value for jsh_materialcategory.status
*
* @mbggenerated
*/
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.serial_no
*
* @return the value of jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public String getSerialNo() {
return serialNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.serial_no
*
* @param serialNo the value for jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public void setSerialNo(String serialNo) {
this.serialNo = serialNo == null ? null : serialNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.remark
*
* @return the value of jsh_materialcategory.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.remark
*
* @param remark the value for jsh_materialcategory.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.create_time
*
* @return the value of jsh_materialcategory.create_time
*
* @mbggenerated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.create_time
*
* @param createTime the value for jsh_materialcategory.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.creator
*
* @return the value of jsh_materialcategory.creator
*
* @mbggenerated
*/
public Long getCreator() {
return creator;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.creator
*
* @param creator the value for jsh_materialcategory.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) {
this.creator = creator;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.update_time
*
* @return the value of jsh_materialcategory.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.update_time
*
* @param updateTime the value for jsh_materialcategory.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.updater
*
* @return the value of jsh_materialcategory.updater
*
* @mbggenerated
*/
public Long getUpdater() {
return updater;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.updater
*
* @param updater the value for jsh_materialcategory.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) {
this.updater = updater;
}
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/MaterialCategoryExample.java
View file @ 458c9088
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
public class MaterialCategoryExample { public class MaterialCategoryExample {
...@@ -443,6 +444,526 @@ public class MaterialCategoryExample { ...@@ -443,6 +444,526 @@ public class MaterialCategoryExample {
addCriterion("ParentId not between", value1, value2, "parentid"); addCriterion("ParentId not between", value1, value2, "parentid");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSortIsNull() {
addCriterion("sort is null");
return (Criteria) this;
}
public Criteria andSortIsNotNull() {
addCriterion("sort is not null");
return (Criteria) this;
}
public Criteria andSortEqualTo(String value) {
addCriterion("sort =", value, "sort");
return (Criteria) this;
}
public Criteria andSortNotEqualTo(String value) {
addCriterion("sort <>", value, "sort");
return (Criteria) this;
}
public Criteria andSortGreaterThan(String value) {
addCriterion("sort >", value, "sort");
return (Criteria) this;
}
public Criteria andSortGreaterThanOrEqualTo(String value) {
addCriterion("sort >=", value, "sort");
return (Criteria) this;
}
public Criteria andSortLessThan(String value) {
addCriterion("sort <", value, "sort");
return (Criteria) this;
}
public Criteria andSortLessThanOrEqualTo(String value) {
addCriterion("sort <=", value, "sort");
return (Criteria) this;
}
public Criteria andSortLike(String value) {
addCriterion("sort like", value, "sort");
return (Criteria) this;
}
public Criteria andSortNotLike(String value) {
addCriterion("sort not like", value, "sort");
return (Criteria) this;
}
public Criteria andSortIn(List<String> values) {
addCriterion("sort in", values, "sort");
return (Criteria) this;
}
public Criteria andSortNotIn(List<String> values) {
addCriterion("sort not in", values, "sort");
return (Criteria) this;
}
public Criteria andSortBetween(String value1, String value2) {
addCriterion("sort between", value1, value2, "sort");
return (Criteria) this;
}
public Criteria andSortNotBetween(String value1, String value2) {
addCriterion("sort not between", value1, value2, "sort");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("status is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("status is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(String value) {
addCriterion("status =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(String value) {
addCriterion("status <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(String value) {
addCriterion("status >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(String value) {
addCriterion("status >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(String value) {
addCriterion("status <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(String value) {
addCriterion("status <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLike(String value) {
addCriterion("status like", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotLike(String value) {
addCriterion("status not like", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<String> values) {
addCriterion("status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<String> values) {
addCriterion("status not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(String value1, String value2) {
addCriterion("status between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(String value1, String value2) {
addCriterion("status not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andSerialNoIsNull() {
addCriterion("serial_no is null");
return (Criteria) this;
}
public Criteria andSerialNoIsNotNull() {
addCriterion("serial_no is not null");
return (Criteria) this;
}
public Criteria andSerialNoEqualTo(String value) {
addCriterion("serial_no =", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoNotEqualTo(String value) {
addCriterion("serial_no <>", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoGreaterThan(String value) {
addCriterion("serial_no >", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoGreaterThanOrEqualTo(String value) {
addCriterion("serial_no >=", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoLessThan(String value) {
addCriterion("serial_no <", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoLessThanOrEqualTo(String value) {
addCriterion("serial_no <=", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoLike(String value) {
addCriterion("serial_no like", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoNotLike(String value) {
addCriterion("serial_no not like", value, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoIn(List<String> values) {
addCriterion("serial_no in", values, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoNotIn(List<String> values) {
addCriterion("serial_no not in", values, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoBetween(String value1, String value2) {
addCriterion("serial_no between", value1, value2, "serialNo");
return (Criteria) this;
}
public Criteria andSerialNoNotBetween(String value1, String value2) {
addCriterion("serial_no not between", value1, value2, "serialNo");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreatorIsNull() {
addCriterion("creator is null");
return (Criteria) this;
}
public Criteria andCreatorIsNotNull() {
addCriterion("creator is not null");
return (Criteria) this;
}
public Criteria andCreatorEqualTo(Long value) {
addCriterion("creator =", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorNotEqualTo(Long value) {
addCriterion("creator <>", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorGreaterThan(Long value) {
addCriterion("creator >", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorGreaterThanOrEqualTo(Long value) {
addCriterion("creator >=", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorLessThan(Long value) {
addCriterion("creator <", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorLessThanOrEqualTo(Long value) {
addCriterion("creator <=", value, "creator");
return (Criteria) this;
}
public Criteria andCreatorIn(List<Long> values) {
addCriterion("creator in", values, "creator");
return (Criteria) this;
}
public Criteria andCreatorNotIn(List<Long> values) {
addCriterion("creator not in", values, "creator");
return (Criteria) this;
}
public Criteria andCreatorBetween(Long value1, Long value2) {
addCriterion("creator between", value1, value2, "creator");
return (Criteria) this;
}
public Criteria andCreatorNotBetween(Long value1, Long value2) {
addCriterion("creator not between", value1, value2, "creator");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdaterIsNull() {
addCriterion("updater is null");
return (Criteria) this;
}
public Criteria andUpdaterIsNotNull() {
addCriterion("updater is not null");
return (Criteria) this;
}
public Criteria andUpdaterEqualTo(Long value) {
addCriterion("updater =", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterNotEqualTo(Long value) {
addCriterion("updater <>", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterGreaterThan(Long value) {
addCriterion("updater >", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterGreaterThanOrEqualTo(Long value) {
addCriterion("updater >=", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterLessThan(Long value) {
addCriterion("updater <", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterLessThanOrEqualTo(Long value) {
addCriterion("updater <=", value, "updater");
return (Criteria) this;
}
public Criteria andUpdaterIn(List<Long> values) {
addCriterion("updater in", values, "updater");
return (Criteria) this;
}
public Criteria andUpdaterNotIn(List<Long> values) {
addCriterion("updater not in", values, "updater");
return (Criteria) this;
}
public Criteria andUpdaterBetween(Long value1, Long value2) {
addCriterion("updater between", value1, value2, "updater");
return (Criteria) this;
}
public Criteria andUpdaterNotBetween(Long value1, Long value2) {
addCriterion("updater not between", value1, value2, "updater");
return (Criteria) this;
}
} }
/** /**
......
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapper.java
View file @ 458c9088
...@@ -93,14 +93,4 @@ public interface MaterialCategoryMapper { ...@@ -93,14 +93,4 @@ public interface MaterialCategoryMapper {
* @mbggenerated * @mbggenerated
*/ */
int updateByPrimaryKey(MaterialCategory record); int updateByPrimaryKey(MaterialCategory record);
List<MaterialCategory> selectByConditionMaterialCategory(
@Param("name") String name,
@Param("parentId") Integer parentId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByMaterialCategory(
@Param("name") String name,
@Param("parentId") Integer parentId);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java 0 → 100644
View file @ 458c9088
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.MaterialCategory;
import com.jsh.erp.datasource.vo.TreeNode;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* Description
*
* @Author: cjl
* @Date: 2019/2/18 17:23
*/
public interface MaterialCategoryMapperEx {
List<MaterialCategory> selectByConditionMaterialCategory(
@Param("name") String name,
@Param("parentId") Integer parentId,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
int countsByMaterialCategory(
@Param("name") String name,
@Param("parentId") Integer parentId);
List<TreeNode> getNodeTree();
List<TreeNode> getNextNodeTree(@Param("id") Long id);
int addMaterialCategory(MaterialCategory mc);
int batchDeleteMaterialCategoryByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
int editMaterialCategory(MaterialCategory mc);
List<MaterialCategory> getMaterialCategoryBySerialNo(@Param("serialNo") String serialNo);
}
src/main/java/com/jsh/erp/datasource/vo/TreeNode.java 0 → 100644
View file @ 458c9088
package com.jsh.erp.datasource.vo;
import java.util.List;
/**
* Description
* 树形结构基本元素
* @Author: cjl
* @Date: 2019/2/19 11:27
*/
public class TreeNode {
/**
* id主键
* */
private Long id;
/**
* text显示的文本
* */
private String text;
/**
*state节点状态，'open' 或 'closed'，默认：'open'。如果为'closed'的时候，将不自动展开该节点。
* */
private String state="open";
/**
*iconCls 节点图标id
* */
private String iconCls;
/**
* checked 是否被选中
* */
private boolean checked;
/**
*attributes 自定义属性
* */
private String attributes;
/**
* children 子节点
* */
private List<TreeNode> children;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getText() {
return text;
}
public void setText(String text) {
this.text = text;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getIconCls() {
return iconCls;
}
public void setIconCls(String iconCls) {
this.iconCls = iconCls;
}
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
public String getAttributes() {
return attributes;
}
public void setAttributes(String attributes) {
this.attributes = attributes;
}
public List<TreeNode> getChildren() {
return children;
}
public void setChildren(List<TreeNode> children) {
this.children = children;
}
}
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
View file @ 458c9088
package com.jsh.erp.service.materialCategory; package com.jsh.erp.service.materialCategory;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.MaterialCategory; import com.jsh.erp.datasource.entities.MaterialCategory;
import com.jsh.erp.datasource.entities.MaterialCategoryExample; import com.jsh.erp.datasource.entities.MaterialCategoryExample;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.MaterialCategoryMapper; import com.jsh.erp.datasource.mappers.MaterialCategoryMapper;
import com.jsh.erp.datasource.mappers.MaterialCategoryMapperEx;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.StringUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -12,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -12,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List; import java.util.List;
@Service @Service
...@@ -20,6 +28,10 @@ public class MaterialCategoryService { ...@@ -20,6 +28,10 @@ public class MaterialCategoryService {
@Resource @Resource
private MaterialCategoryMapper materialCategoryMapper; private MaterialCategoryMapper materialCategoryMapper;
@Resource
private MaterialCategoryMapperEx materialCategoryMapperEx;
@Resource
private UserService userService;
public MaterialCategory getMaterialCategory(long id) { public MaterialCategory getMaterialCategory(long id) {
return materialCategoryMapper.selectByPrimaryKey(id); return materialCategoryMapper.selectByPrimaryKey(id);
...@@ -38,11 +50,11 @@ public class MaterialCategoryService { ...@@ -38,11 +50,11 @@ public class MaterialCategoryService {
} }
public List<MaterialCategory> select(String name, Integer parentId, int offset, int rows) { public List<MaterialCategory> select(String name, Integer parentId, int offset, int rows) {
return materialCategoryMapper.selectByConditionMaterialCategory(name, parentId, offset, rows); return materialCategoryMapperEx.selectByConditionMaterialCategory(name, parentId, offset, rows);
} }
public int countMaterialCategory(String name, Integer parentId) { public int countMaterialCategory(String name, Integer parentId) {
return materialCategoryMapper.countsByMaterialCategory(name, parentId); return materialCategoryMapperEx.countsByMaterialCategory(name, parentId);
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
...@@ -80,4 +92,105 @@ public class MaterialCategoryService { ...@@ -80,4 +92,105 @@ public class MaterialCategoryService {
example.createCriteria().andIdEqualTo(id); example.createCriteria().andIdEqualTo(id);
return materialCategoryMapper.selectByExample(example); return materialCategoryMapper.selectByExample(example);
} }
/**
* create by: cjl
* description:
*获取商品类别树数据
* create time: 2019/2/19 14:30
* @Param:
* @return java.util.List<com.jsh.erp.datasource.vo.TreeNode>
*/
public List<TreeNode> getMaterialCategoryTree() throws Exception{
return materialCategoryMapperEx.getNodeTree();
}
/**
* create by: cjl
* description:
* 新增商品类别信息
* create time: 2019/2/19 16:30
* @Param: mc
* @return void
*/
public int addMaterialCategory(MaterialCategory mc) throws Exception {
if(mc==null){
return 0;
}
if(mc.getParentid()==null){
//没有给定父级目录的id，默认设置父级目录为根目录
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_ID);
}
//检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc);
//数据状态新增时默认设置为启用
mc.setStatus(BusinessConstants.MATERIAL_CATEGORY_STATUS_ENABLE);
Date date=new Date();
User userInfo=userService.getCurrentUser();
//创建时间
mc.setCreateTime(date);
//创建人
mc.setCreator(userInfo==null?null:userInfo.getId());
//更新时间
mc.setUpdateTime(date);
//更新人
mc.setUpdater(userInfo==null?null:userInfo.getId());
return materialCategoryMapperEx.addMaterialCategory(mc);
}
public int batchDeleteMaterialCategoryByIds(String ids) throws Exception {
//更新时间
Date updateDate =new Date();
//更新人
User userInfo=userService.getCurrentUser();
Long updater=userInfo==null?null:userInfo.getId();
StringBuffer sb=new StringBuffer();
String strArray[]=ids.split(",");
if(strArray.length<1){
return 0;
}
return materialCategoryMapperEx.batchDeleteMaterialCategoryByIds(updateDate,updater,strArray);
}
public int editMaterialCategory(MaterialCategory mc) {
//检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc);
//更新时间
mc.setUpdateTime(new Date());
//更新人
User userInfo=userService.getCurrentUser();
mc.setUpdater(userInfo==null?null:userInfo.getId());
return materialCategoryMapperEx.editMaterialCategory(mc);
}
/**
* 根据商品类别编号判断商品类别是否已存在
* */
public void checkMaterialCategorySerialNo(MaterialCategory mc) {
if(mc==null){
return;
}
if(StringUtil.isEmpty(mc.getSerialNo())){
return;
}
//根据商品类别编号查询商品类别
List<MaterialCategory> mList=materialCategoryMapperEx.getMaterialCategoryBySerialNo(mc.getSerialNo());
if(mList==null||mList.size()<1){
//未查询到对应数据，编号可用
return;
}
if(mList.size()>1){
//查询到的数据条数大于1，编号已存在
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE,
ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG);
}
if(mc.getId()==null){
//新增时，编号已存在
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE,
ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG);
}
if(mc.getId()!=mList.get(0).getId()){
//修改时，相同编号，id不同
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE,
ExceptionConstants.MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG);
}
}
} }
src/main/resources/mapper_xml/MaterialCategoryMapper.xml
View file @ 458c9088
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="Name" jdbcType="VARCHAR" property="name" />
<result column="CategoryLevel" jdbcType="SMALLINT" property="categorylevel" /> <result column="CategoryLevel" jdbcType="SMALLINT" property="categorylevel" />
<result column="ParentId" jdbcType="BIGINT" property="parentid" /> <result column="ParentId" jdbcType="BIGINT" property="parentid" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -82,7 +90,8 @@ ...@@ -82,7 +90,8 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Name, CategoryLevel, ParentId Id, Name, CategoryLevel, ParentId, sort, status, serial_no, remark, create_time,
creator, update_time, updater
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -136,9 +145,15 @@ ...@@ -136,9 +145,15 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_materialcategory (Id, Name, CategoryLevel, insert into jsh_materialcategory (Id, Name, CategoryLevel,
ParentId) ParentId, sort, status,
serial_no, remark, create_time,
creator, update_time, updater
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categorylevel,jdbcType=SMALLINT}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categorylevel,jdbcType=SMALLINT},
#{parentid,jdbcType=BIGINT}) #{parentid,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- <!--
...@@ -159,6 +174,30 @@ ...@@ -159,6 +174,30 @@
<if test="parentid != null"> <if test="parentid != null">
ParentId, ParentId,
</if> </if>
<if test="sort != null">
sort,
</if>
<if test="status != null">
status,
</if>
<if test="serialNo != null">
serial_no,
</if>
<if test="remark != null">
remark,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="creator != null">
creator,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="updater != null">
updater,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -173,6 +212,30 @@ ...@@ -173,6 +212,30 @@
<if test="parentid != null"> <if test="parentid != null">
#{parentid,jdbcType=BIGINT}, #{parentid,jdbcType=BIGINT},
</if> </if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
#{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
#{updater,jdbcType=BIGINT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Integer">
...@@ -204,6 +267,30 @@ ...@@ -204,6 +267,30 @@
<if test="record.parentid != null"> <if test="record.parentid != null">
ParentId = #{record.parentid,jdbcType=BIGINT}, ParentId = #{record.parentid,jdbcType=BIGINT},
</if> </if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.serialNo != null">
serial_no = #{record.serialNo,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -218,7 +305,15 @@ ...@@ -218,7 +305,15 @@
set Id = #{record.id,jdbcType=BIGINT}, set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR}, Name = #{record.name,jdbcType=VARCHAR},
CategoryLevel = #{record.categorylevel,jdbcType=SMALLINT}, CategoryLevel = #{record.categorylevel,jdbcType=SMALLINT},
ParentId = #{record.parentid,jdbcType=BIGINT} ParentId = #{record.parentid,jdbcType=BIGINT},
sort = #{record.sort,jdbcType=VARCHAR},
status = #{record.status,jdbcType=VARCHAR},
serial_no = #{record.serialNo,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -239,6 +334,30 @@ ...@@ -239,6 +334,30 @@
<if test="parentid != null"> <if test="parentid != null">
ParentId = #{parentid,jdbcType=BIGINT}, ParentId = #{parentid,jdbcType=BIGINT},
</if> </if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serial_no = #{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -250,7 +369,15 @@ ...@@ -250,7 +369,15 @@
update jsh_materialcategory update jsh_materialcategory
set Name = #{name,jdbcType=VARCHAR}, set Name = #{name,jdbcType=VARCHAR},
CategoryLevel = #{categorylevel,jdbcType=SMALLINT}, CategoryLevel = #{categorylevel,jdbcType=SMALLINT},
ParentId = #{parentid,jdbcType=BIGINT} ParentId = #{parentid,jdbcType=BIGINT},
sort = #{sort,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR},
serial_no = #{serialNo,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
View file @ 458c9088
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapperEx">
<select id="selectByConditionMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap"> <select id="selectByConditionMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap">
select * select *
FROM jsh_materialcategory FROM jsh_materialcategory
where 1=1 where 1=1
...@@ -29,4 +29,75 @@ ...@@ -29,4 +29,75 @@
</if> </if>
and Id !=1 and Id !=1
</select> </select>
<resultMap id="BaseTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNode">
<result column="id" property="id"/>
<result column="name" property="text"/>
<collection column="id" property="children" javaType="java.util.ArrayList"
ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
</resultMap>
<resultMap id="NextTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNode">
<result column="id" property="id"/>
<result column="name" property="text"/>
<collection column="id" property="children" javaType="java.util.ArrayList"
ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
</resultMap>
<sql id="Base_Column_List">
id, name
</sql>
<select id="getNextNodeTree" resultMap="NextTreeResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM jsh_materialcategory
WHERE ParentId = #{id}
and status !='2'
order by sort asc
</select>
<select id="getNodeTree" resultMap="BaseTreeResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM jsh_materialcategory
WHERE ParentId = -1
and status !='2'
order by sort asc
</select>
<insert id="addMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"
useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_materialcategory
(Name, CategoryLevel, ParentId, sort,status,serial_no,remark,
create_Time, creator,update_Time, updater)
values
(#{name},#{categorylevel},#{parentid},#{sort},#{status},#{serialNo},#{remark},
#{createTime},#{creator},#{updateTime},#{updater}
)
</insert>
<update id="batchDeleteMaterialCategoryByIds">
update jsh_materialcategory
set update_Time=#{updateTime},updater=#{updater},status='2'
where id in (
<foreach collection="ids" item="id" separator=",">
#{id}
</foreach>
)
</update>
<update id="editMaterialCategory">
update jsh_materialcategory
set update_Time=#{updateTime},updater=#{updater},
ParentId=#{parentid},sort=#{sort},serial_no=#{serialNo},
name=#{name},remark=#{remark}
where id =#{id}
</update>
<select id="getMaterialCategoryBySerialNo" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap">
select
<include refid="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.Base_Column_List"/>
FROM jsh_materialcategory
where 1=1
and serial_no=#{serialNo}
and status !='2'
</select>
</mapper> </mapper>
\ No newline at end of file
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