From 10e6a9a8adad2226f13a4e4704ca5b2ad5b9ef9a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:49:59 +0800
Subject: [PATCH] 刀具库WMS功能完善
---
src/main/java/com/zy/asrs/controller/DigitalTwinController.java | 118 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
index 06e3892..decee80 100644
--- a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
+++ b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
@@ -232,65 +232,65 @@
// @ManagerAuth
public R warehouseDetail(@RequestParam(required = false) String areaId){
-// digitalTwinService.warehouseDetail(areaId);
+ return digitalTwinService.warehouseDetail(areaId);
- List<DtLocDetailVo> dtLocDetailVoList = new ArrayList<>();
- DtLocDetailVo dtLocDetailVo = new DtLocDetailVo();
- dtLocDetailVo.setLocNo("CA0100202");
- dtLocDetailVo.setLocSts("O");
- dtLocDetailVo.setAreaId(10010L);
- dtLocDetailVo.setAreaName("鍒�鍏峰簱");
- dtLocDetailVo.setRow1(1);
- dtLocDetailVo.setBay1(2);
- dtLocDetailVo.setLev1(2);
-
- LocMast locMast = new LocMast();
- locMast.setLocNo("CA0100202");
- locMast.setLocSts("O");
- locMast.setRow1(1);
- locMast.setBay1(2);
- locMast.setLev1(2);
- dtLocDetailVo.setLocMast(locMast);
-
- LocDetl locDetl = new LocDetl();
- locDetl.setLocNo("CA0100202");
- locDetl.setAreaId(10010L);
- locDetl.setAreaName("鍒�鍏峰簱");
- locDetl.setMatnr("mat10001");
- locDetl.setMaktx("鐗╂枡鍚嶇О");
- locDetl.setAnfme(100.0);
- locDetl.setStandby3("AAA,BBB,CCC");
- dtLocDetailVo.setLocDetl(locDetl);
- dtLocDetailVoList.add(dtLocDetailVo);
-
-
- DtLocDetailVo dtLocDetailVo2 = new DtLocDetailVo();
- dtLocDetailVo2.setLocNo("CA0100202");
- dtLocDetailVo2.setLocSts("O");
- dtLocDetailVo2.setAreaId(10010L);
- dtLocDetailVo2.setAreaName("鍒�鍏峰簱");
- dtLocDetailVo2.setRow1(1);
- dtLocDetailVo2.setBay1(2);
- dtLocDetailVo2.setLev1(2);
-
- LocMast locMast2 = new LocMast();
- locMast2.setLocNo("CA0100203");
- locMast2.setLocSts("O");
- locMast2.setRow1(1);
- locMast2.setBay1(2);
- locMast2.setLev1(3);
- dtLocDetailVo2.setLocMast(locMast2);
-
- LocDetl locDetl2 = new LocDetl();
- locDetl2.setLocNo("CA0100203");
- locDetl2.setAreaId(10010L);
- locDetl2.setAreaName("鍒�鍏峰簱");
- locDetl.setMatnr("mat10001");
- locDetl.setMaktx("鐗╂枡鍚嶇О");
- locDetl.setAnfme(100.0);
- locDetl.setStandby3("AAA1,BBB1,CCC1");
- dtLocDetailVo2.setLocDetl(locDetl2);
- dtLocDetailVoList.add(dtLocDetailVo2);
+// List<DtLocDetailVo> dtLocDetailVoList = new ArrayList<>();
+// DtLocDetailVo dtLocDetailVo = new DtLocDetailVo();
+// dtLocDetailVo.setLocNo("CA0100202");
+// dtLocDetailVo.setLocSts("O");
+// dtLocDetailVo.setAreaId(10010L);
+// dtLocDetailVo.setAreaName("鍒�鍏峰簱");
+// dtLocDetailVo.setRow1(1);
+// dtLocDetailVo.setBay1(2);
+// dtLocDetailVo.setLev1(2);
+//
+// LocMast locMast = new LocMast();
+// locMast.setLocNo("CA0100202");
+// locMast.setLocSts("O");
+// locMast.setRow1(1);
+// locMast.setBay1(2);
+// locMast.setLev1(2);
+// dtLocDetailVo.setLocMast(locMast);
+//
+// LocDetl locDetl = new LocDetl();
+// locDetl.setLocNo("CA0100202");
+// locDetl.setAreaId(10010L);
+// locDetl.setAreaName("鍒�鍏峰簱");
+// locDetl.setMatnr("G01-JT50-ZC32-110-07");
+// locDetl.setMaktx("D32鏂硅偐閾ｅ垁鏌�");
+// locDetl.setAnfme(100.0);
+// locDetl.setStandby3("AAA,BBB,CCC");
+// dtLocDetailVo.setLocDetl(locDetl);
+// dtLocDetailVoList.add(dtLocDetailVo);
+//
+//
+// DtLocDetailVo dtLocDetailVo2 = new DtLocDetailVo();
+// dtLocDetailVo2.setLocNo("CA0100202");
+// dtLocDetailVo2.setLocSts("O");
+// dtLocDetailVo2.setAreaId(10010L);
+// dtLocDetailVo2.setAreaName("鍒�鍏峰簱");
+// dtLocDetailVo2.setRow1(1);
+// dtLocDetailVo2.setBay1(2);
+// dtLocDetailVo2.setLev1(2);
+//
+// LocMast locMast2 = new LocMast();
+// locMast2.setLocNo("CA0100203");
+// locMast2.setLocSts("O");
+// locMast2.setRow1(1);
+// locMast2.setBay1(2);
+// locMast2.setLev1(3);
+// dtLocDetailVo2.setLocMast(locMast2);
+//
+// LocDetl locDetl2 = new LocDetl();
+// locDetl2.setLocNo("CA0100203");
+// locDetl2.setAreaId(10010L);
+// locDetl2.setAreaName("鍒�鍏峰簱");
+// locDetl2.setMatnr("T08-A72500-XXX-CC09-A1");
+// locDetl2.setMaktx("D94126绮鹃晽鍒�澶�");
+// locDetl2.setAnfme(100.0);
+// locDetl2.setStandby3("AAA1,BBB1,CCC1");
+// dtLocDetailVo2.setLocDetl(locDetl2);
+// dtLocDetailVoList.add(dtLocDetailVo2);
// LocDetl locDetl2 = new LocDetl();
@@ -304,7 +304,7 @@
//// locDetlList.add(locDetl);
//// locDetlList.add(locDetl2);
- return R.ok().add(dtLocDetailVoList);
+// return R.ok().add(dtLocDetailVoList);
}
}
--
Gitblit v1.9.1