zy-wcs.git - Gitblit

			@@ -12,10 +12,8 @@
			import com.zy.asrs.entity.BasLift;
			import com.zy.asrs.service.BasLiftService;
			import com.zy.common.service.CommonService;
			import com.zy.common.utils.ForkLiftUtils;
			import com.zy.common.utils.RedisUtil;
			import com.zy.core.action.ForkLiftAction;
			import com.zy.core.cache.MessageQueue;
			import com.zy.core.cache.OutputQueue;
			import com.zy.core.cache.SlaveConnection;
			import com.zy.core.enums.ForkLiftProtocolStatusType;
			@@ -23,12 +21,9 @@
			import com.zy.core.enums.RedisKeyType;
			import com.zy.core.enums.SlaveType;
			import com.zy.core.model.ForkLiftSlave;
			import com.zy.core.model.LiftSlave;
			import com.zy.core.model.Task;
			import com.zy.core.model.command.*;
			import com.zy.core.model.protocol.ForkLiftProtocol;
			import com.zy.core.model.protocol.ForkLiftStaProtocol;
			import com.zy.core.model.protocol.LiftStaProtocol;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.ForkLiftThread;
			import lombok.extern.slf4j.Slf4j;
			@@ -164,9 +159,7 @@
			@PostMapping("/detl/update")
			@ManagerAuth(memo = "修改数据")
			public R liftUpdate(@RequestParam Integer liftNo,
			@RequestParam Short workNo,
			@RequestParam String pakMk,
			@RequestParam Integer token) {
			@RequestParam Short workNo) {
			ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
			if (forkLiftThread == null) {
			return R.error("plc已掉线");

			@@ -51,7 +51,6 @@
			<th>提升机</th>
			<th>工作号</th>
			<th>站点信息</th>
			<th>作业标记</th>
			</tr>
			</thead>
			<tbody>
			@@ -118,12 +117,6 @@
			<input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
			</div>
			</div>
			<div class="form-item">
			<label class="form-label">作业标记:</label>
			<div class="form-input">
			<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
			</div>
			</div>
			<div class="form-item form-button-container">
			<button class="form-button" id="save">保存</button>
			<button class="form-button" id="cancel" style="background-color: #D0D0D0">取消</button>
			@@ -178,8 +171,6 @@
			http.post(baseUrl+ "/forkLift/detl/update", {
			liftNo: $('#liftNo').val(),
			workNo: $('#workNo').val(),
			pakMk: $('#pakMk').val(),
			token: $('#token').val(),
			}, function (res) {
			layer.msg("修改成功", {icon: 1,});
			layer.close(layerDetl);
			@@ -282,7 +273,6 @@
			setVal(tr.children("td").eq(0), table[i-1].liftNo);
			setVal(tr.children("td").eq(1), table[i-1].workNo);
			setVal(tr.children("td").eq(2), staDiv);
			setVal(tr.children("td").eq(3), table[i-1].pakMk);
			}
			} else if (res.code === 403){
			window.location.href = baseUrl+"/login";

	src/main/java/com/zy/asrs/controller/ForkLiftController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/forklift.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史