diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java index 38c92bc3..a6c005eb 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java @@ -556,7 +556,7 @@ public class BaseSearchApi { searchSql.append(" HAZARD_CODE, ACCOUNTING_GROUP, PART_PRODUCT_CODE, PART_PRODUCT_FAMILY, TYPE_DESIGNATION, DIM_QUALITY, TO_CHAR(CREATE_DATE, 'YYYY-MM-DD HH:mm:ss') CREATE_DATE,"); searchSql.append(" NOTE_TEXT, LEAD_TIME_CODE, PURCH_LEADTIME, MANUF_LEADTIME, EXPECTED_LEADTIME, DURABILITY_DAY, COUNTRY_OF_ORIGIN, REGION_OF_ORIGIN,"); searchSql.append(" SUPPLY_CODE, INVENTORY_VALUATION_METHOD, INVENTORY_PART_COST_LEVEL, INVOICE_CONSIDERATION, ZERO_COST_FLAG, PART_COST_GROUP_ID,"); - searchSql.append(" STD_NAME_ID, ENG_ATTRIBUTE"); + searchSql.append(" STD_NAME_ID, ENG_ATTRIBUTE, SUPPLY_CODE, CF$_CCL_COMM_GROUP_3 COMM_GROUP_3"); searchSql.append(" FROM ifsapp.INVENTORY_PART"); searchSql.append(" WHERE OBJVERSION >:ifsRowVersion"); @@ -631,6 +631,8 @@ public class BaseSearchApi { if (!(null == createdDate || "".equals(createdDate))){ tempItem.setCreatedDate(DateUtils.getStringToDate(createdDate, "yyyy-MM-dd HH:mm:ss")); } + tempItem.setSupplyCode(tempMap.get("SUPPLY_CODE")); + tempItem.setCommGroup3(tempMap.get("COMM_GROUP_3")); //添加对象 returnlList.add(tempItem); } diff --git a/src/main/java/com/spring/ifs/api/IfsServer.java b/src/main/java/com/spring/ifs/api/IfsServer.java index 0220b37a..00d04721 100644 --- a/src/main/java/com/spring/ifs/api/IfsServer.java +++ b/src/main/java/com/spring/ifs/api/IfsServer.java @@ -26,6 +26,7 @@ public class IfsServer { Server srv = new Server(); srv.setConnectionString(ifsTargetUrl);// 测试期间使用固定配置文件 srv.setCredentials(username, passWord);//配置文件 + //srv.setRunAs(""); 后续需要修改 return srv; } diff --git a/src/main/java/com/spring/modules/part/entity/APIEntity/PartIfsInventory.java b/src/main/java/com/spring/modules/part/entity/APIEntity/PartIfsInventory.java index d1339ca8..40be0bba 100644 --- a/src/main/java/com/spring/modules/part/entity/APIEntity/PartIfsInventory.java +++ b/src/main/java/com/spring/modules/part/entity/APIEntity/PartIfsInventory.java @@ -129,4 +129,8 @@ public class PartIfsInventory extends PartIfsCatalog { * 模板编码 */ private String engAttribute; + + private String supplyCode; + private String commGroup3; + }