git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196384 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java

@@ -1862,7 +1862,14 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							schAttr = checkNull(genericUtility.getColumnValue("sch_attr", dom));
 							System.out.println("schAttr::[" + schAttr + "]");
 							nature = checkNull(genericUtility.getColumnValue("nature", dom));
-							if (("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature)
+							//------Added by Jaffar S.
+							System.out.println("lbOrdFlg ----- "+lbOrdFlg);
+							System.out.println("nature ----- "+nature);
+							if(lbOrdFlg == true)
+							{
+								
+							}
+							else if (("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature)
 									|| "S".equalsIgnoreCase(nature)) && !lbOrdFlg && (!"Y".equalsIgnoreCase(schAttr))) {
 								sql = "select item_code__parent from item where item_code = ?";
 								pstmt = conn.prepareStatement(sql);
@@ -9867,7 +9874,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						pstmt.close();
 						pstmt = null;
 					}
-					if (lsPriceListDisc != null && lsPriceListDisc.trim().length() > 0) {
+					//---Commented conditions by Jaffar S as suggested by SM Sir on 29-01-2019
+					//if (lsPriceListDisc != null && lsPriceListDisc.trim().length() > 0) {
 						sql = "select order_type from sorder where sale_order =?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, lsSaleOrd);
@@ -9906,7 +9914,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						} else {
 							llMaxShelfLife = "";
 						}
-					}
+					//}
 					if (Double.parseDouble(checkDouble(llMaxShelfLifeDet)) > 0) {
 						llMaxShelfLife = llMaxShelfLifeDet;
 					}
@@ -15664,21 +15672,22 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							schemeCode1 = prevScheme;
 						}
 					}
-					pstmt2.close();
 					rs2.close();
-					pstmt2 = null;
 					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;
+					
 					if (schCnt == 0) {
 						errCode = "VTFREEQTY";// Scheme is not applicable for the
 						// entered item code
 						errList.add(errCode);
-						errFields.add(childNodeName.toLowerCase());
+						//errFields.add(childNodeName.toLowerCase());
 						System.out.println("Scheme is not applicable for the entered item code");
 					} else if (schCnt > 0) {
 						errCode = "VTITEM10";// Item cannot have more than one
 						// scheme applicable for same period.
 						errList.add(errCode);
-						errFields.add(childNodeName.toLowerCase());
+						//errFields.add(childNodeName.toLowerCase());
 						System.out.println("Item cannot have more than one scheme applicable for same period.");
 					} else if (custSchemeCode.trim().length() > 0) {
 						schemeCode = custSchemeCode;

webitm-dis/ibase/webitm/ejb/dis/adv/POBWizConf.java

@@ -266,7 +266,7 @@ public class POBWizConf extends ActionHandlerEJB implements POBWizConfLocal, POB
 					xmlBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"sorder\" objContext=\"1\">");
 					xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
 					xmlBuff.append("<sale_order/>");
-					xmlBuff.append("<order_type><![CDATA[" + orderType + "]]></order_type>");
+					//xmlBuff.append("<order_type><![CDATA[" + orderType + "]]></order_type>");
 					xmlBuff.append("<order_date><![CDATA[" + sysDate + "]]></order_date>");
 					xmlBuff.append("<item_ser><![CDATA[" + itemSer.trim() + "]]></item_ser>");
 					xmlBuff.append("<site_code><![CDATA[" + siteCode.trim() + "]]></site_code>");
@@ -275,6 +275,7 @@ public class POBWizConf extends ActionHandlerEJB implements POBWizConfLocal, POB
 					xmlBuff.append("<dlv_to><![CDATA[" + dlvDescr + "]]></dlv_to>");
 					xmlBuff.append("<cust_code__bil><![CDATA[" + custCode + "]]></cust_code__bil>");
 					xmlBuff.append("<cust_code__dlv><![CDATA[" + custCode + "]]></cust_code__dlv>");
+					xmlBuff.append("<order_type><![CDATA[" + orderType + "]]></order_type>"); //changed related to order_type made by Jaffar S on 28-01-19
 					xmlBuff.append("<stan_code><![CDATA[" + stanCode.trim() + "]]></stan_code>");
 					xmlBuff.append("<STAN_CODE__INIT><![CDATA[" + stanCode.trim() + "]]></STAN_CODE__INIT>");
 					xmlBuff.append("<cr_term><![CDATA[" + crTerm + "]]></cr_term>");