Parcourir la source

【华信科小米EDI对接】【7-外部供应商推送ASN箱单信息至小米SRM公用X5同步接口】

wub il y a 3 jours
Parent
commit
043eb023f9

+ 10 - 0
src/main/java/com/uas/eis/controller/ERPController.java

@@ -70,4 +70,14 @@ public class ERPController {
         return erpService.createASN(id);
     }
 
+    /**
+     * 7:外部供应商推送ASN箱单信息至小米SRM公用X5同步接口
+     * @param data
+     * @return
+     */
+    @RequestMapping("/erp/createPACKINGASN")
+    public Map<String, Object> createPACKINGASN(String id){
+        return erpService.createPACKINGASN(id);
+    }
+
 }

+ 1 - 0
src/main/java/com/uas/eis/service/ERPService.java

@@ -15,4 +15,5 @@ public interface ERPService {
     Map<String, Object> closePurchase(String data);
     Map<String, Object> deliInstruction(String data);
     Map<String, Object> createASN(String id);
+    Map<String, Object> createPACKINGASN(String id);
 }

+ 5 - 0
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -471,6 +471,11 @@ public class ERPServiceImpl implements ERPService {
         return result;
     }
 
+    @Override
+    public Map<String, Object> createPACKINGASN(String id) {
+        return null;
+    }
+
     public static String unescapeJsonWithJackson(String jsonString) {
         try {
             ObjectMapper mapper = new ObjectMapper();

+ 6 - 7
src/main/java/com/uas/eis/task/httpclient/EDIX5JsonHttpClient.java

@@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory;
 import javax.xml.bind.DatatypeConverter;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 public class EDIX5JsonHttpClient extends X5HttpClient {
@@ -86,14 +85,14 @@ public class EDIX5JsonHttpClient extends X5HttpClient {
                             "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传成功!','','"+kind+"')");
                     logger.info("时间:"+new Date()+"状态码:"+statusCode);
                     Map<String,Object> datas = (Map<String,Object>) body;
-                    List<Map<String,Object>> list = (List<Map<String,Object>>) datas.get("data");
+  //                  List<Map<String,Object>> list = (List<Map<String,Object>>) datas.get("data");
 //                    if(list.size()>0){
 //                        baseDao.execute("update CUSTOMTABLE set CT_SENDSTATUS='已上传',ct_senddate=sysdate where ct_id="+list.get(0).get("ct_id"));
 //                    }
                 }else{
                     baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
-                            "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败!','状态码:"+x5Response.getHeader().getCode() + " 错误描述:" + x5Response.getHeader().getDesc()+"','"+kind+"')");
-                    Map<String,Object> datas = (Map<String,Object>) body;
+                            "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败1!','状态码:"+x5Response.getHeader().getCode() + " 错误描述:" + x5Response.getHeader().getDesc()+"','"+kind+"')");
+ //                   Map<String,Object> datas = (Map<String,Object>) body;
  //                   ConfirmPurchase confirmPurchase = (ConfirmPurchase) datas.get("data");
 //                    Map<String,Object> datas = (Map<String,Object>) body;
 //                    List<Map<String,Object>> list = (List<Map<String,Object>>) datas.get("data");
@@ -104,8 +103,8 @@ public class EDIX5JsonHttpClient extends X5HttpClient {
 
             } else {
                 baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
-                        "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败!','"+statusLine.getStatusCode() + " " + statusLine.getReasonPhrase()+"','"+kind+"')");
-                Map<String,Object> datas = (Map<String,Object>) body;
+                        "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败2!','"+statusLine.getStatusCode() + " " + statusLine.getReasonPhrase()+"','"+kind+"')");
+   //             Map<String,Object> datas = (Map<String,Object>) body;
  //               ConfirmPurchase confirmPurchase = (ConfirmPurchase) datas.get("data");
 //                Map<String,Object> datas = (Map<String,Object>) body;
 //                List<Map<String,Object>> list = (List<Map<String,Object>>) datas.get("data");
@@ -118,7 +117,7 @@ public class EDIX5JsonHttpClient extends X5HttpClient {
         } catch (Exception ex) {
             x5Response = new X5Response(new X5ResponseHeader("2000", ex.getMessage()));
             baseDao.execute("insert into XIAOMIDOCKINGLOG(ML_ID,ML_DATE,ML_CONTENT,ML_RESULT,ML_TYPE)" +
-                    "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败!','"+ ex.getMessage()+"','"+kind+"')");
+                    "values(XIAOMIDOCKINGLOG_seq.nextval,sysdate,'上传失败3!','"+ ex.getMessage()+"','"+kind+"')");
             Map<String,Object> datas = (Map<String,Object>) body;
 //            ConfirmPurchase confirmPurchase = (ConfirmPurchase) datas.get("data");
 //            List<Map<String,Object>> list = (List<Map<String,Object>>) datas.get("data");