库存参数修改

src/main/java/com/santos/iost/service/impl/SoSsCustomerServiceImpl.java

@@ -155,6 +155,9 @@ public class SoSsCustomerServiceImpl implements SoSsCustomerService {
             Object data1 = data.get("Data");
             System.out.println(data);
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            masterField.put("objAPIName", apiName);
+//            masterField.put("masterFieldVal", new HashMap<>());
+//            masterField.put("detailFieldVals", new HashMap<>());
             for (Object o : list) {
                 Map map = new HashMap<>();
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);

src/main/java/com/santos/iost/service/impl/SoSsInventoryServiceImpl.java

@@ -57,6 +57,10 @@ public class SoSsInventoryServiceImpl implements SoSsInventoryService {
     @Override
     public Result getDataById(SoSsRequestVo2 soSsRequestVo) {
         String s = new String();
+        String dataId = soSsRequestVo.getDataId();
+        String[] split = dataId.split("--");
+        String batchNumber = split[1];
+        soSsRequestVo.setDataId(split[0]);
         Map map = changeGeta2(soSsRequestVo);
         try {
             s = soSsDao.requestK3Api(Url, JsonUtil.Mapjson(map));
@@ -66,7 +70,7 @@ public class SoSsInventoryServiceImpl implements SoSsInventoryService {
 
         SoSsResponseDate soSsResponseDate = JSON.parseObject(s, SoSsResponseDate.class, Feature.OrderedField);
 
-        Result result = changeResponse(soSsResponseDate);//
+        Result result = changeResponse2(soSsResponseDate, batchNumber);//
 
         return result;
     }
@@ -81,12 +85,14 @@ public class SoSsInventoryServiceImpl implements SoSsInventoryService {
         paramsMap.put("Data", Data);
         return paramsMap;
     }
+
     /*转换请求参数*/
     public Map changeGeta2(SoSsRequestVo2 soSsRequestVo) {
         Map paramsMap = new HashMap();
         paramsMap.put("*FItemShortNo*", soSsRequestVo.getDataId());
         return paramsMap;
     }
+
     //检查ERM日期是否可用作过滤条件
     boolean checkFilter(SoSsRequestVo soSsRequestVo) {
         if (null == soSsRequestVo.getStartTime() && null == soSsRequestVo.getEndTime()) {
@@ -117,7 +123,7 @@ public class SoSsInventoryServiceImpl implements SoSsInventoryService {
 
                 masterField.put("objAPIName", apiName);
                 masterField.put("masterFieldVal", masterFieldVal);
-                masterField.put("detailFieldVals",new HashMap<>());
+                masterField.put("detailFieldVals", new HashMap<>());
                 dataList.add(masterField);
             }
             map.put("totalNum", list.size());
@@ -135,4 +141,48 @@ public class SoSsInventoryServiceImpl implements SoSsInventoryService {
         return result;
     }
 
+    /*转换*/
+    public Result changeResponse2(SoSsResponseDate soSsRequestVo, String batchNumber) {
+        Result result = new Result();
+        Map masterField = new LinkedHashMap<>();
+        try {//字段转换-变化soSsRequestVo的data参数格式 为CRM规定格式
+            Map data = (Map) soSsRequestVo.getData();
+            Object data1 = data.get("DATA");
+            List<Map<String,String>> list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            masterField.put("objAPIName", apiName);
+//            masterField.put("masterFieldVal", new HashMap<>());
+//            masterField.put("detailFieldVals", new HashMap<>());
+            for (Map listDateMap : list) {
+//                Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);
+//                listDateMap.put("批号",null);
+
+                if (!listDateMap.containsKey(批号)||!listDateMap.containsValue(batchNumber)||!listDateMap.get(批号).equals(batchNumber)) {
+                    continue;
+                }
+                Map masterFieldVal = new LinkedHashMap<>();
+                masterFieldVal.put("productCode", listDateMap.get(物料代码));//产品编码
+                masterFieldVal.put("productName", listDateMap.get(物料名称));//产品名称
+                masterFieldVal.put("batchNumber", listDateMap.get(批号));//批号
+                masterFieldVal.put("warehouseName", listDateMap.get(仓库名称));//仓库名称
+                masterFieldVal.put("inventoryQuantity", listDateMap.get(基本单位数量));//库存数量
+
+                masterField.put("objAPIName", apiName);
+                masterField.put("masterFieldVal", masterFieldVal);
+                masterField.put("detailFieldVals", new HashMap<>());
+                break;
+            }
+            soSsRequestVo.setData(masterField);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //将ERP格式变换为CRM格式
+        result.setMessage(soSsRequestVo.getMessage());
+        result.setCode(soSsRequestVo.getStatusCode());
+        result.setData(soSsRequestVo.getData());
+
+        return result;
+    }
+
+
 }

src/main/java/com/santos/iost/service/impl/SoSsMaterialServiceImpl.java

@@ -165,6 +165,9 @@ public class SoSsMaterialServiceImpl implements SoSsMaterialService {
             Map data = (Map) soSsRequestVo.getData();
             Object data1 = data.get("Data");
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            map.put("objAPIName", apiName);
+//            map.put("masterFieldVal", new HashMap<>());
+//            map.put("detailFieldVals", new HashMap<>());
             for (Object o : list) {
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);
                 Map masterFieldVal = new LinkedHashMap<>();

src/main/java/com/santos/iost/service/impl/SoSsReceiptServiceImpl.java

@@ -255,6 +255,9 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
             Map data = (Map) ResponseDate.getData();
             Object data1 = data.get("DATA");
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            masterField.put("objAPIName", apiName);
+//            masterField.put("masterFieldVal", new HashMap<>());
+//            masterField.put("detailFieldVals", new HashMap<>());
             for (Object o : list) {
                 Map map = new HashMap<>();
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);

src/main/java/com/santos/iost/service/impl/SoSsSalesDeliveryServiceImpl.java

@@ -276,6 +276,9 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
             Map data = (Map) ResponseDate.getData();
             Object data1 = data.get("DATA");
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            masterField.put("objAPIName", apiName);
+//            masterField.put("masterFieldVal", new HashMap<>());
+//            masterField.put("detailFieldVals", new HashMap<>());
             for (Object o : list) {
                 Map map = new HashMap<>();
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);

src/main/java/com/santos/iost/service/impl/SoSsSalesInvoiceServiceImpl.java

@@ -252,6 +252,9 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
             Map data = (Map) ResponseDate.getData();
             Object data1 = data.get("DATA");
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+//            masterField.put("objAPIName", apiName);
+//            masterField.put("masterFieldVal", new HashMap<>());
+//            masterField.put("detailFieldVals", new HashMap<>());
             for (Object o : list) {
                 Map map = new HashMap<>();
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);

src/main/java/com/santos/iost/service/impl/SoSsSalesOrderServiceImpl.java

@@ -183,12 +183,10 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
             if (null != soSsResponseDate.getStatusCode() && soSsResponseDate.getStatusCode().equals("200")) {
                 JSONObject fromObject = JSONObject.fromObject(soSsResponseDate.getData().toString());//转换数据类型
                 List list = JSON.parseObject(fromObject.get("Page2").toString(), List.class, Feature.OrderedField);
-//                int i = 1;
                 List<Map> mapList = new ArrayList<>();
                 for (Object o : list) {
                     Map listDateMap = JSON.parseObject(o.toString(), Map.class);
                     Map<String, Object> map = new LinkedHashMap();
-//                    map.put("ERPSystemNumber", code);//主体唯一
                     map.put("ERPUniCode", listDateMap.get("FDetailID2"));//子体唯一
                     map.put("productNumber", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber"));//产品编号
                     map.put("correspondingCode", listDateMap.get("FMapNumber"));//对应代码
@@ -202,10 +200,6 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
                     map.put("totalPriceAndTax", listDateMap.get(FAllAmount));//价税合计
                     map.put("personCharge",personCharge);//业务员
                     mapList.add(map);
-//                    returnDate.put(apiName + i, new ArrayList<Map>() {{
-//                        add(map);
-//                    }});
-//                    i++;
                 }
                 returnDate.put(apiName + "Detail", mapList);
             } else {
@@ -258,11 +252,15 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
     /*转换*/
     public Result changeResponse2(SoSsResponseDate ResponseDate, SoSsRequestVo2 RequestVo) {
         Map<Object, Object> masterField = new LinkedHashMap<>();
+//        masterField.put("objAPIName", apiName);
+//        masterField.put("masterFieldVal", new HashMap<>());
+//        masterField.put("detailFieldVals", new HashMap<>());
         Result result = new Result();
         try {//字段转换-变化soSsRequestVo的data参数格式 为CRM规定格式
             Map data = (Map) ResponseDate.getData();
             Object data1 = data.get("DATA");
             List list = JSON.parseObject(data1.toString(), List.class, Feature.OrderedField);
+
             for (Object o : list) {
                 Map map = new HashMap<>();
                 Object personCharge=new Object();
@@ -285,9 +283,10 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
                 masterField.put("masterFieldVal", masterFieldVal);
                 masterField.put("detailFieldVals", map);
             }
-            ResponseDate.setData(masterField);
         } catch (Exception e) {
             e.printStackTrace();
+        }finally {
+            ResponseDate.setData(masterField);
         }
 
         //将ERP格式变换为CRM格式

src/test/java/com/santos/iost/JintaiDomeApplicationTests.java

@@ -50,7 +50,7 @@ class JintaiDomeApplicationTests {
     @Autowired
     SoSsDao soSsDao;
 
-    @Test
+//    @Test
     void contextLoads() throws Exception {
 //        String s = HttpUtil.get(getTokenUrl);
 //        Map map = JSON.parseObject(s, Map.class);
@@ -75,7 +75,7 @@ class JintaiDomeApplicationTests {
 //        System.out.println(post);
     }
 
-    @Test
+//    @Test
     void dsads() throws Exception {
 //
 //        String s = HttpUtil.get(getTokenUrl);
@@ -114,13 +114,15 @@ class JintaiDomeApplicationTests {
 //        }
     }
 
-    @Test
+//    @Test
     void asd() throws Exception {
         List<String>list = new ArrayList<String>();
         list.add("保护环境");  //向列表中添加数据
         list.add("爱护地球");  //向列表中添加数据
         list.add("从我做起");  //向列表中添加数据
 
+        int[] array ={1,2,3,4,6,7,8,9,10};
+
 
 //        System.out.println(code);
 //        System.out.println(TimeStamp2Date("1641398499000", "yyyy-MM-dd HH:mm:ss"));
@@ -139,7 +141,7 @@ class JintaiDomeApplicationTests {
         String date = new SimpleDateFormat(formats, Locale.CHINA).format(new Date(timestamp));
         return date;
     }
-    @Test
+//    @Test
     public void testTimestamp(){
         Date time = new Date();
         Calendar calendar = Calendar.getInstance();