From 95cd607717af87a2e8a5fc5c6f9c0c6fbe5ac1c9 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期三, 03 六月 2020 15:12:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/controller/ConsoleController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 7cce864..773b36d 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -6,15 +6,17 @@
import com.zy.client.constant.WcsSystemPropety;
import com.zy.client.domain.enums.SiteStatusType;
import com.zy.client.domain.param.SystemSwitchParam;
-import com.zy.client.domain.vo.CrnLatestDataVo;
-import com.zy.client.domain.vo.SiteLatestDataVo;
+import com.zy.client.domain.vo.*;
+import com.zy.common.CodeRes;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
@@ -23,6 +25,8 @@
@RestController
@RequestMapping("/console")
public class ConsoleController {
+
+ public static AtomicInteger integer = new AtomicInteger();
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -51,22 +55,54 @@
@PostMapping("/site/detail")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(){
- return R.ok();
+ 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(){
- return R.ok();
+ 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(){
@@ -108,8 +144,19 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
-
- return R.ok();
+ integer.getAndIncrement();
+ List<BarcodeDataVo> list = new ArrayList<>();
+ for (int i=1;i<=1;i++){
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId("1");
+ if (integer.get()%5 != 0) {
+ vo.setCodeValue("0");
+ } else {
+ vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
+ }
+ list.add(vo);
+ }
+ return R.ok().add(list);
}
}
--
Gitblit v1.9.1