changes for stock mismatch

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

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

@@ -2279,10 +2279,10 @@ public class PostOrdDespatchGen
 							sordDisList.add(tempMap.get("sord_no").toString());
 							if(connCP!=null )
 							{
-								connCP.commit();	
+								connCP.commit();	//connCP.commit();//commented  by nandkumar gadkari and commit in post order process comp on 08/05/19
 							}
 							
-							conn.commit();
+							//conn.commit();//commented  by nandkumar gadkari and commit in post order process comp on 08/05/19
 						}
 						else
 						{

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

@@ -952,6 +952,25 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					}
 					//	System.out.println("ErrCode from Despatch creation===="+errCode);
 
+					//added by nandkumar gadkari on 08/05/19 --------start---------for stock mismatch case 
+					if(errString !=null && errString.trim().length() > 0)
+					{
+						conn.rollback();
+						if(connCP!=null )
+						{
+							connCP.rollback();	
+						}
+						
+					}
+					else
+					{
+						conn.commit();
+						if(connCP!=null )
+						{
+							connCP.commit();	
+						}
+					}
+					//added by nandkumar gadkari on 08/05/19 --------end---------for stock mismatch case
 					//Changed By Nasruddin END 04-11-16
 
 					if (errCode == null || errCode.trim().length()==0)
@@ -2574,7 +2593,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 									strToWrite=strToWrite + createPostLog(saleOrder, itemCode, locCode, lotNo, lineNo, "Scheme details not found ");
 									errorLog("Error", "Scheme details not found for line no : " + lineNo,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
 									//continue;
-									break;
+									//break;
+									continue;//added by nandkumar gadkari and commented break on 08/05/19
 								}
 								if(schemeCnt == 0)
 								{
@@ -2939,7 +2959,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 											postLog = "Batch Price List Not found in pricelist_mst table for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
 											errorLog("Error",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
 											//System.out.println("called exit from loop");
-											break;
+											//break;
+											continue;//added by nandkumar gadkari and commented break on 08/05/19
 										}
 
 
@@ -2960,10 +2981,17 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 											//Pavan Rane 27apr2019 [to write log if rate found 0 or -1 for lot-item]
 											if("B".equalsIgnoreCase(priceListType) && rate <= 0)
 											{
+												//added by nandkumar gadkari on 08/05/19 for stock mismatch entry ---start------------
+												skiplot = skiplot + "'"+lineNo;
+												isRejected=true;
+												stockBean.setRejected(isRejected);
+												stockBean.setSkiplot(skiplot);
+												//added by nandkumar gadkari on 08/05/19 for stock mismatch entry ---end------------
 												logMsg= saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tBatch Price List or Parent Batch Price List Not found in pricelist_mst table";												
 												strToWrite = strToWrite +createPostLog(saleOrder, itemCode, locCode, lotNo, lineNo, "Batch Price List or Parent Batch Price List Not found in pricelist_mst table");
 												postLog = "Batch Price List Not found in pricelist_mst table for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
 												errorLog("Error",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);												
+												continue;////added by nandkumar gadkari on 08/05/19
 											}
 										}
 
@@ -3014,7 +3042,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 									postLog = "Rate not available for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo; 
 									errorLog("P04",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
 									//	System.out.println("called exit from loop");
-									break;
+									//break;
+									continue;//added by nandkumar gadkari and commented break on 08/05/19
 								}
 
 
@@ -3062,7 +3091,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 											postLog = "Batch Price List Not found in pricelist_mst table for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
 											errorLog("Error",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
 											//System.out.println("called exit from loop");
-											break;
+											//break;
+											continue;//added by nandkumar gadkari and commented break on 08/05/19
 										}
 									}
 
@@ -3073,10 +3103,17 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 									//Pavan Rane 27apr2019 [to write log if rate found 0 or -1 for lot-item]
 									if("B".equalsIgnoreCase(priceListType) && rateClg <= 0)
 									{
+										//added by nandkumar gadkari on 08/05/19 for stock mismatch entry ---start------------
+										skiplot = skiplot + "'"+lineNo;
+										isRejected=true;
+										stockBean.setRejected(isRejected);
+										stockBean.setSkiplot(skiplot);
+										//added by nandkumar gadkari on 08/05/19 for stock mismatch entry ---end------------
 										logMsg= saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tBatch Price List or Parent Batch Price List Not found in pricelist_mst table";										
 										strToWrite = strToWrite +createPostLog(saleOrder, itemCode, locCode, lotNo, lineNo, "Batch Price List or Parent Batch Price List Not found in pricelist_mst table");											
 										postLog = "Batch Price List Not found in pricelist_mst table for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
 										errorLog("Error",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);									
+										continue;//added by nandkumar gadkari on 08/05/19
 									}
 								}
 
@@ -3096,7 +3133,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 									postLog = "Excise clg. rate not available for "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
 									errorLog("P12", postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
 									//System.out.println("called exit from loop");
-									break;
+									//break;
+									continue;//added by nandkumar gadkari and commented break on 08/05/19
 								}
 							}//end of if(rateClg <= 0)
 
@@ -5279,8 +5317,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 			/*System.out.println("ls_table["+ls_table+"]"+"ls_reas_code["+ls_reas_code+"]"+"ls_reas_detail"+ls_reas_detail+"]");
 			System.out.println("keyfld1["+keyfld1+"]"+"keyfld2["+keyfld2+"]"+"keyfld3["+keyfld3+"]");
 			System.out.println("keyfld4["+keyfld4+"]"+"keyfld5["+keyfld5+"]");*/
-			
-
+			//added by nandkumar gadkari on 08/05/19----------start-------------
+			if(ls_reas_detail != null && ls_reas_detail.length() > 120)
+			{
+				ls_reas_detail=ls_reas_detail.substring(0, 119);
+			}
+			//added by nandkumar gadkari on 08/05/19----------end-------------
 			if("sorditem".equalsIgnoreCase(ls_table))
 			{	
 				//remove commented by arun p 01-12-17 start