zy-wcs.git - Gitblit

parent: 1da595aa | 补丁 | 提交 | ignore whitespace

Junjie

2023-05-20 65df168408e508f4ef0ea79e40f2828669d7967e

工作号变任务号等

6个文件已修改

	src/main/webapp/static/wcs/css/render.css	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/wms/js/basErrLog/basErrLog.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/basErrLog/basErrLog.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/commandManageLog/commandManageLog.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/wrkMast/wrkDetl.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/webapp/static/wcs/css/render.css

@@ -529,7 +529,7 @@
}
.main-part {
    position: relative;
    top: -50px;
    top: 0px;
    left: -150px;
    width: 100%;
    height: 100%;
@@ -540,7 +540,7 @@
    top: 0;
    right: 0;
    width: 500px;
    height: 200px;
    height: 230px;
    background: rgba(255, 255, 255, 0.7);
    overflow: auto;
}

 src/main/webapp/static/wms/js/basErrLog/basErrLog.js

@@ -21,10 +21,10 @@
            {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'uuid', align: 'center',title: '编号', hide: true}
            ,{field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'wrkNo', align: 'center',title: '任务号'}
            ,{field: 'startTime$', align: 'center',title: '发生时间'}
            ,{field: 'endTime$', align: 'center',title: '结束时间'}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态'}
            ,{field: 'wrkSts$', align: 'center',title: '任务状态'}
            ,{field: 'ioType$', align: 'center',title: '入出库类型'}
            ,{field: 'crnNo', align: 'center',title: '堆垛机'}
            ,{field: 'plcNo', align: 'center',title: 'plc', hide: true}

 src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js

@@ -21,7 +21,7 @@
        cellMinWidth: 50,
        cols: [[
            {field: 'id', align: 'center',title: '指令编号',event: 'wrkNo', sort: true}
            ,{field: 'wrkNo', align: 'center',title: '工作号',event: 'wrkNo', sort: true}
            ,{field: 'wrkNo', align: 'center',title: '任务号',event: 'wrkNo', sort: true}
            ,{field: 'commandStatus$', align: 'center',title: '指令状态'}
            ,{field: 'durationTime', align: 'center',title: '持续时长', width: 160}
            ,{field: 'commandType', align: 'center',title: '指令类型'}

 src/main/webapp/views/basErrLog/basErrLog.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off">
            <input class="layui-input" type="text" name="wrk_no" placeholder="任务号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/commandManageLog/commandManageLog.html

@@ -20,7 +20,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="工作号" autocomplete="off">
            <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="任务号" autocomplete="off">
        </div>
    </div>


 src/main/webapp/views/wrkMast/wrkDetl.html

@@ -14,7 +14,7 @@
</head>
<body>
<div class="layui-inline"  style="width:31%;margin-top: 20px">
    <label class="layui-form-label">工 作 号：</label>
    <label class="layui-form-label">任 务 号：</label>
    <div class="layui-input-inline">
        <input id="wrkNo" class="layui-input" type="text" disabled="disabled">
    </div>
@@ -30,8 +30,8 @@
    var pageCur;
    function getCol() {
        var cols = [
            {field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'ioTime$', align: 'center',title: '工作时间'}
            {field: 'wrkNo', align: 'center',title: '任务号'}
            ,{field: 'ioTime$', align: 'center',title: '任务时间'}
        ];
        cols.push.apply(cols, detlCols);
        return cols;

			@@ -529,7 +529,7 @@
			}
			.main-part {
			position: relative;
			top: -50px;
			top: 0px;
			left: -150px;
			width: 100%;
			height: 100%;
			@@ -540,7 +540,7 @@
			top: 0;
			right: 0;
			width: 500px;
			height: 200px;
			height: 230px;
			background: rgba(255, 255, 255, 0.7);
			overflow: auto;
			}

			@@ -21,10 +21,10 @@
			{type: 'checkbox'}
			// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
			,{field: 'uuid', align: 'center',title: '编号', hide: true}
			,{field: 'wrkNo', align: 'center',title: '工作号'}
			,{field: 'wrkNo', align: 'center',title: '任务号'}
			,{field: 'startTime$', align: 'center',title: '发生时间'}
			,{field: 'endTime$', align: 'center',title: '结束时间'}
			,{field: 'wrkSts$', align: 'center',title: '工作状态'}
			,{field: 'wrkSts$', align: 'center',title: '任务状态'}
			,{field: 'ioType$', align: 'center',title: '入出库类型'}
			,{field: 'crnNo', align: 'center',title: '堆垛机'}
			,{field: 'plcNo', align: 'center',title: 'plc', hide: true}

			@@ -21,7 +21,7 @@
			cellMinWidth: 50,
			cols: [[
			{field: 'id', align: 'center',title: '指令编号',event: 'wrkNo', sort: true}
			,{field: 'wrkNo', align: 'center',title: '工作号',event: 'wrkNo', sort: true}
			,{field: 'wrkNo', align: 'center',title: '任务号',event: 'wrkNo', sort: true}
			,{field: 'commandStatus$', align: 'center',title: '指令状态'}
			,{field: 'durationTime', align: 'center',title: '持续时长', width: 160}
			,{field: 'commandType', align: 'center',title: '指令类型'}

			@@ -16,7 +16,7 @@
			<div id="search-box" class="layui-form layui-card-header">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="wrk_no" placeholder="工作号" autocomplete="off">
			<input class="layui-input" type="text" name="wrk_no" placeholder="任务号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">

			@@ -20,7 +20,7 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="工作号" autocomplete="off">
			<input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="任务号" autocomplete="off">
			</div>
			</div>

			@@ -14,7 +14,7 @@
			</head>
			<body>
			<div class="layui-inline" style="width:31%;margin-top: 20px">
			<label class="layui-form-label">工作号：</label>
			<label class="layui-form-label">任务号：</label>
			<div class="layui-input-inline">
			<input id="wrkNo" class="layui-input" type="text" disabled="disabled">
			</div>
			@@ -30,8 +30,8 @@
			var pageCur;
			function getCol() {
			var cols = [
			{field: 'wrkNo', align: 'center',title: '工作号'}
			,{field: 'ioTime$', align: 'center',title: '工作时间'}
			{field: 'wrkNo', align: 'center',title: '任务号'}
			,{field: 'ioTime$', align: 'center',title: '任务时间'}
			];
			cols.push.apply(cols, detlCols);
			return cols;