From 93c192a2dded7c8fc6b64b556a4e263d390b45d1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 13 七月 2024 15:27:35 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionLog.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 10 ++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index c002a4f..ed35e06 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -254,6 +254,7 @@
map.put("message", "澶辫触锛岃姹傚弬鏁颁负绌�");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
if (Cools.isEmpty(param.getRequestPK()) || Cools.isEmpty(param.getContNo()) || Cools.isEmpty(param.getTrkPrty()) || Cools.isEmpty(param.getToPos())){
@@ -261,6 +262,7 @@
map.put("message", "澶辫触锛岃姹傚弬鏁颁负绌�");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
@@ -270,6 +272,7 @@
map.put("message", "澶辫触锛屽瓨鍦ㄧ浉鍚岀紪鍙风殑浠诲姟");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
String sta = "06YZ";
@@ -285,6 +288,7 @@
map.put("message", httpRequest);
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}catch (Exception e){
@@ -292,6 +296,7 @@
map.put("message", "杞彂AGV浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}
@@ -311,6 +316,7 @@
map.put("message", "鐢熸垚浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}finally {
int code = (int) inTask.get("code");
@@ -343,6 +349,7 @@
map.put("message", "鐢熸垚浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}finally {
int code = (int) outTask.get("code");
@@ -369,6 +376,7 @@
map.put("message", httpRequest);
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}catch (Exception e){
@@ -376,6 +384,7 @@
map.put("message", "杞彂AGV浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
@@ -385,6 +394,7 @@
map.put("result", "");
map.put("requestPK", param.getRequestPK());
}
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
public static String getWMStoWCSLocNo(String loc){
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionLog.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionLog.java
index b7a6c52..1216bff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionLog.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionLog.java
@@ -48,7 +48,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
index e29d998..fe73d77 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java
@@ -33,7 +33,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
--
Gitblit v1.9.1