From e47fb4b03ccdb0eee776814826a61ae4014454cd Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期一, 09 六月 2025 19:38:35 +0800 Subject: [PATCH] 部署服务器 --- src/main/java/com/zy/asrs/controller/RgvController.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java index 2bc391d..8e951c1 100644 --- a/src/main/java/com/zy/asrs/controller/RgvController.java +++ b/src/main/java/com/zy/asrs/controller/RgvController.java @@ -7,7 +7,8 @@ import com.core.exception.CoolException; import com.zy.asrs.domain.enums.RgvStatusType; import com.zy.asrs.domain.param.*; -import com.zy.asrs.domain.vo.*; +import com.zy.asrs.domain.vo.RgvMsgTableVo; +import com.zy.asrs.domain.vo.RgvStateTableVo; import com.zy.asrs.entity.*; import com.zy.asrs.mapper.BasRgvErrMapper; import com.zy.asrs.service.BasCircularShuttleService; @@ -15,7 +16,6 @@ import com.zy.asrs.service.BasRgvService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.impl.MainServiceImpl; -import com.zy.asrs.utils.NumUtils; import com.zy.asrs.utils.Utils; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; @@ -39,8 +39,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.rmi.CORBA.Util; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * RGV鎺ュ彛 @@ -429,7 +430,7 @@ // @ManagerAuth(memo = "浣滀笟淇℃伅") public R ringThroughTaskWrkMast(){ List<RgvWrkMastParam> result = new ArrayList<>(); - List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>()); + List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts",9,10)); for (WrkMast wrkMast : wrkMasts){ RgvWrkMastParam rgvWrkMastParam = new RgvWrkMastParam(wrkMast); if (Cools.isEmpty(rgvWrkMastParam.getRgvNo())){ -- Gitblit v1.9.1