zy-wcs.git - Gitblit

			@@ -50,6 +50,9 @@
			} else {
			wrapper.orderBy("appe_time", false);
			}
			// if (!Cools.isEmpty(ioTime)) {
			// wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
			// }
			return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
			}

			@@ -83,10 +86,14 @@
			wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
			wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
			} else {
			if (entry.getKey().equals("io_time")) {
			wrapper.eq("io_time", DateUtils.convert(val, DateUtils.yyyyMMddHHmmsssss_F));
			}else {
			wrapper.like(entry.getKey(), val);
			}
			}
			}
			}

			@RequestMapping(value = "/wrkDetl/add/auth")
			@ManagerAuth(memo = "工作档明细添加")

			@@ -21,8 +21,8 @@
			cellMinWidth: 50,
			height: 'full-120',
			cols: [[
			{type: 'checkbox'}
			,{field: 'id', align: 'center',title: '编号'}
			// {type: 'checkbox'}
			{field: 'id', align: 'center',title: '编号'}
			,{field: 'wmsWrkNo', align: 'center',title: 'wms任务号'}
			,{field: 'wmsStatus$', align: 'center',title: 'wms任务状态'}
			,{field: 'wrkNo', align: 'center',title: '任务号'}

			@@ -1,6 +1,7 @@
			var pageCurr;
			var wrkNo;
			var wmsWrkNo;
			var ioTime;
			layui.config({
			base: baseUrl + "/static/wms/layui/lay/modules/"
			}).extend({
			@@ -289,6 +290,7 @@
			// 明细展示
			case 'detlShow':
			wrkNo = data.wrkNo;
			ioTime = data.ioTime;
			// 表格下方显示
			// locDetl(data.wrkNo);
			// 弹层显示

			@@ -13,10 +13,16 @@
			</style>
			</head>
			<body>
			<div class="layui-inline" style="width:31%;margin-top: 20px">
			<div class="layui-inline" style="width:20%;margin-top: 20px">
			<label class="layui-form-label">任务号：</label>
			<div class="layui-input-inline">
			<input id="wrkNo" class="layui-input" type="text" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline" style="width:20%;margin-top: 20px">
			<label class="layui-form-label">任务时间：</label>
			<div class="layui-input-inline">
			<input id="ioTime" class="layui-input" type="text" disabled="disabled">
			</div>
			</div>
			<table class="layui-hide" id="wrkDetlByMast" lay-filter="wrkDetlByMast"></table>
			@@ -42,11 +48,13 @@
			var form = layui.form;

			$('#wrkNo').val(parent.wrkNo);
			$('#ioTime').val(top.dateToStr(parent.ioTime, true));
			// 数据渲染
			tableIns1 = table.render({
			elem: '#wrkDetlByMast',
			headers: {token: localStorage.getItem('token')},
			url: baseUrl+'/wrkDetl/list/' + parent.wrkNo + '/auth',
			url: baseUrl+'/wrkDetl/list/auth',
			where: {wrk_no: parent.wrkNo, io_time: top.dateToStr(parent.ioTime, true)},
			page: true,
			limit: 16,
			limits: [16, 30, 50, 100, 200, 500],

	src/main/java/com/zy/asrs/controller/WrkDetlController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/wms/js/wmsWrkLog/wmsWrkLog.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/wms/js/wrkMast/wrkMast.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/wrkMast/wrkDetl.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史