From 8b6c03b3f14f1e140c2ab694f1e2a3bbc123d7f4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 13 八月 2022 16:32:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index dd56b27..ddcd109 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -2,21 +2,23 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.enums.PackStatusType;
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.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;
import com.zy.core.CrnThread;
@@ -60,6 +62,10 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -107,6 +113,21 @@
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ vos.add(vo);
+ }
+ return R.ok().add(vos);
+ }
+
+ @PostMapping("/latest/data/loc")
+ @ManagerAuth(memo = "搴撲綅瀹炴椂鏁版嵁")
+ public R locLatestData(){
+ List<LocLatestDataVo> vos = new ArrayList<>();
+ List<LocMast> locMasts = locMastMapper.selectList(new EntityWrapper<LocMast>());
+ for(LocMast locMast : locMasts){
+ LocLatestDataVo vo = new LocLatestDataVo();
+ vo.setLocNo(locMast.getLocNo());
+ vo.setLocSts(locMast.getLocSts());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
vos.add(vo);
}
return R.ok().add(vos);
@@ -278,6 +299,29 @@
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();
+ }
+
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
--
Gitblit v1.9.1