From 8376b10e8758f4d9121ac1253a405179c75f0913 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 12:35:40 +0800
Subject: [PATCH] 将物料保质期字段改为寿命，并显示出来 新增物料同步的时候判断有无库存，无则修改有则返回
---
src/main/java/com/zy/asrs/controller/DigitalTwinController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
index b19a1a3..32f711c 100644
--- a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
+++ b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
@@ -1,16 +1,20 @@
package com.zy.asrs.controller;
import com.core.common.R;
+import com.zy.asrs.entity.LocChartPie;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.digitaltwin.*;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.DigitalTwinService;
import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -20,14 +24,8 @@
@Resource
private DigitalTwinService digitalTwinService;
-
- /**
- * 鏌ヨ鎵�鏈夊簱浣嶇姸鎬佸拰鐗╂枡-浜屾満搴婁俊鎭寲鏁板瓧瀛敓鐢�
- */
- @RequestMapping(value = "/getAllLocations")
- public R getAllLocations(){
- return digitalTwinService.getAllLocations();
- }
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
/**
* 鏁版嵁鎬昏
@@ -328,5 +326,26 @@
// return R.ok().add(dtLocDetailVoList);
}
+ @RequestMapping(value = "/getAllLocations")
+ public R getAllLocations() {
+ return digitalTwinService.getAllLocations();
+ }
+
+ /** * 鏌ヨ鍦ㄥ簱鏁伴噺绛変俊鎭� */
+ @RequestMapping(value = "/getLocalInfo")
+ public LocChartPie getLocalInfo() {
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ return locUseRate;
+ }
+
+
+ /**
+ * 鏌ヨ鎵�鏈夊簱鐨勫簱瀛樻槑缁�
+ */
+ @RequestMapping(value = "/getLocalDetal")
+ public R getLocalDetal() throws IOException {
+
+ return R.ok(digitalTwinService.getLocalDetal());
+ }
}
--
Gitblit v1.9.1