diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod index 1809c7327d74d5627fdb7d8118ff9c4cdb1e0f00..fa40602a53f100fbd2569384414e0730bbf56c84 100644 --- a/entity/Prod2prod_entity/Prod2prod_entity.aod +++ b/entity/Prod2prod_entity/Prod2prod_entity.aod @@ -143,6 +143,10 @@ </entityDependency> </dependencies> </entityIncomingField> + <entityField> + <name>PRODUCTCODE</name> + <title>Product number</title> + </entityField> </entityFields> <recordContainers> <jDitoRecordContainer> @@ -161,6 +165,7 @@ <element>QUANTITY.value</element> <element>OPTIONAL.value</element> <element>TAKEPRICE.value</element> + <element>PRODUCTCODE.value</element> </recordFields> </jDitoRecordContainer> </recordContainers> diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js index 912ab1f560dfdc682fc116a76e7c9a87bd0dc1d6..63f948e2d8fae016448863b53232de4e9dab4f0c 100644 --- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js @@ -10,5 +10,6 @@ var prodid = vars.exists("$param.ProductId_param") if(prodid != "") { var p2pUtils = new Prod2ProdUtils(prodid); + logging.log(p2pUtils.getPartsListForRecordContainer().toSource()) result.object(p2pUtils.getPartsListForRecordContainer()); } \ No newline at end of file diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod index b7a1105b1e8daed148155b53b9d00fc3bb80e22c..8bc614235b7b984595480a379b7cfcddbd86f688 100644 --- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod +++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod @@ -14,14 +14,14 @@ <autoNewRow v="true" /> <entityField>#ENTITY</entityField> <columns> - <neonTableColumn> - <name>296fcc2e-775f-4f05-822e-8e91a9eaa037</name> - <entityField>POS</entityField> - </neonTableColumn> <neonTableColumn> <name>1c681134-4741-4dd6-b4c3-899d98216b72</name> <entityField>PARENTID</entityField> </neonTableColumn> + <neonTableColumn> + <name>5a884b06-880a-4ec4-9405-909548cedd41</name> + <entityField>PRODUCTCODE</entityField> + </neonTableColumn> <neonTableColumn> <name>723600d0-7d3b-4d96-9880-cb5b9ea90002</name> <entityField>SOURCE_ID</entityField> diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js index a85854cd062aecd65a94153ab4e6200949bfaa4c..1f0aa5e226d9babe01ddac32bfb5a716512e53af 100644 --- a/process/Product_lib/process.js +++ b/process/Product_lib/process.js @@ -1,3 +1,4 @@ +import("system.util"); import("system.SQLTYPES"); import("system.datetime"); import("system.db"); @@ -371,7 +372,8 @@ Prod2ProdUtils.prototype.getPartsListObject = function() { * , "SOURCE_ID" * , "QUANTITY" * , "OPTIONAL" - * , "TAKEPRICE"] ] + * , "TAKEPRICE" + * , "PRODUCTCODE"] ] */ Prod2ProdUtils.prototype.getPartsListForRecordContainer = function() { var ret = []; @@ -448,7 +450,7 @@ Prod2ProdUtils.prototype.getParentProdIds = function() { */ Prod2ProdUtils.prototype._initProd2ProdData = function() { if (this.data == undefined) { - var sqlStr = "select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE " + var sqlStr = "select PROD2PRODID, DEST_ID, SOURCE_ID, QUANTITY, OPTIONAL, TAKEPRICE, PRODUCTCODE " + "from PROD2PROD join PRODUCT on PROD2PROD.SOURCE_ID = PRODUCTID " + "order by PRODUCTCODE "; @@ -478,6 +480,7 @@ Prod2ProdUtils.prototype._buildTree = function(supervised) { , quantity: this.data[i][3] , optional: this.data[i][4] , takeprice: this.data[i][5] + , productcode: this.data[i][6] }; } }