From b909f4e136ca3182befba9510fd0ccc13f6a784f Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 21 三月 2024 16:05:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrk.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 +++++++++--
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 16 ++++++++--------
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 2 +-
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 93bb195..34f7fda 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -218,7 +218,7 @@
headParam.put("status",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
+// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
// .setHeaders(headParam)
@@ -227,9 +227,9 @@
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
-
+ log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms", taskWrk);
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
,null
,"127.0.0.1"
@@ -238,7 +238,7 @@
,true
);
}catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触", taskWrk);
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触", taskWrk);
throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
locMastService.updateById(locMast);
@@ -272,7 +272,7 @@
headParam.put("status",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
+// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
// .setHeaders(headParam)
@@ -281,9 +281,9 @@
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
-
+ log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms", taskWrk);
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
,null
,"127.0.0.1"
@@ -292,7 +292,7 @@
,true
);
}catch (Exception e){
- log.error("wcs鎵嬪姩瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk);
+ log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触", taskWrk);
throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 677c090..379fd46 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -50,7 +50,7 @@
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a4ea3e0..00b8ea0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -997,6 +997,8 @@
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
String response;
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam);
+
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
@@ -1004,7 +1006,11 @@
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", response);
+
+// JSONObject jsonObject = JSON.parseObject(response);
+// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", jsonObject);
+
apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
,null
@@ -1015,7 +1021,8 @@
);
}catch (Exception e){
log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e);
+// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index bc0e484..9840a1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -144,7 +144,7 @@
headParam.put("status",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
+// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
// .setHeaders(headParam)
--
Gitblit v1.9.1