瀏覽代碼

NEW: add ref product into BOM tooltips

Florian HENRY 3 年之前
父節點
當前提交
a0fb0b8741
共有 2 個文件被更改,包括 14 次插入2 次删除
  1. 10 0
      htdocs/bom/class/bom.class.php
  2. 4 2
      htdocs/product/stats/bom.php

+ 10 - 0
htdocs/bom/class/bom.class.php

@@ -789,6 +789,16 @@ class BOM extends CommonObject
 		if (isset($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
+		if (!empty($this->fk_product)) {
+			$product = new Product($db);
+			$resultFetch = $product->fetch($this->fk_product);
+			if ($resultFetch < 0) {
+				setEventMessages($product->error, $product->errors, 'errors');
+			} else {
+				$label .= "<br><b>".$langs->trans("Product").'</b>: '.$product->getNomUrl(0,'',0,-1,1);
+			}
+		}
+
 
 		$url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id;
 

+ 4 - 2
htdocs/product/stats/bom.php

@@ -133,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		//Qauntity  to produce
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " b.qty as qty_toproduce";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " WHERE ";
@@ -166,6 +166,7 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$bomtmp->fk_product = $objp->fk_product;
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
 					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
 					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
@@ -180,7 +181,7 @@ if ($id > 0 || !empty($ref)) {
 		$db->free($result);
 
 		//Qauntity  to consume
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " SUM(bl.qty) as qty_toconsume";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
@@ -214,6 +215,7 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$bomtmp->fk_product = $objp->fk_product;
 
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');