From 19054a376b84d4aafa9d4f0a9460a9c547e48ec7 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 28 七月 2022 15:23:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/slcf/filter/UpdateThread.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/slcf/filter/UpdateThread.java b/src/main/java/com/slcf/filter/UpdateThread.java
index 8e0d4b0..f3f04c8 100644
--- a/src/main/java/com/slcf/filter/UpdateThread.java
+++ b/src/main/java/com/slcf/filter/UpdateThread.java
@@ -8,6 +8,7 @@
 import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Resource;
 
@@ -71,12 +72,16 @@
 	public void setWaitPakOutService(WaitPakOutService waitPakOutService) {
 		this.waitPakOutService = waitPakOutService;
 	}
+	public static boolean updateFlag = true;
 
 	public void run() {
 		waitPakInService = getWaitPakInService();
 		waitPakOutService = getWaitPakOutService();
 		while(true) {
 			try {
+				if(!updateFlag) return;
+				updateFlag = false;
+
 				updateWaitPakInData(); // 鍏ュ簱
 				sendPickPrintCmd(); // 鎵撳嵃
 				updateWaitPakOutData(); // 鍑哄簱
@@ -86,6 +91,8 @@
 				Thread.sleep(15000);
 			} catch (InterruptedException e) {
 				e.printStackTrace();
+			} finally {
+				updateFlag = true;
 			}
 		}
 	}
@@ -104,6 +111,7 @@
             s = new HttpHandler.Builder()
                     .setUri(url)
                     .setJson(body.toString())
+					.setTimeout(10, TimeUnit.SECONDS)
                     .setHeaders(requestHeader)
                     .build()
                     .doPost();
@@ -326,6 +334,21 @@
 ////			System.out.println(e.getMessage());
 //		}
 		return result;
+	}
+
+	/**
+	 * 澶勭悊鍑哄簱閫氱煡妗f暟鎹�
+	 */
+	private void updateWaitPakOutData1() {
+		try {
+//			logger.info("waitOut:" + count++);
+			WaitPakOutBean waitPakOutBean = waitPakOutService.queryWaitPakOutFnh();
+			if(waitPakOutBean!=null) {
+
+			}
+		}catch(Exception e) {
+			logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
+		}
 	}
 
 	/**
@@ -632,7 +655,7 @@
 //		}
 
 		try {
-//			logger.error("sendPrinCommand2-----寮�濮嬭皟鐢ㄦ墦鍗版帴鍙�" + waitPakOut.getMaktx());
+			logger.error("sendPrinCommand2-----寮�濮嬭皟鐢ㄦ墦鍗版帴鍙�" + waitPakOut.getMatnr() + "--" + waitPakOut.getMaktx());
 			JSONObject jsObj = new JSONObject();
 			JSONArray arr = new JSONArray();
 			for(int i=0;i<1;i++) {
@@ -700,14 +723,16 @@
 //		        }
 ////		        System.out.println(sb.toString());
 //		        JSONObject json = JSONObject.fromObject(sb.toString());
+				logger.error("sendPrinCommand4-----璋冪敤鎵撳嵃鎺ュ彛" + waitPakOut.getTanum() + "==" + waitPakOut.getMatnr() + "==" + waitPakOut.getMaktx());
                 JSONObject json = requestSAP(jsObj, httpUrl);
+
 				String d = json.get("d").toString();
 				JSONObject jsonD = JSONObject.fromObject(d);
 				String Item = jsonD.get("item").toString();
 				JSONObject jsonItem = JSONObject.fromObject(Item);
 				String results = jsonItem.get("results").toString();
 				JSONArray array = JSONArray.fromObject(results);
-				logger.error("sendPrinCommand4-----璋冪敤鎵撳嵃鎺ュ彛" + waitPakOut.getMaktx());
+
 				if(array.size()>0) {
 					for(int i=0;i<array.size();i++){
 						JSONObject job = array.getJSONObject(i);

--
Gitblit v1.9.1