lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MRP

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-06 02:55:09 +01:00
parent 58ff3e563d
commit 0e496d2191
2 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
htdocs/mrp/mo_production.php
View File

@ -182,26 +182,40 @@ if (empty($reshook))
} }
} }
if (! $error) { $idstockmove = 0;
// Record consumption if (! $error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
$moline = new MoLine($db);
$result = $moline->create($user);
if ($result <= 0) {
$error++;
setEventMessages($moline->error, $moline->errors, 'errors');
}
}
if (! $error) {
// Record stock movement // Record stock movement
$id_product_batch = 0; $id_product_batch = 0;
$result = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement); $idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
if ($result <= 0) { if ($idstockmove < 0) {
$error++; $error++;
setEventMessages($stockmove->error, $stockmove->errors, 'errors'); setEventMessages($stockmove->error, $stockmove->errors, 'errors');
} }
} }
var_dump('eee '.$error);
if (! $error) {
$pos = 0;
// Record consumption
$moline = new MoLine($db);
$moline->fk_mo = $object->id;
$moline->position = $pos;
$moline->fk_product = $line->fk_product;
$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
$moline->qty = GETPOST('qty-'.$line->id.'-'.$i);
$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
$moline->role = 'consumed';
$moline->fk_mrp_production = $line->id;
$moline->fk_stock_movement = $idstockmove;
$moline->fk_user_creat = $user->id;
$resultmoline = $moline->create($user);
if ($resultmoline <= 0) {
$error++;
setEventMessages($moline->error, $moline->errors, 'errors');
}
$pos++;
}
$i++; $i++;
} }
@ -230,26 +244,40 @@ if (empty($reshook))
} }
} }
if (! $error) { $idstockmove = 0;
// Record production if (! $error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
$moline = new MoLine($db);
$result = $moline->create($user);
if ($result <= 0) {
$error++;
setEventMessages($moline->error, $moline->errors, 'errors');
}
}
if (! $error) {
// Record stock movement // Record stock movement
$id_product_batch = 0; $id_product_batch = 0;
$result = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), GETPOST('qty-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement); $idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), GETPOST('qtytoproduce-'.$line->id.'-'.$i), 0, $labelmovement, dol_now(), '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
if ($result <= 0) { if ($idstockmove < 0) {
$error++; $error++;
setEventMessages($stockmove->error, $stockmove->errors, 'errors'); setEventMessages($stockmove->error, $stockmove->errors, 'errors');
} }
} }
var_dump('fff '.$error);
if (! $error) {
$pos = 0;
// Record production
$moline = new MoLine($db);
$moline->fk_mo = $object->id;
$moline->position = $pos;
$moline->fk_product = $line->fk_product;
$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
$moline->qty = GETPOST('qtytoproduce-'.$line->id.'-'.$i);
$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
$moline->role = 'produced';
$moline->fk_mrp_production = $line->id;
$moline->fk_stock_movement = $idstockmove;
$moline->fk_user_creat = $user->id;
$resultmoline = $moline->create($user);
if ($resultmoline <= 0) {
$error++;
setEventMessages($moline->error, $moline->errors, 'errors');
}
$pos++;
}
$i++; $i++;
} }

2
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -97,7 +97,7 @@ class MouvementStock extends CommonObject
* @param int $entrepot_id Id of warehouse * @param int $entrepot_id Id of warehouse
* @param int $qty Qty of movement (can be <0 or >0 depending on parameter type) * @param int $qty Qty of movement (can be <0 or >0 depending on parameter type)
* @param int $type Direction of movement: * @param int $type Direction of movement:
* 0=input (stock increase by a stock transfer), 1=output (stock decrease after by a stock transfer), * 0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
* 2=output (stock decrease), 3=input (stock increase) * 2=output (stock decrease), 3=input (stock increase)
* Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2. * Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
* @param int $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed. * @param int $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.