BUG 修改

src/main/java/com/spring/ifs/api/BaseSearchApi.java

@@ -602,7 +602,18 @@ public class BaseSearchApi {
                 tempItem.setLeadTimeCode(tempMap.get("LEAD_TIME_CODE"));
                 tempItem.setManufLeadtime(tempMap.get("MANUF_LEADTIME"));
                 tempItem.setExpectedLeadtime(tempMap.get("EXPECTED_LEADTIME"));
-                tempItem.setDurabilityDay(tempMap.get("DURABILITY_DAY"));
+                String durabilityDay = tempMap.get("DURABILITY_DAY");
+                if (null == durabilityDay || "".equals(durabilityDay) || "NULL".equalsIgnoreCase(durabilityDay)){
+                    tempItem.setDurabilityDay("0");
+                }else {
+                    BigDecimal bigDecimal = new BigDecimal(durabilityDay);
+                    // 去除尾部的零
+                    bigDecimal = bigDecimal.setScale(0, BigDecimal.ROUND_HALF_UP);
+                    bigDecimal = bigDecimal.stripTrailingZeros();
+                    // 设置小数位数，最多保留 16 位有效数字
+                    String formatterValue = bigDecimal.toPlainString();
+                    tempItem.setDurabilityDay(formatterValue);
+                }
                 tempItem.setCountryOfOrigin(tempMap.get("COUNTRY_OF_ORIGIN"));
                 tempItem.setRegionOfOrigin(tempMap.get("REGION_OF_ORIGIN"));
                 tempItem.setInventoryValuationMethod(tempMap.get("INVENTORY_VALUATION_METHOD"));

src/main/java/com/spring/ifs/api/BaseSearchApiTest.java

@@ -511,7 +511,7 @@ public class BaseSearchApiTest {
         searchSql.append(" HAZARD_CODE, ACCOUNTING_GROUP, PART_PRODUCT_CODE, PART_PRODUCT_FAMILY, TYPE_DESIGNATION, DIM_QUALITY, 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");
+        searchSql.append(" STD_NAME_ID, ENG_ATTRIBUTE");
         searchSql.append(" FROM ifsapp.INVENTORY_PART");
         searchSql.append(" WHERE OBJVERSION >:ifsRowVersion");
 
@@ -522,6 +522,7 @@ public class BaseSearchApiTest {
         searchSql.append(" ORDER BY OBJVERSION ASC");
         //添加分页的查询语句
         searchSql.append(" OFFSET "+startIndex+" ROWS FETCH NEXT "+pageSize+" ROWS ONLY");
+        logger.info("库存件查询语句sql"+searchSql.toString());
         //调用查询的通用方法
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
@@ -561,7 +562,18 @@ public class BaseSearchApiTest {
                 tempItem.setLeadTimeCode(tempMap.get("LEAD_TIME_CODE"));
                 tempItem.setManufLeadtime(tempMap.get("MANUF_LEADTIME"));
                 tempItem.setExpectedLeadtime(tempMap.get("EXPECTED_LEADTIME"));
-                tempItem.setDurabilityDay(tempMap.get("DURABILITY_DAY"));
+                String durabilityDay = tempMap.get("DURABILITY_DAY");
+                if (null == durabilityDay || "".equals(durabilityDay) || "NULL".equalsIgnoreCase(durabilityDay)){
+                    tempItem.setDurabilityDay("0");
+                }else {
+                    BigDecimal bigDecimal = new BigDecimal(durabilityDay);
+                    // 去除尾部的零
+                    bigDecimal = bigDecimal.setScale(0, BigDecimal.ROUND_HALF_UP);
+                    bigDecimal = bigDecimal.stripTrailingZeros();
+                    // 设置小数位数，最多保留 16 位有效数字
+                    String formatterValue = bigDecimal.toPlainString();
+                    tempItem.setDurabilityDay(formatterValue);
+                }
                 tempItem.setCountryOfOrigin(tempMap.get("COUNTRY_OF_ORIGIN"));
                 tempItem.setRegionOfOrigin(tempMap.get("REGION_OF_ORIGIN"));
                 tempItem.setInventoryValuationMethod(tempMap.get("INVENTORY_VALUATION_METHOD"));
@@ -569,6 +581,7 @@ public class BaseSearchApiTest {
                 tempItem.setInvoiceConsideration(tempMap.get("INVOICE_CONSIDERATION"));
                 tempItem.setZeroCostFlag(tempMap.get("ZERO_COST_FLAG"));
                 tempItem.setPartCostGroupId(tempMap.get("PART_COST_GROUP_ID"));
+                tempItem.setEngAttribute(tempMap.get("ENG_ATTRIBUTE"));
                 String createdDate = tempMap.get("CREATE_DATE");
                 if (!(null == createdDate || "".equals(createdDate))){
                     tempItem.setCreatedDate(DateUtils.getStringToDate(createdDate, "yyyy-MM-dd HH:mm:ss"));

src/main/java/com/spring/ifs/utils/IfsConverterToMap.java

@@ -126,6 +126,8 @@ public class IfsConverterToMap {
                     resultMap.put(key, objValue.toString());
                 } else if (objValue instanceof Integer) {
                     BigDecimal bigDecimal = new BigDecimal((Integer) objValue);
+                    // 去除尾部的零
+                    bigDecimal = bigDecimal.stripTrailingZeros();
                     // 设置小数位数，最多保留 16 位有效数字
                     String formatterValue = bigDecimal.toPlainString();
                     resultMap.put(key, formatterValue);