Merge branch 'mohammed-sales-quot-amd' into 'master'

Add validation for SalesQuotation and SalesQuotationAmd

See merge request !4

Mohammed/SalesQuotAmd/SalesQuotationAmdIC.java

@@ -636,6 +636,30 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							}
 						}
 					}
+					else if(childNodeName.equalsIgnoreCase("quantity"))
+					{
+						String qtyStr = genericUtility.getColumnValue("quantity", dom);
+						double qtyVal = (qtyStr == null || qtyStr.trim().length() == 0) ? 0 : Double.parseDouble(qtyStr);
+
+						if(qtyVal < 0)
+						{
+							errCode = "VTQTYN"; // Quantity cannot be negative
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+					}
+					else if(childNodeName.equalsIgnoreCase("rate"))
+					{
+						String rateStr = genericUtility.getColumnValue("rate", dom);
+						double rateVal = (rateStr == null || rateStr.trim().length() == 0) ? 0 : Double.parseDouble(rateStr);
+
+						if(rateVal < 0)
+						{
+							errCode = "VTRATENEG"; // Rate cannot be negative
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+					}
 					else if(childNodeName.equalsIgnoreCase("cr_term"))
 					{
 						crTerm= genericUtility.getColumnValue("cr_term", dom);
@@ -915,10 +939,20 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 				{
 					valueXmlString.append("<quot_date>").append("<![CDATA["+currentDateTime+"]]>").append("</quot_date>");
 					valueXmlString.append("<inq_date>").append("<![CDATA["+currentDateTime+"]]>").append("</inq_date>");
-					valueXmlString.append("<valid_upto>").append("<![CDATA["+currentDateTime+"]]>").append("</valid_upto>");
 					valueXmlString.append("<status_date>").append("<![CDATA["+currentDateTime+"]]>").append("</status_date>");
 					valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
+				} 
+				// Changes by Gagan B. on 9-APR-26 to resolve the Data or Application error because AMD_NO was passed as blank while editing and finishing -- START
+				else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
+				{
+					BaseLogger.log("3", getUserInfo(), null,  "Item Default Edit form 1+++++");
+
+					quotNo= checkNull(genericUtility.getColumnValue("quot_no", dom));
+					String amdNoEdit = checkNull(genericUtility.getColumnValue("amd_no", dom));
+					valueXmlString.append("<quot_no>").append("<![CDATA[" + quotNo + "]]>").append("</quot_no>");
+					valueXmlString.append("<amd_no>").append("<![CDATA[" + amdNoEdit + "]]>").append("</amd_no>");
 				}
+				// Changes by Gagan B. on 9-APR-26 to resolve the Data or Application error because AMD_NO was passed as blank while editing and finishing -- END
 				else if(currentColumn.equalsIgnoreCase("cust_code"))
 				{
 					String lsItemser="",lsSiteCode="",taxChapHdr="",taxClassHdr="",taxEnvHdr="";
@@ -1177,7 +1211,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 					String stockistCodeDlv="",dlvLocation="",priceList1="",itemSer1="",parentQuotNo="";
 					String custName="", opprId ="", origQuotRed="", locationDescr="";
 					String taxClassHdr="",taxChapHdr="",taxEnvHdr="",siteCode1="";
-					Timestamp quotDateTs=null,inqDateTs=null,validUptoTs=null,statusDateTs=null;
+					Timestamp quotDateTs=null,inqDateTs=null,effDateTs=null,validUptoTs=null,statusDateTs=null;
 					double freight1=0,exchRate1=0,vat1=0,quotationCost1=0;
 					int prnpQuot1=0,supplyLeadtime1=0;
 					String errString="";
@@ -1186,7 +1220,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 					BaseLogger.log("3", getUserInfo(), null, "INSIDE IC quot_no .... "+quotNo);
 					if(currentColumn.equalsIgnoreCase("quot_no") && quotNo.length() > 0)
 					{
-						sql = "select sq.quot_date, sq.quot_type, sq.cust_code, sq.inq_date, sq.inq_source, sq.valid_upto, " +
+						sql = "select sq.quot_date, sq.quot_type, sq.cust_code, sq.inq_date, sq.inq_source, sq.eff_date ,sq.valid_upto, " +
 							      " sq.emp_code__conf, sq.status_date, sq.curr_code, sq.exch_rate, sq.cont_pers, sq.sales_pers, " +
 							      " sq.enq_no, sq.sample_ref, sq.freight, sq.cr_term, sq.dlv_term, sq.term_table, " +
 							      " sq.stockist_code__dlv, sq.dlv_location, sq.location_descr, sq.site_code, sq.price_list, sq.supply_leadtime, sq.item_ser, " +
@@ -1216,6 +1250,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							custCode = checkNull(rs.getString("cust_code"));
 							inqDateTs = rs.getTimestamp("inq_date");
 							inqSource = checkNull(rs.getString("inq_source"));
+							effDateTs = rs.getTimestamp("eff_date");
 							validUptoTs = rs.getTimestamp("valid_upto");
 							empCodeConf1 = checkNull(rs.getString("emp_code__conf"));
 //							status1 = checkNull(rs.getString("status"));
@@ -1318,6 +1353,11 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							valueXmlString.append("<inq_date>").append("<![CDATA["+sdf.format(inqDateTs)+"]]>").append("</inq_date>");
 						}
 						valueXmlString.append("<inq_source>").append("<![CDATA["+inqSource+"]]>").append("</inq_source>");
+						if(effDateTs != null)
+						{
+							valueXmlString.append("<eff_date_o>").append("<![CDATA["+sdf.format(effDateTs)+"]]>").append("</eff_date_o>");
+							valueXmlString.append("<eff_date>").append("<![CDATA["+sdf.format(effDateTs)+"]]>").append("</eff_date>");
+						}
 						if(validUptoTs != null)
 						{
 							valueXmlString.append("<valid_upto_o>").append("<![CDATA["+sdf.format(validUptoTs)+"]]>").append("</valid_upto_o>");
@@ -1379,6 +1419,8 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 						valueXmlString.append("<inq_source><![CDATA[]]></inq_source>");
 						valueXmlString.append("<valid_upto><![CDATA[]]></valid_upto>");
 						valueXmlString.append("<valid_upto_o><![CDATA[]]></valid_upto_o>");
+						valueXmlString.append("<eff_date><![CDATA[]]></eff_date>");
+						valueXmlString.append("<eff_date_o><![CDATA[]]></eff_date_o>");
 						valueXmlString.append("<emp_code__conf><![CDATA[]]></emp_code__conf>");
 						valueXmlString.append("<status><![CDATA[]]></status>");
 						valueXmlString.append("<status_date><![CDATA[]]></status_date>");
@@ -1672,6 +1714,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 
 						valueXmlString.append("<quantity_o>").append("<![CDATA["+detQuantity+"]]>").append("</quantity_o>");
 						valueXmlString.append("<quantity>").append("<![CDATA["+detQuantity+"]]>").append("</quantity>");
+						valueXmlString.append("<rate_o>").append("<![CDATA["+detRate+"]]>").append("</rate_o>");
 						valueXmlString.append("<rate>").append("<![CDATA["+detRate+"]]>").append("</rate>");
 						valueXmlString.append("<rate__clg>").append("<![CDATA["+detRateClg+"]]>").append("</rate__clg>");
 						if(detUnitRate != null && detUnitRate.trim().length() > 0)
@@ -1716,6 +1759,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 
 					    valueXmlString.append("<quantity><![CDATA[0]]></quantity>");
 					    valueXmlString.append("<quantity_o><![CDATA[0]]></quantity_o>");
+					    valueXmlString.append("<rate_o><![CDATA[0]]></rate_o>");
 					    valueXmlString.append("<rate><![CDATA[0]]></rate>");
 					    valueXmlString.append("<rate__clg><![CDATA[0]]></rate__clg>");
 					    valueXmlString.append("<sampl_qty><![CDATA[0]]></sampl_qty>");
@@ -2042,6 +2086,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 				}
 
 				valueXmlString.append("</Detail3>");
+				BaseLogger.log("3", getUserInfo(), null, "itemchange final XML string: [" + valueXmlString +"]");
 			}
 			break;