From 2a7cc6362c30860c2f18a808b159dda2109fd728 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 16:48:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 148 ++++++++++++++++++++++++++++++------------------
1 files changed, 92 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 114310d..542a597 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -6,6 +6,10 @@
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.BasDevp;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -33,6 +37,10 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
public static AtomicInteger integer = new AtomicInteger();
@@ -59,62 +67,6 @@
Thread.sleep(2000L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
- }
-
- @PostMapping("/site/detail")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam String siteId){
- if (Cools.isEmpty(siteId)){
- return R.parse(CodeRes.EMPTY);
- }
- SiteDetailVo vo = new SiteDetailVo();
- vo.setDevpNo(siteId);
- vo.setWorkNo("9998");
- vo.setWorkStatus("2.璁惧涓婄Щ鍔�");
- vo.setAutoing("Y");
- vo.setLoading("Y");
- vo.setCanining("N");
- vo.setCanouting("Y");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setSourceStock("");
- vo.setStock("");
- return R.ok().add(vo);
- }
-
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam String crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- vo.setCrnNo(crnNo);
- vo.setWorkNo("3387");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStock("");
- vo.setStock("05050040");
- vo.setCrnStatus("鍙栬揣涓�");
- vo.setError("0");
- return R.ok().add(vo);
- }
-
- @Deprecated
- @PostMapping("/site/update")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
- return R.ok();
- }
-
- @Deprecated
- @PostMapping("/crn/update")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
- return R.ok();
}
/****************************************************************/
@@ -174,4 +126,88 @@
return R.ok().add(list);
}
+ /****************************************************************/
+ /************************** 璇︽儏鎿嶄綔 ******************************/
+ /****************************************************************/
+
+ @PostMapping("/site/detail")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
+ public R siteDetail(@RequestParam Integer siteId){
+ if (Cools.isEmpty(siteId)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ SiteDetailVo vo = new SiteDetailVo();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ StaProtocol staProtocol = devpThread.getStation().get(siteId);
+ if (staProtocol != null) {
+ BasDevp basDevp = basDevpService.selectById(siteId);
+ if (basDevp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
+ vo.setDevpNo(siteId); // 绔欑偣缂栧彿
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+
+ if (staProtocol.getWorkNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ if (wrkMast != null) {
+ vo.setWorkStatus(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setSourceStock(wrkMast.getSourceLocNo$());
+ vo.setStock(wrkMast.getLocNo$());
+ }
+ }
+
+ vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+
+ vo.setCanining(basDevp.getCanining()); // 鑳藉叆
+ vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
+
+ return R.ok().add(vo);
+ }
+ }
+ }
+ return R.error();
+
+ }
+
+ @PostMapping("/crn/detail")
+ @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
+ public R crnDetail(@RequestParam String crnNo){
+ if (Cools.isEmpty(crnNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ CrnDetailVo vo = new CrnDetailVo();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo("3387");
+ vo.setSourceStaNo("2303");
+ vo.setStaNo("2410");
+ vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
+ vo.setIoType("1.鍏ュ簱");
+ vo.setSourceStock("");
+ vo.setStock("05050040");
+ vo.setCrnStatus("鍙栬揣涓�");
+ vo.setError("0");
+ return R.ok().add(vo);
+ }
+
+ @Deprecated
+ @PostMapping("/site/update")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
+ public R updateSite(){
+ return R.ok();
+ }
+
+ @Deprecated
+ @PostMapping("/crn/update")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
+ public R updateCrn(){
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1