#

18516761980

2022-08-31 a5ee5055f053cbb4f13710fc251adbd780f3a43f

 src/main/java/com/slcf/filter/UpdateThread.java

@@ -83,8 +83,9 @@
            updateFlag = false;

            updateWaitPakInData(); // 入库
            sendPickPrintCmd(); // 打印
            updateWaitPakOutData(); // 出库
            updateWaitPakOutData1(); // 出库
//            sendPickPrintCmd(); // 打印
//            updateWaitPakOutData(); // 出库
            // 清空2天前的日志
            sapRequestLogService.clearSapLog();
//            updateWaitCheckData();
@@ -96,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);
@@ -344,7 +349,9 @@
//         logger.info("waitOut:" + count++);
         WaitPakOutBean waitPakOutBean = waitPakOutService.queryWaitPakOutFnh();
         if(waitPakOutBean!=null) {

            waitPakOutBean.setIo_status("Y");
//            waitPakOutService.upWaitPakOut(waitPakOutBean,0);
            waitPakOutService.moveToLog(waitPakOutBean);
         }
      }catch(Exception e) {
         logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
@@ -427,8 +434,6 @@
//            connection1.disconnect();
//         }
//      }

      logger.info("TEST===>>4");

      JSONObject jsObj = new JSONObject();
      try {
@@ -725,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();