From 284aa3875e3d441147c576d4185c3cbf717b3427 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 08 三月 2025 13:12:09 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 44 +++++++++++-----------
src/main/java/com/zy/asrs/utils/Utils.java | 7 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 7 ++-
src/main/resources/application-prod.yml | 8 ++--
4 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1ffb332..b64dc70 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -313,6 +313,7 @@
@PostMapping("/outboundTaskSend")
@Transactional
public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) {
+ log.info("浠诲姟涓嬪彂鎺ュ彛璋冪敤={}",hashMap);
String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
List<CarryParam> params= JSONObject.parseArray(jsonString,CarryParam.class);
HashMap<String, Object> map = new HashMap<>();
@@ -336,12 +337,14 @@
LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(Cools.isEmpty(locMast)){
map.put("Code","0");
- map.put("Msg","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+ map.put("Msg",param.getStartPoint()+"鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
return map;
}
+ }
+ for(CarryParam param:params){
HashMap<String,Object> r = new HashMap<>();
-
+ LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(param.getStereoscopicTaskType() == 2){
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ef957cb..ac4efd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -105,28 +105,28 @@
param.setContainerTypeCode(locMast.getContainerTypeCode());
}
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/locationUpdate")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- }catch (Exception e){
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
- }
- JSONObject jsonObject = JSON.parseObject(response);
-
-
- apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
- ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(param)
- ,response
- ,true
- );
+// try {
+// response = new HttpHandler.Builder()
+// .setHeaders(map)
+// .setUri(wmsUrl)
+// .setPath("wcsManager/wcsInterface/locationUpdate")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// }catch (Exception e){
+// log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+// }
+// JSONObject jsonObject = JSON.parseObject(response);
+//
+//
+// apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
+// ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+// ,null
+// ,"127.0.0.1"
+// ,JSON.toJSONString(param)
+// ,response
+// ,true
+// );
return null;
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 91ae550..6a256e4 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -427,7 +427,12 @@
}
public static String Fusion(int x, int y, int z){
- String locNo="0"+x;
+ String locNo="";
+ if(x>=10){
+ locNo=x+"";
+ }else{
+ locNo="0"+x;
+ }
if(z>=10){
locNo=locNo+"0"+z;
}else{
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index bcbe85f..1fa7b31 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.110
+ ip: 10.10.10.1101
port: 102
rack: 0
slot: 0
@@ -29,7 +29,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.120
+ ip: 10.10.10.1201
port: 102
rack: 0
slot: 0
@@ -53,7 +53,7 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.130
+ ip: 10.10.10.1301
port: 102
rack: 0
slot: 0
@@ -77,7 +77,7 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.140
+ ip: 10.10.10.1401
port: 102
rack: 0
slot: 0
--
Gitblit v1.9.1