From 1059492cab966417e1cadd41f5d091cee5af1a8b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 25 四月 2025 15:10:18 +0800
Subject: [PATCH] 变更返回字段格式
---
src/main/java/com/whyc/service/WmsService.java | 11 ++++++++++-
src/main/java/com/whyc/controller/InterfaceWmsController.java | 5 +++++
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterfaceWmsController.java b/src/main/java/com/whyc/controller/InterfaceWmsController.java
index 49b3081..6f0982a 100644
--- a/src/main/java/com/whyc/controller/InterfaceWmsController.java
+++ b/src/main/java/com/whyc/controller/InterfaceWmsController.java
@@ -76,6 +76,11 @@
return service.getLocationList();
}
+ /**
+ * @param MaterialType 0=鑾峰彇鎵�鏈夈��1=杞藉叿銆�2=鐢垫睜
+ * @param PalletStatus 0=搴撲綅銆�1=鑾峰彇鎵�鏈夈��4=寰呭嚭搴�
+ * @return
+ */
@GetMapping("getPalletList")
public Response getPalletList(@RequestParam int MaterialType,@RequestParam int PalletStatus){
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index ea4c01d..ceb2527 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -5,6 +5,7 @@
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_abe_ram.AbeInf;
+import com.whyc.pojo.db_wms.BattWarehouse;
import com.whyc.pojo.db_wms.Task;
import com.whyc.util.HttpUtil;
import com.whyc.util.JsonUtil;
@@ -25,6 +26,9 @@
@Autowired
private AbeInfService abeInfService;
+
+ @Autowired
+ private BattWarehouseService battWarehouseService;
public Response getMaterialList() {
String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_material/get_all";
@@ -105,7 +109,7 @@
String startLocationCode = taskDto.getStartlocation_code();
//1=鎼繍绌烘墭,2=鎼繍鐢垫睜. 杞寲鍒板瓧娈礑es涓�,1001=鎼繍绌烘墭,1002=鎼繍鐢垫睜
Integer type = taskDto.getType();
- String taskNo = responseInside.getTask_no();
+ String taskNo = (String) responseInside.getTask_no().get(0);
Task task = new Task();
task.setTaskNo(taskNo);
@@ -234,6 +238,11 @@
task.setActivationChamberStartTime(statusTime);
}break;
case 14:
+ //寮�濮嬪彇娲诲寲缁撴潫鐨勭數姹�,濡傛灉浠诲姟缂栧彿鍦ㄦ洿鏂扮數姹犱粨搴撲腑瀛樺湪,鍒欐洿鏂版椿鍖栨椂闂翠负褰撳墠鏃堕棿
+ BattWarehouse battWarehouse =battWarehouseService.getByTaskNo(taskNo);
+ if(battWarehouse != null){
+ battWarehouseService.finishActivationById(battWarehouse.getId());
+ }
task.setActivationChamberPickUpTime(statusTime);break;
case 24:
//娴嬪帇浠诲姟,寮�濮嬪彇娴嬪帇缁撴潫鐨勭數姹�. 璇诲彇abe_inf琛ㄤ腑鐨勫唴闃�,鎻掑叆鍒颁换鍔￠噷
--
Gitblit v1.9.1