qzyReal 3 vuotta sitten
vanhempi
commit
7bd765e9a1

+ 131 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-add.html

@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>业务类型与作业项-添加/修改</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-else>数据修改</div>
+					<el-form v-if="m">
+						<sa-item type="text" name="" v-model="m.id" br></sa-item>
+						<sa-item type="text" name="" v-model="m.goodsId" br></sa-item>
+						<sa-item type="text" name="作业类型" v-model="m.goodsName" br></sa-item>
+						<sa-item type="text" name="" v-model="m.typeId" br></sa-item>
+						<sa-item type="text" name="类型名称" v-model="m.typeName" br></sa-item>
+						<sa-item type="enum" name="载重是否必填" v-model="m.needWeight" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
+						<sa-item type="enum" name="规格是否必填" v-model="m.needCarSize" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
+						<sa-item type="enum" name="申报单是否必填" v-model="m.needDeclare" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
+						<sa-item type="enum" name="申报时间是否必填" v-model="m.needOperateTime" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
+						<sa-item type="enum" name="是否必选" v-model="m.needSelect" :jv="{1: '是', 0: '否'}" jtype="3" br></sa-item>
+						<sa-item name="" class="s-ok" br>
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</sa-item>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="primary" @click="ok()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+        <script>
+			
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),		// 获取超链接中的id参数(0=添加,非0=修改) 
+					m: null,		// 实体对象 
+				},
+				methods: {
+					// 创建一个 默认Model 
+					createModel: function() {
+						return {
+							id: '',		//  
+							goodsId: '',		//  
+							goodsName: '',		// 作业类型 
+							typeId: '',		//  
+							typeName: '',		// 类型名称 
+							needWeight: '',		// 载重是否必填(1=是,0=否) 
+							needCarSize: '',		// 规格是否必填(1=是,0=否) 
+							needDeclare: '',		// 申报单是否必填(1=是,0=否) 
+							needOperateTime: '',		// 申报时间是否必填(1=是,0=否) 
+							needSelect: '',		// 是否必选(1=是,0=否) 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 []');
+						sa.checkNull(m.goodsId, '请输入 []');
+						sa.checkNull(m.goodsName, '请输入 [作业类型]');
+						sa.checkNull(m.typeId, '请输入 []');
+						sa.checkNull(m.typeName, '请输入 [类型名称]');
+						sa.checkNull(m.needWeight, '请输入 [载重是否必填]');
+						sa.checkNull(m.needCarSize, '请输入 [规格是否必填]');
+						sa.checkNull(m.needDeclare, '请输入 [申报单是否必填]');
+						sa.checkNull(m.needOperateTime, '请输入 [申报时间是否必填]');
+						sa.checkNull(m.needSelect, '请输入 [是否必选]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/RelationGoodsType/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/RelationGoodsType/update', m, function(res){
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						if(this.id == 0) {
+							this.m = this.createModel();
+						} else {
+							parent.app.f5();		// 刷新父页面列表
+							sa.closeCurrIframe();	// 关闭本页 
+						}
+					}
+				},
+				mounted: function(){
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
+					} else {	
+						sa.ajax('/RelationGoodsType/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 69 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-info.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>业务类型与作业项-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label{width: 8em;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<sa-info name="" br>{{m.id}}</sa-info>
+						<sa-info name="" br>{{m.goodsId}}</sa-info>
+						<sa-info name="作业类型" br>{{m.goodsName}}</sa-info>
+						<sa-info name="" br>{{m.typeId}}</sa-info>
+						<sa-info name="类型名称" br>{{m.typeName}}</sa-info>
+						<sa-info type="enum" name="载重是否必填" :value="m.needWeight" :jv="{1: '是', 0: '否'}" br></sa-info>
+						<sa-info type="enum" name="规格是否必填" :value="m.needCarSize" :jv="{1: '是', 0: '否'}" br></sa-info>
+						<sa-info type="enum" name="申报单是否必填" :value="m.needDeclare" :jv="{1: '是', 0: '否'}" br></sa-info>
+						<sa-info type="enum" name="申报时间是否必填" :value="m.needOperateTime" :jv="{1: '是', 0: '否'}" br></sa-info>
+						<sa-info type="enum" name="是否必选" :value="m.needSelect" :jv="{1: '是', 0: '否'}" br></sa-info>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
+				},
+				methods: {
+				},
+				mounted: function() {
+					sa.ajax('/RelationGoodsType/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 253 - 0
sp-admin/sa-view/relation-goods-type/relation-goods-type-list.html

@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>业务类型与作业项-列表</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<div class="c-title">检索参数</div>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="text" name="" v-model="p.id"></sa-item>
+					<sa-item type="text" name="" v-model="p.goodsId"></sa-item>
+					<sa-item type="text" name="作业类型" v-model="p.goodsName"></sa-item>
+					<sa-item type="text" name="" v-model="p.typeId"></sa-item>
+					<sa-item type="text" name="类型名称" v-model="p.typeName"></sa-item>
+					<sa-item type="enum" name="载重是否必填" v-model="p.needWeight" 
+						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<sa-item type="enum" name="规格是否必填" v-model="p.needCarSize" 
+						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<sa-item type="enum" name="申报单是否必填" v-model="p.needDeclare" 
+						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<sa-item type="enum" name="申报时间是否必填" v-model="p.needOperateTime" 
+						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<sa-item type="enum" name="是否必选" v-model="p.needSelect" 
+						:jv="{1: '是', 0: '否'}" jtype="2" def="不限"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<br />
+					<sa-item name="综合排序">
+						<el-radio-group v-model="p.sortType" class="s-radio-text">
+							<el-radio :label="0">默认</el-radio>
+							<el-radio :label="1"></el-radio>
+							<el-radio :label="2"></el-radio>
+							<el-radio :label="3">作业类型</el-radio>
+							<el-radio :label="4"></el-radio>
+							<el-radio :label="5">类型名称</el-radio>
+							<el-radio :label="6">载重是否必填</el-radio>
+							<el-radio :label="7">规格是否必填</el-radio>
+							<el-radio :label="8">申报单是否必填</el-radio>
+							<el-radio :label="9">申报时间是否必填</el-radio>
+							<el-radio :label="10">是否必选</el-radio>
+						</el-radio-group>
+					</sa-item>
+				</el-form>
+				<!-- ------------- 快捷按钮 ------------- -->
+				<sa-item type="fast-btn" show="add,get,delete,export,reset"></sa-item>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="selection"></sa-td>
+					<sa-td name="" prop="id" ></sa-td>
+					<sa-td name="" prop="goodsId" ></sa-td>
+					<sa-td name="作业类型" prop="goodsName" ></sa-td>
+					<sa-td name="" prop="typeId" ></sa-td>
+					<sa-td name="类型名称" prop="typeName" ></sa-td>
+					<sa-td name="载重是否必填" prop="needWeight" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedWeight(s.row)"></sa-td>
+					<sa-td name="规格是否必填" prop="needCarSize" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedCarSize(s.row)"></sa-td>
+					<sa-td name="申报单是否必填" prop="needDeclare" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedDeclare(s.row)"></sa-td>
+					<sa-td name="申报时间是否必填" prop="needOperateTime" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedOperateTime(s.row)"></sa-td>
+					<sa-td name="是否必选" prop="needSelect" type="switch" :jv="{1: '是', 0: '否'}" @change="s => updateNeedSelect(s.row)"></sa-td>
+					<el-table-column label="操作" fixed="right"  width="240px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						id: '',		//  
+						goodsId: '',		//  
+						goodsName: '',		// 作业类型 
+						typeId: '',		//  
+						typeName: '',		// 类型名称 
+						needWeight: '',		// 载重是否必填(1=是,0=否) 
+						needCarSize: '',		// 规格是否必填(1=是,0=否) 
+						needDeclare: '',		// 申报单是否必填(1=是,0=否) 
+						needOperateTime: '',		// 申报时间是否必填(1=是,0=否) 
+						needSelect: '',		// 是否必选(1=是,0=否) 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/RelationGoodsType/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'relation-goods-type-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'relation-goods-type-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'relation-goods-type-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除,此操作不可撤销', function() {
+							sa.ajax('/RelationGoodsType/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的id列表 
+						let selection = this.$refs['data-table'].selection;
+						let ids = sa.getArrayField(selection, 'id');
+						if(selection.length == 0) {
+							return sa.msg('请至少选择一条数据')
+						}
+						// 提交删除 
+						sa.confirm('是否批量删除选中数据?此操作不可撤销', function() {
+							sa.ajax('/RelationGoodsType/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 改 - 载重是否必填(1=是,0=否)
+					updateNeedWeight: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needWeight;
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedWeight', {id: data.id, value: data.needWeight}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+					// 改 - 规格是否必填(1=是,0=否)
+					updateNeedCarSize: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needCarSize;
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedCarSize', {id: data.id, value: data.needCarSize}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+					// 改 - 申报单是否必填(1=是,0=否)
+					updateNeedDeclare: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needDeclare;
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedDeclare', {id: data.id, value: data.needDeclare}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+					// 改 - 申报时间是否必填(1=是,0=否)
+					updateNeedOperateTime: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needOperateTime;
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedOperateTime', {id: data.id, value: data.needOperateTime}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+					// 改 - 是否必选(1=是,0=否)
+					updateNeedSelect: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.needSelect;
+						var ajax = sa.ajax('/RelationGoodsType/updateNeedSelect', {id: data.id, value: data.needSelect}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

+ 5 - 5
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsType.java

@@ -61,27 +61,27 @@ public class RelationGoodsType extends Model<RelationGoodsType> implements Seria
 	private String typeName;	
 
 	/**
-	 * 载重是否必填(1=是,0=否) 
+	 * 载重是否必填(1=是,0=否) 
 	 */
 	private String needWeight;	
 
 	/**
-	 * 规格是否必填(1=是,0=否) 
+	 * 规格是否必填(1=是,0=否) 
 	 */
 	private String needCarSize;	
 
 	/**
-	 * 申报单是否必填(1=是,0=否) 
+	 * 申报单是否必填(1=是,0=否) 
 	 */
 	private String needDeclare;	
 
 	/**
-	 * 申报时间是否必填(1=是,0=否) 
+	 * 申报时间是否必填(1=是,0=否) 
 	 */
 	private String needOperateTime;	
 
 	/**
-	 * 是否必选(1=是,0=否) 
+	 * 是否必选(1=是,0=否) 
 	 */
 	private Integer needSelect;	
 

+ 6 - 7
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeController.java

@@ -2,7 +2,6 @@ package com.pj.project.relation_goods_type;
 
 import java.util.List;
 
-import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +47,7 @@ public class RelationGoodsTypeController {
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(RelationGoodsType.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
@@ -78,7 +77,7 @@ public class RelationGoodsTypeController {
 	
 	
 	
-	/** 改 - 载重是否必填(1=是,0=否) */  
+	/** 改 - 载重是否必填(1=是,0=否) */  
 	@RequestMapping("updateNeedWeight")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson updateNeedWeight(Long id, String value){
@@ -86,7 +85,7 @@ public class RelationGoodsTypeController {
 		return AjaxJson.getByLine(line);
 	}
 	
-	/** 改 - 规格是否必填(1=是,0=否) */  
+	/** 改 - 规格是否必填(1=是,0=否) */  
 	@RequestMapping("updateNeedCarSize")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson updateNeedCarSize(Long id, String value){
@@ -94,7 +93,7 @@ public class RelationGoodsTypeController {
 		return AjaxJson.getByLine(line);
 	}
 	
-	/** 改 - 申报单是否必填(1=是,0=否) */  
+	/** 改 - 申报单是否必填(1=是,0=否) */  
 	@RequestMapping("updateNeedDeclare")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson updateNeedDeclare(Long id, String value){
@@ -102,7 +101,7 @@ public class RelationGoodsTypeController {
 		return AjaxJson.getByLine(line);
 	}
 	
-	/** 改 - 申报时间是否必填(1=是,0=否) */  
+	/** 改 - 申报时间是否必填(1=是,0=否) */  
 	@RequestMapping("updateNeedOperateTime")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson updateNeedOperateTime(Long id, String value){
@@ -110,7 +109,7 @@ public class RelationGoodsTypeController {
 		return AjaxJson.getByLine(line);
 	}
 	
-	/** 改 - 是否必选(1=是,0=否) */  
+	/** 改 - 是否必选(1=是,0=否) */  
 	@RequestMapping("updateNeedSelect")
 	@SaCheckPermission(RelationGoodsType.PERMISSION_CODE)
 	public AjaxJson updateNeedSelect(Long id, Integer value){

+ 1 - 2
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeService.java

@@ -2,7 +2,6 @@ package com.pj.project.relation_goods_type;
 
 import java.util.List;
 
-import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +39,7 @@ public class RelationGoodsTypeService {
 	}
 
 	/** 查集合 - 根据条件(参数为空时代表忽略指定条件) */  
-	List<RelationGoodsType> getList(SoMap so) {
+	List<RelationGoodsType> getList(SoMap so) { 
 		return relationGoodsTypeMapper.getList(so);	
 	}
 	

+ 63 - 0
sp-server/src/main/java/com/pj/project/relation_goods_type/RelationGoodsTypeUtil.java

@@ -0,0 +1,63 @@
+package com.pj.project.relation_goods_type;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.pj.utils.sg.*;
+
+/**
+ * 工具类:relation_goods_type -- 业务类型与作业项
+ * @author qzy 
+ *
+ */
+@Component
+public class RelationGoodsTypeUtil {
+
+	
+	/** 底层 Mapper 对象 */
+	public static RelationGoodsTypeMapper relationGoodsTypeMapper;
+	@Autowired
+	private void setRelationGoodsTypeMapper(RelationGoodsTypeMapper relationGoodsTypeMapper) {
+		RelationGoodsTypeUtil.relationGoodsTypeMapper = relationGoodsTypeMapper;
+	}
+	
+	
+	/** 
+	 * 将一个 RelationGoodsType 对象进行进行数据完整性校验 (方便add/update等接口数据校验) [G] 
+	 */
+	static void check(RelationGoodsType r) {
+		AjaxError.throwByIsNull(r.getId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(r.getGoodsId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(r.getGoodsName(), "[作业类型] 不能为空");		// 验证: 作业类型 
+		AjaxError.throwByIsNull(r.getTypeId(), "[] 不能为空");		// 验证:  
+		AjaxError.throwByIsNull(r.getTypeName(), "[类型名称] 不能为空");		// 验证: 类型名称 
+		AjaxError.throwByIsNull(r.getNeedWeight(), "[载重是否必填] 不能为空");		// 验证: 载重是否必填(1=是,0=否) 
+		AjaxError.throwByIsNull(r.getNeedCarSize(), "[规格是否必填] 不能为空");		// 验证: 规格是否必填(1=是,0=否) 
+		AjaxError.throwByIsNull(r.getNeedDeclare(), "[申报单是否必填] 不能为空");		// 验证: 申报单是否必填(1=是,0=否) 
+		AjaxError.throwByIsNull(r.getNeedOperateTime(), "[申报时间是否必填] 不能为空");		// 验证: 申报时间是否必填(1=是,0=否) 
+		AjaxError.throwByIsNull(r.getNeedSelect(), "[是否必选] 不能为空");		// 验证: 是否必选(1=是,0=否) 
+	}
+
+	/** 
+	 * 获取一个RelationGoodsType (方便复制代码用) [G] 
+	 */ 
+	static RelationGoodsType getRelationGoodsType() {
+		RelationGoodsType r = new RelationGoodsType();	// 声明对象 
+		r.setId(0L);		//  
+		r.setGoodsId(0L);		//  
+		r.setGoodsName("");		// 作业类型 
+		r.setTypeId(0L);		//  
+		r.setTypeName("");		// 类型名称 
+		r.setNeedWeight("");		// 载重是否必填(1=是,0=否) 
+		r.setNeedCarSize("");		// 规格是否必填(1=是,0=否) 
+		r.setNeedDeclare("");		// 申报单是否必填(1=是,0=否) 
+		r.setNeedOperateTime("");		// 申报时间是否必填(1=是,0=否) 
+		r.setNeedSelect(0);		// 是否必选(1=是,0=否) 
+		return r;
+	}
+	
+	
+	
+	
+	
+}