diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java index e5ace4ec..4780b6a1 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java @@ -58,7 +58,7 @@ public class OverallConstant { prodOverPublic.put("custdocSaveCode", "8000370062");//客商档案新增 prodOverPublic.put("custdocSave", "/u8cloud/api/uapbd/custdoc/insert");//客商档案新增 prodOverPublic.put("custdocQuery", "/u8cloud/api/uapbd/custdoc/query");//客商档案查询 - prodOverPublic.put("custdocUpdate", "/u8cloud/api/uapbd/custdoc/update");//客商档案修改 + prodOverPublic.put("custdocUpdate", "8000370040");//客商档案修改 prodOverPublic.put("custdocAssignCode", "8000370001");//客商档案分配 prodOverPublic.put("custdocAssign", "/u8cloud/api/uapbd/custdoc/assign");//客商档案分配 prodOverPublic.put("custmandocSave", "/u8cloud/api/uapbd/custmandoc/insert");//客商档案新增 @@ -85,14 +85,15 @@ public class OverallConstant { devOverAll.put("u8cApiUrl", "http://39.170.109.90:9099");//测式U8C devOverAll.put("u8cApiUsercodePK", "admin"); - devOverAll.put("u8cApiPasswordPK", "83f1ad3e7fa3617f1aae62ae7413c810"); + devOverAll.put("u8cApiPasswordPK", "cbc3df059791996e4cce8e4ac51f4f8e"); devOverAll.put("u8cApiTrantypePK", "pk"); devOverAll.put("u8cApiSystemPK", "lz"); devOverAll.put("u8cApiNeedStackTracePK", "Y"); devOverAll.put("u8cApiZdrPK", "TB_NEW100000000004OP");//单据制单人---测试环境:tbadmin devOverAll.put("u8cApiUsercodeCode", "admin1"); - devOverAll.put("u8cApiPasswordCode", "83f1ad3e7fa3617f1aae62ae7413c810"); +// devOverAll.put("u8cApiPasswordCode", "83f1ad3e7fa3617f1aae62ae7413c810"); + devOverAll.put("u8cApiPasswordCode", "f7fcde654e968541cc803c4b08c30abb"); devOverAll.put("u8cApiTrantypeCode", "code"); devOverAll.put("u8cApiSystemCode", "lz1"); devOverAll.put("u8cApiNeedStackTraceCode", "Y"); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java index 9fe19c2c..e88a1517 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java @@ -298,13 +298,15 @@ public class SupplierPluginInitializer extends PluginBaseEntity { String def1_old = bdCubasdocEntity.getDef1(); String[] def1_split_old = def1_old.split(","); // 将数组转换为列表 + List def1_all=new ArrayList<>(); List def1_list_old = Arrays.asList(def1_split_old);//u8c里已有的def1 + def1_all.addAll(def1_list_old); for (String s_new : def1_new) { if (!def1_list_old.contains(s_new)) { - def1_list_old.add(s_new); + def1_all.add(s_new); } } - def1 = String.join(",", def1_list_old); + def1 = String.join(",", def1_all); CustdocEntityDto parentvo = new CustdocEntityDto(); CustdocRequestVo CustdocEntityDto = new CustdocRequestVo(); @@ -383,7 +385,6 @@ public class SupplierPluginInitializer extends PluginBaseEntity { InterfaceParamByU8CApiDto interfaceParamDto = new InterfaceParamByU8CApiDto(); interfaceParamDto.setApi("ofs.vendor.search"); supplierEntity.setClientCode("LETS"); - supplierEntity.setPageNo("1"); supplierEntity.setPageNo(String.valueOf(pageNo)); supplierEntity.setPageSize("500"); interfaceParamDto.setData(JSON.toJSONString(supplierEntity)); @@ -392,7 +393,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { if (unified.getData() == null || unified.getData().size() == 0) { return null; } - + all.addAll(unified.getData()); int count = unified.getData().size(); while (count >= 500) {//>=500,可能还有下一页。