From e9ed17ca2d5eaafe69704ee817817a539d847e78 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 七月 2023 09:04:44 +0800
Subject: [PATCH] 登录页面
---
src/main/java/com/zy/asrs/utils/CommandUtils.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/CommandUtils.java b/src/main/java/com/zy/asrs/utils/CommandUtils.java
index b483ad2..fae90db 100644
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ b/src/main/java/com/zy/asrs/utils/CommandUtils.java
@@ -30,15 +30,19 @@
CommandInfo commandInfo = null;
WrkMast wrkMast = null;
int taskNo = 0;
+ int wmsWrkNo = 0;
switch (type) {
case Crn:
CrnCommand command = (CrnCommand) task.getData();
taskNo = command.getTaskNo();
- wrkMast = wrkMastService.selectById(taskNo);
+ if (taskNo != 0) {
+ wrkMast = wrkMastService.selectById(taskNo);
+ wmsWrkNo = wrkMast.getWmsWrkNo();
+ }
commandInfo = new CommandInfo();
commandInfo.setWrkNo(taskNo);
- commandInfo.setWmsWrkNo(wrkMast.getWmsWrkNo());
+ commandInfo.setWmsWrkNo(wmsWrkNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("crn");
@@ -50,11 +54,14 @@
case Devp:
StaProtocol staProtocol = (StaProtocol) task.getData();
taskNo = staProtocol.getWorkNo();
- wrkMast = wrkMastService.selectById(taskNo);
+ if (taskNo != 0) {
+ wrkMast = wrkMastService.selectById(taskNo);
+ wmsWrkNo = wrkMast.getWmsWrkNo();
+ }
commandInfo = new CommandInfo();
commandInfo.setWrkNo(taskNo);
- commandInfo.setWmsWrkNo(wrkMast.getWmsWrkNo());
+ commandInfo.setWmsWrkNo(wmsWrkNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("devp");
@@ -67,11 +74,14 @@
List<LedCommand> data = (List<LedCommand>) task.getData();
for (LedCommand ledCommand : data) {
taskNo = ledCommand.getWorkNo();
- wrkMast = wrkMastService.selectById(taskNo);
+ if (taskNo != 0) {
+ wrkMast = wrkMastService.selectById(taskNo);
+ wmsWrkNo = wrkMast.getWmsWrkNo();
+ }
commandInfo = new CommandInfo();
commandInfo.setWrkNo(ledCommand.getWorkNo());
- commandInfo.setWmsWrkNo(wrkMast.getWmsWrkNo());
+ commandInfo.setWmsWrkNo(wmsWrkNo);
commandInfo.setCommandStatus(1);
commandInfo.setStartTime(new Date());
commandInfo.setDevice("led");
--
Gitblit v1.9.1