From 883195f4d14f24abeb35182dd2af53a8f022a1d0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 05 九月 2023 15:51:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 45e755f..9fdb831 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -13,13 +13,11 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
-import com.zy.asrs.entity.BasCrnError;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
@@ -36,9 +34,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.MelsecCrnThread;
-import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -64,6 +60,10 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -267,7 +267,8 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread=(SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+// MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -297,6 +298,41 @@
return R.error();
}
+ @PostMapping("/loc/detail")
+ @ManagerAuth(memo = "搴撲綅鏁版嵁璇︽儏")
+ public R locDetail(@RequestParam String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+ if(null == locMast || !locMast.getLocSts().equals("F")){
+ return R.error("搴撲綅涓虹┖鎴栭潪鍦ㄥ簱鐘舵��");
+ }
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locNo));
+ if (null != locDetl){
+ LocDetailVo vo = new LocDetailVo();
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setLocSts(locMast.getLocSts());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setZpallet(locDetl.getZpallet());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
+ return R.ok().add(vo);
+ }
+ return R.error();
+ }
+ @PostMapping("/loc/detail2")
+ @ManagerAuth(memo = "0101804搴撲綅鏁版嵁璇︽儏")
+ public R locDetail2(@RequestParam String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+ LocDetailVo vo = new LocDetailVo();
+ vo.setChannel(locMast.getChannel());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
+ return R.ok().add(vo);
+ }
+
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
--
Gitblit v1.9.1