Show SerialNo attribute + trl (#10664)

* consider extracting SerialNo attribute * fix naming and trls
metasfresh · Feb 18, 2021 · addcd4f · addcd4f
1 parent bd98853
commit addcd4f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...n/sql/postgresql/system/10-de.metas.adempiere/5579540_sys_SerialNo_attribute_fix_name.sql b/...n/sql/postgresql/system/10-de.metas.adempiere/5579540_sys_SerialNo_attribute_fix_name.sql
@@ -0,0 +1,5 @@
+-- 2021-02-18T08:38:09.652Z
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE M_Attribute SET Name='S/N',Updated=TO_TIMESTAMP('2021-02-18 10:38:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE M_Attribute_ID=540034
+;
+
diff --git a/.../main/sql/postgresql/system/40-sw01_swat/5579530_sys_rename_picking_related_sysconfig.sql b/.../main/sql/postgresql/system/40-sw01_swat/5579530_sys_rename_picking_related_sysconfig.sql
@@ -0,0 +1,5 @@
+-- 2021-02-18T08:32:34.031Z
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+UPDATE AD_SysConfig SET Name='de.metas.ui.web.pickingV2.productsToPick.rows.ProductsToPickRow.field.huCode.IsDisplayed',Updated=TO_TIMESTAMP('2021-02-18 10:32:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=541353
+;
+
diff --git a/...b.base/src/main/java/de/metas/ui/web/pickingV2/productsToPick/rows/ProductsToPickRow.java b/...b.base/src/main/java/de/metas/ui/web/pickingV2/productsToPick/rows/ProductsToPickRow.java
@@ -108,12 +108,12 @@ public static ProductsToPickRow cast(final IViewRow row)
 			widgetSize = WidgetSize.Small)
 	private final LookupValue locator;
 
-	public static final String FIELD_HUValue = "huValue";
+	public static final String FIELD_HUValue = "huCode";
 	@ViewColumn(fieldName = FIELD_HUValue, widgetType = DocumentFieldWidgetType.Text,
-			captionKey = "HUValue",
+			captionKey = "HUCode",
 			displayed = Displayed.SYSCONFIG, displayedSysConfigPrefix = SYSCONFIG_PREFIX,
 			widgetSize = WidgetSize.Small)
-	private final String huValue;
+	private final String huCode;
 
 	public static final String FIELD_SerialNo = "serialNo";
 	@ViewColumn(fieldName = FIELD_SerialNo, widgetType = DocumentFieldWidgetType.Text,
@@ -198,7 +198,7 @@ private ProductsToPickRow(
 			//
 			final LookupValue locator,
 			//
-			final String huValue,
+			final String huCode,
 			final String serialNo,
 			final String lotNumber,
 			final LocalDate expiringDate,
@@ -230,7 +230,7 @@ private ProductsToPickRow(
 		this.huReservedForThisRow = huReservedForThisRow;
 
 		this.locator = locator;
-		this.huValue = huValue;
+		this.huCode = huCode;
 		this.serialNo = serialNo;
 		this.lotNumber = lotNumber;
 		this.expiringDate = expiringDate;

diff --git a/.../de/metas/ui/web/pickingV2/productsToPick/rows/factory/ProductsToPickRowsDataFactory.java b/.../de/metas/ui/web/pickingV2/productsToPick/rows/factory/ProductsToPickRowsDataFactory.java
@@ -112,6 +112,7 @@ public final class ProductsToPickRowsDataFactory
 	public static final AttributeCode ATTR_RepackNumber = AttributeCode.ofString(ATTR_RepackNumber_String);
 
 	private static final ImmutableSet<AttributeCode> ATTRIBUTES = ImmutableSet.of(
+			ATTR_SerialNo,
 			ATTR_LotNumber,
 			ATTR_BestBeforeDate,
 			ATTR_RepackNumber);
@@ -485,7 +486,7 @@ private ProductsToPickRow createRow(
 				.locator(locator)
 				//
 				// Attributes:
-				.huValue(pickFromHUId != null ? String.valueOf(pickFromHUId.getRepoId()) : null)
+				.huCode(pickFromHUId != null ? String.valueOf(pickFromHUId.getRepoId()) : null)
 				.serialNo(attributes.getValueAsStringIfExists(ATTR_SerialNo).orElse(null))
 				.lotNumber(attributes.getValueAsStringIfExists(ATTR_LotNumber).orElseGet(() -> buildLotNumberFromHuId(pickFromHUId)))
 				.expiringDate(attributes.getValueAsLocalDateIfExists(ATTR_BestBeforeDate).orElse(null))