调整物料接口、

src/main/java/com/uas/eis/entity/Product.java

@@ -44,6 +44,36 @@ public class Product implements Serializable {
     private String pr_kind;
     @JSONField(name = "erpLoc")
     private String pr_whcode;
+    @JSONField(name = "mesUser")
+    private String mesUser;
+    @JSONField(name = "mesPwd")
+    private String mesPwd;
+    @JSONField(name = "flag")
+    private int flag;
+
+    public String getMesUser() {
+        return mesUser;
+    }
+
+    public void setMesUser(String mesUser) {
+        this.mesUser = mesUser;
+    }
+
+    public String getMesPwd() {
+        return mesPwd;
+    }
+
+    public void setMesPwd(String mesPwd) {
+        this.mesPwd = mesPwd;
+    }
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public void setFlag(int flag) {
+        this.flag = flag;
+    }
 
     public String getPr_kh_user() {
         return pr_kh_user;

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -2,6 +2,7 @@ package com.uas.eis.service.Impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.uas.eis.core.support.TokenProperties;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.Make;
@@ -38,8 +39,11 @@ public class ERPServiceImpl implements ERPService {
                 "pr_serial ,nvl(pr_validdays,0) pr_validdays ,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102" +
                 " ,pr_kind ,pr_whcode from product where pr_id=?",
                 new BeanPropertyRowMapper<Product>(Product.class),store.get("pr_id"));
-        Map map = JSON.parseObject(JSON.toJSONString(product), Map.class);
-        map.put("flag",store.get("flag"));
+        product.setFlag(Integer.parseInt(StringUtil.nvl(store.get("flag"),"0")));
+        product.setMesUser(tokenConfig.get("mesUser"));
+        product.setMesPwd(tokenConfig.get("mesPwd"));
+        HashMap<String, String> map = new HashMap<>();
+        map.put("Json",JSON.toJSONString(product, SerializerFeature.WriteMapNullValue));
         return syncMES(map,tokenConfig.get("syncProduct"));
 
     }
@@ -60,19 +64,16 @@ public class ERPServiceImpl implements ERPService {
         MakeMaterial makeMaterial = baseDao.getJdbcTemplate().queryForObject("select * from MakeMaterial left join " +
                         "Product on mm_prodcode=pr_code where mm_id=?",
                 new BeanPropertyRowMapper<MakeMaterial>(MakeMaterial.class),store.get("mm_id"));
-        Map map = JSON.parseObject(JSON.toJSONString(makeMaterial), Map.class);
+        Map map = JSON.parseObject(JSON.toJSONString(makeMaterial, SerializerFeature.WriteMapNullValue), Map.class);
         map.put("flag",store.get("flag"));
         return syncMES(map,tokenConfig.get("syncMakeBaseDetail"));
     }
 
-    private String syncMES(Map<String,String> map,String url){
-        map.put("mesUser",tokenConfig.get("mesUser"));
-        map.put("mesPwd",tokenConfig.get("mesPwd"));
+    private String syncMES(Map<String,String> params,String url){
         try {
             HashMap<String, String> header = new HashMap<>();
             header.put("Content-Type","application/json");
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("data", StringUtil.nvl(map,""));
+            System.err.println(params);
             HttpUtil.Response response = HttpUtil.sendPostRequest(tokenConfig.get("mesHttp") + url, header, params);
             JSONObject jsonObject = JSON.parseObject(response.getResponseText());
             int code = jsonObject.getIntValue("result");

src/main/resources/api_sign_key_mapping.properties

@@ -1,7 +1,7 @@
 BOYT=f9d17c1047fd468081e39ce33bb41bb7
 mesUser=ERP
 mesPwd=erp.com
-mesHttp=http://192.168.16.224:8088/mrs/
+mesHttp=http://218.17.190.142:9910/mrs/
 syncProduct=updateItemByErp
 syncMakeBase=updateProdByErp
 syncMakeBaseDetail=updateProdBomByErp