From 9c98d630866b80627ae21ca539a8c3776baa7e73 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 09 十二月 2024 10:10:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 140 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 115 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 73eb219..797ae7d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,15 +1,24 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasJar;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.entity.result.LocDetlMesVo;
+import com.zy.asrs.entity.vo.JarStateTableVo;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -32,6 +41,16 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasJarService basJarService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -218,18 +237,18 @@
return R.ok();
}
- /**
- * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
- */
- @PostMapping("/palletizing/complete/auth/v1")
- @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
- public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteTwoFloorParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.PalletizingCompleteTwoFloorParam(param);
- return R.ok(param);
- }
+// /**
+// * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+// */
+// @PostMapping("/palletizing/complete/auth/v1")
+// @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+// public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+// @RequestBody PalletizingCompleteTwoFloorParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.PalletizingCompleteTwoFloorParam(param);
+// return R.ok(param);
+// }
/**
* 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
@@ -287,18 +306,18 @@
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
/*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
-// /**
-// * 浜冲窞鐓滄槦浠诲姟涓嬪彂
-// */
-// @PostMapping("/small/containers/auth/v1")
-// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
-// public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
-// @RequestBody LabellerCompleteParam param,
-// HttpServletRequest request) {
-// auth(appkey, param, request);
-// openService.labellerComplete(param);
-// return R.ok();
-// }
+ /**
+ * 浜冲窞鐓滄槦浠诲姟涓嬪彂 // 灏忔枡绠辨姇鏂欏畬鎴愮粍鎵�
+ */
+ @PostMapping("/small/containers/auth/v1")
+ @AppAuth(memo = "MES浠诲姟涓嬪彂")
+ public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
+ @RequestBody SmallCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.smallContainers(param);
+ return R.ok().add("鎴愬姛");
+ }
//
// /**
// * 浜冲窞鐓滄槦浠诲姟涓嬪彂
@@ -326,6 +345,77 @@
// return R.ok();
// }
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/deviceStatus")
+ @AppAuth(memo = "璁惧鐘舵�佹煡璇㈡帴鍙�")
+ @Transactional
+ public R deviceStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<Object> list = new ArrayList<>();
+ for (BasDevp basDevp:basDevps){
+ list.add(basDevp);
+ }
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ list.add(basCrnp);
+ }
+ return R.ok(list);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/jarStatus")
+ @AppAuth(memo = "纭寲缃愮姸鎬佹煡璇㈡帴鍙�")
+ @Transactional
+ public R jarStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "纭寲缃愮姸鎬佹煡璇㈡帴鍙�", request);
+ List<JarStateTableVo> list = new ArrayList<>();
+ List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
+ for (BasJar basJar : jars) {
+ // 琛ㄦ牸琛�
+ JarStateTableVo vo = new JarStateTableVo();
+ vo.setJarNo(basJar.getJarNo()); // JAR鍙�
+ list.add(vo);
+
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵��
+ vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
+ vo.setRegion(basJar.getRegion());
+ vo.setJarCode(basJar.getJarCode());
+ vo.setJarErr(basJar.getJarErr$());
+ vo.setJarMastTableVoList(openService.getJatIdList(vo.getJarNo()));
+ }
+ return R.ok().add(list);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/mesLocStatus")
+ @AppAuth(memo = "搴撳瓨淇℃伅鏌ヨ鎺ュ彛")
+ @Transactional
+ public R mesLocStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "搴撳瓨淇℃伅鏌ヨ鎺ュ彛", request);
+ List<LocDetlMesVo> list = locDetlService.selectLocDetlMesAll();
+ return R.ok().add(list);
+ }
+
+ @PostMapping("/overturn/empty")
+ @AppAuth(memo = "缈昏浆鍚庡厑璁稿洖搴撴帴鍙�")
+ @Transactional
+ public R mesOverturnEmpty(@RequestHeader String appkey,
+ @RequestParam Integer devNo,
+ HttpServletRequest request) {
+ auth(appkey, "绔欑偣鍙�"+devNo, request);
+ RgvOneSign sign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","sign"+devNo));
+ if (Cools.isEmpty(sign)) {
+ return R.error().add("缈昏浆绔欎俊鎭湁璇�");
+ }
+ sign.setRgvOneSign(1);
+ rgvOneSignService.updateById(sign);
+ return R.ok();
+ }
/*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
}
--
Gitblit v1.9.1