From 571a106d5537acc98d5a0f65444c4172b945cf8d Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 25 七月 2024 17:11:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4c88b9e..cf3b4b0 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,11 +7,12 @@
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.param.*;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.OpenService;
+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;
@@ -42,6 +43,8 @@
private BasDevpService basDevpService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private BasJarService basJarService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -354,6 +357,32 @@
}
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);
+ }
/*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
}
--
Gitblit v1.9.1