From d96bca6d90995106d373e71f266bf4ee98e446c2 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 01 四月 2025 16:32:33 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/WmsService.java | 4 ++--
src/main/java/com/whyc/controller/InterfaceWmsController.java | 4 ++--
src/main/java/com/whyc/pojo/db_alarm/BattStationTempAlarm.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 0430db5..c1f0225 100644
--- a/src/main/java/com/whyc/controller/InterfaceWmsController.java
+++ b/src/main/java/com/whyc/controller/InterfaceWmsController.java
@@ -57,9 +57,9 @@
}
@GetMapping("getPalletList")
- public Response getPalletList(){
+ public Response getPalletList(@RequestParam int MaterialType,@RequestParam int PalletStatus){
- return service.getPalletList();
+ return service.getPalletList(MaterialType,PalletStatus);
}
/**
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattStationTempAlarm.java b/src/main/java/com/whyc/pojo/db_alarm/BattStationTempAlarm.java
index 81b1508..2581ac6 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattStationTempAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattStationTempAlarm.java
@@ -15,7 +15,7 @@
* 鐢垫睜鏈烘埧娓╁害鍛婅,鍏釜鐢垫睜鏈烘埧
*/
@ApiModel(value="鐢垫睜鏈烘埧娓╁害鍛婅")
-@TableName(schema = "db_alarm",value = "tb_alarm_temp_alarm")
+@TableName(schema = "db_alarm",value = "tb_batt_station_temp_alarm")
@Data
@ToString
public class BattStationTempAlarm {
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index e886ae5..fd8773e 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -96,8 +96,8 @@
return response;
}
- public Response getPalletList() {
- String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_pallet/get_all";
+ public Response getPalletList(int MaterialType, int PalletStatus) {
+ String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_pallet/get_all?MaterialType="+MaterialType+"&PalletStatus="+PalletStatus;
Response response = HttpUtil.doGet(httpUrl, (String) null);
//瀵圭粨鏋滆繘琛屽鐞�
if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
--
Gitblit v1.9.1