midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Idempiere 4162 (#171) 

* IDEMPIERE-4162 ignore inactive products when looking for duplicate upc, handle errors on update without disturbing the import run.

* IDEMPIERE-4162 ignore inactive products when looking for duplicate upc, handle errors on update without disturbing the import run. 
changed ImportProduct to save errors even if the next product is in error, too.

* IDEMPIERE-4162 ignore inactive products when looking for duplicate upc, handle errors on update without disturbing the import run. 
changed ImportProduct to save errors even if the next product is in error, too.

* IDEMPIERE-4162 ignore inactive products when looking for duplicate upc, handle errors on update without disturbing the import run. 
Check for duplicate UPC in m_product

* IDEMPIERE-4162 ignore inactive products when looking for duplicate upc, handle errors on update without disturbing the import run. 
check for inactive products added
This commit is contained in:
Martin Schönbeck 2020-08-12 10:53:14 +02:00 committed by GitHub
parent 60f4ea4215
commit 2b12ef3362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.adempiere.base.process/src/org/compiere/process/ImportProduct.java
View File

@ -152,6 +152,17 @@ public class ImportProduct extends SvrProcess implements ImportProcess
// **** Find Product // **** Find Product
// first check for duplicate UPCs
sql = new StringBuilder ("UPDATE I_Product i ")
.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=more than one product with this UPC,' ")
.append("WHERE I_IsImported<>'Y'")
.append(" AND EXISTS (SELECT 1 FROM M_Product mp")
.append(" JOIN M_Product mp2 on mp.AD_Client_ID=mp2.AD_Client_ID AND mp.upc = mp2.upc AND mp.M_Product_ID <> mp2.M_Product_ID")
.append(" WHERE i.AD_Client_ID=mp.AD_Client_ID AND i.upc = mp.upc)").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
log.warning("Not Unique UPC=" + no);
// EAN/UPC // EAN/UPC
sql = new StringBuilder ("UPDATE I_Product i ") sql = new StringBuilder ("UPDATE I_Product i ")
.append("SET M_Product_ID=(SELECT M_Product_ID FROM M_Product p") .append("SET M_Product_ID=(SELECT M_Product_ID FROM M_Product p")
@ -180,6 +191,16 @@ public class ImportProduct extends SvrProcess implements ImportProcess
no = DB.executeUpdate(sql.toString(), get_TrxName()); no = DB.executeUpdate(sql.toString(), get_TrxName());
if (log.isLoggable(Level.INFO)) log.info("Product Existing Vendor ProductNo=" + no); if (log.isLoggable(Level.INFO)) log.info("Product Existing Vendor ProductNo=" + no);
//now check whether found product is inactive
sql = new StringBuilder ("UPDATE I_Product i ")
.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Product is not active,' ")
.append("WHERE I_IsImported<>'Y' AND M_Product_ID IS NOT NULL")
.append(" AND EXISTS (SELECT 1 FROM M_Product mp")
.append(" WHERE i.AD_Client_ID=mp.AD_Client_ID AND i.M_Product_ID= mp.M_Product_ID AND mp.IsActive='N')").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
log.warning("Product inactive");
// Set Product Category // Set Product Category
sql = new StringBuilder ("UPDATE I_Product ") sql = new StringBuilder ("UPDATE I_Product ")
.append("SET ProductCategory_Value=(SELECT MAX(Value) FROM M_Product_Category") .append("SET ProductCategory_Value=(SELECT MAX(Value) FROM M_Product_Category")
@ -558,11 +579,13 @@ public class ImportProduct extends SvrProcess implements ImportProcess
} }
catch (SQLException ex) catch (SQLException ex)
{ {
rollback();
log.warning("Update Product - " + ex.toString()); log.warning("Update Product - " + ex.toString());
StringBuilder sql0 = new StringBuilder ("UPDATE I_Product i ") StringBuilder sql0 = new StringBuilder ("UPDATE I_Product i ")
.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Update Product: " + ex.toString())) .append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Update Product: " + ex.toString()))
.append("WHERE I_Product_ID=").append(I_Product_ID); .append("WHERE I_Product_ID=").append(I_Product_ID);
DB.executeUpdate(sql0.toString(), get_TrxName()); DB.executeUpdate(sql0.toString(), get_TrxName());
commitEx(); //to keep the error message even if next product fails, too
continue; continue;
} }
finally finally
@ -613,6 +636,7 @@ public class ImportProduct extends SvrProcess implements ImportProcess
.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Update Product_PO: " + ex.toString())) .append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Update Product_PO: " + ex.toString()))
.append("WHERE I_Product_ID=").append(I_Product_ID); .append("WHERE I_Product_ID=").append(I_Product_ID);
DB.executeUpdate(sql0.toString(), get_TrxName()); DB.executeUpdate(sql0.toString(), get_TrxName());
commitEx(); //to keep the error message even if next product fails, too
continue; continue;
} }
finally finally
@ -641,6 +665,7 @@ public class ImportProduct extends SvrProcess implements ImportProcess
.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Insert Product_PO: " + ex.toString())) .append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||").append(DB.TO_STRING("Insert Product_PO: " + ex.toString()))
.append("WHERE I_Product_ID=").append(I_Product_ID); .append("WHERE I_Product_ID=").append(I_Product_ID);
DB.executeUpdate(sql0.toString(), get_TrxName()); DB.executeUpdate(sql0.toString(), get_TrxName());
commitEx(); //to keep the error message even if next product fails, too
continue; continue;
} }
} }