结算单推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/config/InterfaceConnUtils.java

@@ -17,6 +17,8 @@ import java.io.UnsupportedEncodingException;
 
 //U8第三方接口调用
 public class InterfaceConnUtils {
+    private static final String U8_URL="http://192.168.1.103:";
+//private static final String U8_URL="http://192.168.5.170:";
     public static JSONArray doPost(JSONArray json, String url) {
         //定义测试返回JSON
         for (int i=0;i<json.size();i++){
@@ -25,9 +27,9 @@ public class InterfaceConnUtils {
         }
         JSONArray onejb = new JSONArray();
         HttpClient httpClient = new DefaultHttpClient();
-        HttpPost httpPost=new HttpPost("http://192.168.1.103:8087/api/U8Server/"+url);
+        HttpPost httpPost=new HttpPost(U8_URL+"8087/api/U8Server/"+url);
         if(url.equals("purchasesettle_import")){
-            httpPost=new HttpPost("http://192.168.1.103:10006/api/U8Server/"+url);
+            httpPost=new HttpPost(U8_URL+"10006/api/U8Server/"+url);
         }
         httpPost.setHeader("Content-Type", "application/json");
         String tokenCode = "sap:Cwa1QJrhfhtXbzSGZi94ydBPNQCPbmz7";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -253,6 +253,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 updateWrapper.set("time_Stuta","5");
 				 syShippingOrderMapper.update(null,updateWrapper);
 			 }
+			 StringBuilder sbMessage = new StringBuilder();
 			 for (SyShippingOrder order : orderList){
 				 order.setFailMesage("");
 				 Map<String,Object> codeMaps=new HashMap<>();
@@ -266,6 +267,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 syPackingListFabricController.pushPurchasesettle(order.getId(),codeMaps);
 				 }
 				 order.setTimeStuta(Integer.parseInt(codeMaps.get("time_Stuta").toString()));
+				 sbMessage.append(order.getShippingOrderNumber()+"发票推送信息："+codeMaps.get("message").toString()+"，结算单推送信息："+codeMaps.get("error").toString()+"。\n");
 				 if(codeMaps.get("message").toString().length()>2){
 					 String names=codeMaps.get("message").toString();
 					 order.setTimeMesage(names.substring(1,names.length()-1));
@@ -280,7 +282,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 }
 				 syShippingOrderMapper.updateById(order);
 			 }
-			 System.out.println("orderList\t"+orderList.size());
+			 result.setMessage(sbMessage.toString());
+			 //System.out.println("orderList\t"+orderList.size());
 		 }catch (Exception ex){
 			 log.error("托书批量推送U8任务异常",ex);
 		 }