diff --git a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js index bf1e15c4..ddb017ab 100644 --- a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js +++ b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js @@ -210,8 +210,9 @@ function drawComponents(data) { tr.append("" + el.orderNo + ""); tr.append("" + el.orderType + ""); tr.append("" + el.orderStatus + ""); - tr.append("" + el.orderParent + ""); - tr.append("" + el.productKind + ""); + tr.append("" + el.mainProductCode + ""); + tr.append("" + el.orderNo + ""); + tr.append("" + el.productShape + ""); tr.append("" + el.productBrand + ""); tr.append("" + el.orderSendDate + ""); $("#componentsTable > tbody").append(tr); @@ -479,7 +480,7 @@ function updateRawMaterialsPositions() { $("#rawMaterialsTableSum").html(Math.ceil(sum)); } function componentsTablePrototype() { - return '
PozycjaIndeksNazwaIlośćStanZS E5TypStatusOdbiorcaFormaMarkaData wysyłki
0
' + return '
PozycjaIndeksNazwaIlośćStanZS E5TypStatusProdukt głównyZamawiającyFormaMarkaData wysyłki
0
' } function rawMaterialsTablePrototype() { return '
PozycjaIndeksNazwaIlośćJM.StanZamówionoDostawcaZamówienie
0
' diff --git a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.php b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.php index 10649a94..7846464f 100644 --- a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.php +++ b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.php @@ -381,6 +381,7 @@ function getComponents2($ids) { $db = $GLOBALS['db']; global $app_list_strings; $idsString = join("','", $ids); + $mainProduct = $db->fetchByAssoc($db->query(sprintf("SELECT name FROM ecmproducts WHERE id IN ('%s')", $idsString)));; $productsQuery = "SELECT si.ecmproduct_id, SUM(si.quantity) as quantity, s.document_no, s.parent_id, s.parent_name, s.id, s.type, s.status, s.send_date FROM ecmsaleitems AS si @@ -392,6 +393,7 @@ function getComponents2($ids) { $componentsData = array(); while ($r = $db->fetchByAssoc($rows)) { + $mainProduct = $db->fetchByAssoc($db->query(sprintf("SELECT code FROM ecmproducts WHERE id IN ('%s')", $r['ecmproduct_id'])));; $products = getProductComponents($r['ecmproduct_id'], $r['quantity']); foreach ($products as $product) { $prodQuery = sprintf("SELECT p.id, p.code, p.name, p.shape, p.brand, p.ems_qty_in_stock, @@ -399,6 +401,8 @@ function getComponents2($ids) { FROM ecmproducts AS p WHERE p.id = '%s' AND p.deleted = 0", $product['ecmproduct_id']); $p = $db->fetchByAssoc($db->query($prodQuery)); $row = array(); + $row['mainProductId'] = $r['ecmproduct_id']; + $row['mainProductCode'] = $mainProduct['code']; $row['productId'] = $p['id']; $row['productName'] = strlen($p['name']) > 55 ? substr($p['name'], 0, 55) . "..." : $p['name']; $row['productFullName'] = $p['name'];