入库接口bug修改

src/main/java/com/neotel/smfcore/hikvision/HikApi.java

@@ -253,12 +253,16 @@ public class HikApi {
         String apiName="Hik 退料唯一码数量获取接口 (returnMaterialApi): ";
         String apiName="Hik 退料唯一码数量获取接口 (returnMaterialApi): ";
         String url = getUrl(config.addr_4_returnMaterialApi, "returnMaterialApi");
         String url = getUrl(config.addr_4_returnMaterialApi, "returnMaterialApi");
 
 
-//        Map<String, Object> dataMap = new HashMap<String, Object>();
-//        dataMap.put("trayId", trayId);//料盘ID
+//        data	trayId	String	41	是	料盘ID
+//        flag	String	4	是	SMF 亮灯货架
+
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.put("trayId", trayId);//料盘ID
+        dataMap.put("flag", "SMF");//SMF 亮灯货架
 
 
 //        String data = JsonUtil.toJsonStr(dataMap);
 //        String data = JsonUtil.toJsonStr(dataMap);
 //        data		String	41	是	料盘ID
 //        data		String	41	是	料盘ID
-        RequestParam info = new RequestParam(getReqCode(), userName, trayId);
+        RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
         HikApiRequest request = new HikApiRequest(4, url, config.key_4_returnMaterialApi,config.secret_4_returnMaterialApi, info,new Date());
         HikApiRequest request = new HikApiRequest(4, url, config.key_4_returnMaterialApi,config.secret_4_returnMaterialApi, info,new Date());
         log.info(apiName+" 发送" + info.getData());
         log.info(apiName+" 发送" + info.getData());
         boolean needResend = false;
         boolean needResend = false;

src/main/java/com/neotel/smfcore/hikvision/util/HttpHelper.java

@@ -66,7 +66,7 @@ public class HttpHelper {
             if (responseInfo == null) {
             if (responseInfo == null) {
 //            log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
 //            log.error("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
                 log.error("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);
                 log.error("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);
-                responseInfo = new ResponseParam(param.getReqCode(), "-1", "", "");
+                responseInfo = new ResponseParam(param.getReqCode(), -1, "", "");
             } else {
             } else {
 //            log.info("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
 //            log.info("[" + url + "][" + key + "][" + secret + "]发送[" + param.getReqCode() + "][" + param.getUserCode() + "][" + param.getData() + "],返回值：" + result);
                 log.info("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);
                 log.info("[" + url + "][" + key + "][" + secret + "]发送 " + jsonStr + ",返回值：" + result);