From c732023df8f25a038d22dd29033c04b562f837e2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:04:27 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/common/web/WcsController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 06b8b18..eb2e779 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -687,11 +687,20 @@
@ResponseBody
public R containerMove(@RequestBody ReplenishmentParam param){
- String devNo = param.getDevNo();
- if(Cools.isEmpty(currentContainerMap)){
- currentContainerMap = new HashMap<>();
+ String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;
+
+ if(Cools.isEmpty(devNo)){
+ return R.error("绔欑偣鏈夎");
}
- String containerCode = currentContainerMap.get(devNo);
+
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ String containerCode = agvBasDevp.getBarcode();
+
+// String devNo = param.getDevNo();
+// if(Cools.isEmpty(currentContainerMap)){
+// currentContainerMap = new HashMap<>();
+// }
+// String containerCode = currentContainerMap.get(devNo);
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
--
Gitblit v1.9.1