From 65fa066e222f6472badf7323c3b301417b674fdb Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 28 七月 2022 19:30:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/slcf/filter/UpdateThread.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/slcf/filter/UpdateThread.java b/src/main/java/com/slcf/filter/UpdateThread.java
index 42b17a2..bca1b66 100644
--- a/src/main/java/com/slcf/filter/UpdateThread.java
+++ b/src/main/java/com/slcf/filter/UpdateThread.java
@@ -83,9 +83,9 @@
 				updateFlag = false;
 
 				updateWaitPakInData(); // 鍏ュ簱
-				updateWaitPakOutData1(); // 鍑哄簱
-//				sendPickPrintCmd(); // 鎵撳嵃
-//				updateWaitPakOutData(); // 鍑哄簱
+//				updateWaitPakOutData1(); // 鍑哄簱
+				sendPickPrintCmd(); // 鎵撳嵃
+				updateWaitPakOutData(); // 鍑哄簱
 				// 娓呯┖2澶╁墠鐨勬棩蹇�
 				sapRequestLogService.clearSapLog();
 //				updateWaitCheckData();
@@ -97,26 +97,30 @@
 			}
 		}
 	}
+
     public JSONObject requestSAP(JSONObject body, String url) {
 		logger.info(url);
         JSONObject resp;
 
-            HashMap<String, Object> requestHeader = new HashMap<>();
-            requestHeader.put("Accept", "application/json");
-            requestHeader.put("Content-Type", "application/json");
-            requestHeader.put("X-Requested-With", "X");
-            requestHeader.put("Authorization","Basic TElRSTpzdGFydDEu");
-            requestHeader.put("sap-client","100");
+		HashMap<String, Object> requestHeader = new HashMap<>();
+		requestHeader.put("Accept", "application/json");
+		requestHeader.put("Content-Type", "application/json");
+		requestHeader.put("X-Requested-With", "X");
+		requestHeader.put("Authorization","Basic TElRSTpzdGFydDEu");
+		requestHeader.put("sap-client","100");
         String s = null;
         try {
             s = new HttpHandler.Builder()
                     .setUri(url)
                     .setJson(body.toString())
-					.setTimeout(10, TimeUnit.SECONDS)
+					.setTimeout(20, TimeUnit.SECONDS)
                     .setHeaders(requestHeader)
                     .build()
                     .doPost();
         } catch (IOException e) {
+			logger.error("SAP璇锋眰鎺ュ彛澶辫触=URL==>>" + body.toString());
+        	logger.error("SAP璇锋眰鎺ュ彛澶辫触=JSON==>>" + body.toString());
+			logger.error("SAP璇锋眰鎺ュ彛澶辫触=JSON==>>" + e.getMessage());
             throw new RuntimeException(e);
         }
         resp = JSONObject.fromObject(s);
@@ -726,7 +730,7 @@
 //		        JSONObject json = JSONObject.fromObject(sb.toString());
 				logger.error("sendPrinCommand4-----璋冪敤鎵撳嵃鎺ュ彛" + waitPakOut.getTanum() + "==" + waitPakOut.getMatnr() + "==" + waitPakOut.getMaktx());
                 JSONObject json = requestSAP(jsObj, httpUrl);
-
+				logger.error("sendPrinCommand44-----鎵撳嵃鎺ュ彛SAP杩斿洖鏁版嵁===>>" + json.toString());
 				String d = json.get("d").toString();
 				JSONObject jsonD = JSONObject.fromObject(d);
 				String Item = jsonD.get("item").toString();

--
Gitblit v1.9.1