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

error management and addproduct

Browse Source
This commit is contained in:
lmarcouiller 2021-12-06 16:47:56 +01:00
parent 325ad45bca
commit f37d9787cd
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/product/inventory/ajax/searchfrombarcode.php
View File

@ -51,7 +51,6 @@ $fk_entrepot = GETPOST("fk_entrepot", "int");
$fk_inventory = GETPOST("fk_inventory", "int"); $fk_inventory = GETPOST("fk_inventory", "int");
$fk_product = GETPOST("fk_product", "int"); $fk_product = GETPOST("fk_product", "int");
$reelqty = GETPOST("reelqty", "int"); $reelqty = GETPOST("reelqty", "int");
$qtyview = GETPOST("qty", "int");
$batch = GETPOST("batch", "int"); $batch = GETPOST("batch", "int");
$mode = GETPOST("mode", "aZ"); $mode = GETPOST("mode", "aZ");
@ -73,6 +72,9 @@ if ($action == "existbarcode" && !empty($barcode)) {
if (!empty($fk_entrepot)) { if (!empty($fk_entrepot)) {
$sql .= " AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'"; $sql .= " AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'";
} }
if (!empty($fk_product)) {
$sql .= " AND ps.fk_product = '".$db->escape($fk_product)."'";
}
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$nbline = $db->num_rows($result); $nbline = $db->num_rows($result);
@ -113,15 +115,14 @@ if ($action == "addnewlineproduct") {
$inventoryline->fk_warehouse = $fk_entrepot; $inventoryline->fk_warehouse = $fk_entrepot;
$inventoryline->fk_product = $fk_product; $inventoryline->fk_product = $fk_product;
$inventoryline->qty_stock = $reelqty; $inventoryline->qty_stock = $reelqty;
$inventoryline->qty_view = $qtyview; if (!empty($batch)) {
if ($mode == "lotserial") {
$inventoryline->batch = $batch; $inventoryline->batch = $batch;
} }
$inventoryline->datec = dol_now(); $inventoryline->datec = dol_now();
$result = $inventoryline->create($user); $result = $inventoryline->create($user);
if ($result > 0) { if ($result > 0) {
$response = array('status'=>'success','message'=>'Success on creating line'); $response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result);
} else { } else {
$response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation"); $response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation");
} }

33
htdocs/product/inventory/inventory.php
View File

@ -452,7 +452,7 @@ if ($object->id > 0) {
print dol_get_fiche_end(); print dol_get_fiche_end();
print '<form name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'">'; print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="updateinventorylines">'; print '<input type="hidden" name="action" value="updateinventorylines">';
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
@ -577,10 +577,12 @@ if ($object->id > 0) {
tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false}); tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
}) })
textarray.forEach(function(element,index){ textarray.forEach(function(element,index){
var verify_batch = false;
var verify_barcode = false;
switch(barcodemode){ switch(barcodemode){
case "barcodeforautodetect": case "barcodeforautodetect":
barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode",true); verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode",true);
barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial",true); verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial",true);
break; break;
case "barcodeforproduct": case "barcodeforproduct":
barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode"); barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode");
@ -592,6 +594,9 @@ if ($object->id > 0) {
alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\""); alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
throw "'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\""; throw "'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\"";
} }
if(verify_batch == true && verify_barcode == true){
errortab.push(element);
}
}); });
if (Object.keys(errortab).length < 1){ if (Object.keys(errortab).length < 1){
tabproduct.forEach(product => { tabproduct.forEach(product => {
@ -599,19 +604,23 @@ if ($object->id > 0) {
console.log("We change #"+product.Id+"_input to match input in scanner box"); console.log("We change #"+product.Id+"_input to match input in scanner box");
if(product.hasOwnProperty("reelqty")){ if(product.hasOwnProperty("reelqty")){
$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\', $.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
data: { "action":"addnewlineproduct","fk_entrepot":product.Warehouse,"batch":product.Batch,"fk_inventory":'.dol_escape_js($object->id).',"fk_product":product.fk_product,"reelqty":product.reelqty,"qty":product.Qty}, data: { "action":"addnewlineproduct","fk_entrepot":product.Warehouse,"batch":product.Batch,"fk_inventory":'.dol_escape_js($object->id).',"fk_product":product.fk_product,"reelqty":product.reelqty},
type: \'POST\', type: \'POST\',
async: false, async: false,
success: function(response) { success: function(response) {
response = JSON.parse(response); response = JSON.parse(response);
if(response.status == "success"){ if(response.status == "success"){
console.log(response.message); console.log(response.message);
$("<input type=\'text\' value=\'"+product.Qty+"\' />")
.attr("id", "id_"+response.id_line+"_input")
.attr("name", "id_"+response.id_line)
.appendTo("#formrecord");
}else{ }else{
console.error(response.message); console.error(response.message);
} }
}, },
error : function(output) { error : function(output) {
console.error("Error on barcodeserialforproduct function"); console.error("Error on line creation function");
}, },
}); });
} else { } else {
@ -635,9 +644,10 @@ if ($object->id > 0) {
function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,mode,autodetect=false){ function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,mode,autodetect=false){
BarcodeIsInProduct=0; BarcodeIsInProduct=0;
newproductrow=0 newproductrow=0
result=false;
tabproduct.forEach(product => { tabproduct.forEach(product => {
$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\', $.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
data: { "action":"existbarcode",'.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.',':'').'"barcode":element,"product":product,"mode":mode}, data: { "action":"existbarcode",'.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.',':'').(!empty($object->fk_product)?'"fk_product":'.$object->fk_product.',':'').'"barcode":element,"product":product,"mode":mode},
type: \'POST\', type: \'POST\',
async: false, async: false,
success: function(response) { success: function(response) {
@ -648,7 +658,7 @@ if ($object->id > 0) {
newproductrow = response.object; newproductrow = response.object;
} }
}else{ }else{
if (!errortab.includes(element)){ if (mode!="lotserial" && autodetect==false && !errortab.includes(element)){
errortab.push(element); errortab.push(element);
console.error(response.message); console.error(response.message);
} }
@ -680,9 +690,14 @@ if ($object->id > 0) {
BarcodeIsInProduct+=1; BarcodeIsInProduct+=1;
} }
}) })
if(BarcodeIsInProduct==0 && newproductrow){ if(BarcodeIsInProduct==0 && newproductrow!=0){
tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':element,\'Batch\':element,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode}); tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':mode=="barcode"?element:null,\'Batch\':mode=="lotserial"?element:null,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode});
result = true;
} }
if(BarcodeIsInProduct > 0){
result = true;
}
return result;
} }
'; ';
print '</script>'; print '</script>';