allocation and deallocation of stock bug

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

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

@@ -768,9 +768,15 @@ public class PostOrdDespatchGen
 						tempMapSord.put("site_code__mfg", siteCde);
 						tempMapSord.put("status", status);
 
-						tempMapSord.put("tax_chap", taxChap.trim());
+						//code change by Pavan R Start 12/JAN/18
+						tempMapSord.put("tax_chap", taxChap==null?"":taxChap.trim());
+						tempMapSord.put("tax_class", taxClass==null?"":taxClass.trim());
+						tempMapSord.put("tax_env", taxEnv==null?"":taxEnv.trim());
+						/*tempMapSord.put("tax_chap", taxChap.trim());
 						tempMapSord.put("tax_class", taxClass.trim());
-						tempMapSord.put("tax_env", taxEnv.trim());
+						tempMapSord.put("tax_env", taxEnv.trim());*/
+						//code change by Pavan R End 12/JAN/18
+						
 						confDiffAmt=0;
 						tempMapSord.put("conf_diff_amt", confDiffAmt);
 

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

@@ -8,6 +8,7 @@ import ibase.webitm.ejb.E12CreateBatchLoadEjb;
 import ibase.webitm.ejb.E12GenerateEDIEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ProcessEJB;
+import ibase.webitm.ejb.dis.StockBean;
 import ibase.webitm.ejb.fin.FinCommon;
 import ibase.webitm.ejb.fin.InvAcct;
 import ibase.webitm.ejb.fin.adv.CalculateCommission;
@@ -3558,6 +3559,84 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					rs5 = null;
 					pstmt5.close();
 					pstmt5 = null;
+					
+					//Pavan R Start 12/JAN/18
+					String sqlAlloc=""; 
+					PreparedStatement pstmt6=null;				
+					double qtyStkAlloc =0.0, allocQtyAlloc=0.0, holdQtyAlloc=0.0, inputQtyAlloc=0.0,inputQtyTotAlloc=0.0,sordItmQtyallc=0.0,updQty=0.0;
+					System.out.println("stockList::["+stockList+"]");
+					sordItmQtyallc = sordItmQty;
+					System.out.println("sordItmQty::["+sordItmQty+"]");
+					for (StockBean stockBean : stockList) 
+					{						 
+						boolean isRejected1 = stockBean.isRejected();
+						System.out.println("isRejected1"+isRejected1);
+						if(isRejected1==false)
+						{			
+							qtyStkAlloc = stockBean.getStockQty();
+							allocQtyAlloc = stockBean.getAllocQty();							
+							holdQtyAlloc = stockBean.getHoldQty();
+							siteCode = stockBean.getSordItemBean().getSiteCode();
+							itemCode = stockBean.getSordItemBean().getItemCode();
+							lotNo = stockBean.getLotNo();
+							lotSl = stockBean.getLotSl();
+							locCode=stockBean.getLocCode();
+							System.out.println("qtyStkAlloc["+qtyStkAlloc+"]allocQtyAlloc["+allocQtyAlloc+"]");
+							System.out.println("holdQtyAlloc["+holdQtyAlloc+"]itemCode["+itemCode+"]");
+							System.out.println("sordItmQtyallc["+sordItmQtyallc+"]");
+							if ((sordItmQtyallc) <= 0){
+								break;
+								
+							}
+														
+							if(qtyStkAlloc - allocQtyAlloc - holdQtyAlloc >= sordItmQtyallc)
+							{
+								updQty = sordItmQtyallc;
+								
+								sqlAlloc = "UPDATE STOCK SET ALLOC_QTY =(CASE WHEN ALLOC_QTY IS NULL THEN 0 ELSE ALLOC_QTY END) + ? "
+										  +"WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
+								pstmt6 = conn.prepareStatement(sqlAlloc);
+								pstmt6.setDouble(1,updQty) ;
+								pstmt6.setString(2,itemCode.trim()) ;
+								pstmt6.setString(3, siteCode.trim()) ;
+								pstmt6.setString(4,locCode.trim()) ;
+								pstmt6.setString(5,lotNo.trim()) ;
+								pstmt6.setString(6,lotSl.trim()) ; 
+								pstmt6.executeUpdate();
+								pstmt6.close();
+								pstmt6 = null;
+								
+							//	inputQtyTotAlloc = inputQtyTotAlloc+inputQtyAlloc;
+								
+								sordItmQtyallc = 0;
+								stockBean.setAllocQtyUpd(updQty);
+							}
+							else
+							{
+								updQty = qtyStkAlloc - allocQtyAlloc - holdQtyAlloc;
+								stockBean.setAllocQtyUpd(updQty);
+								 
+								sqlAlloc = "UPDATE STOCK SET ALLOC_QTY =(CASE WHEN ALLOC_QTY IS NULL THEN 0 ELSE ALLOC_QTY END) + ? "
+										  +"WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
+								pstmt6 = conn.prepareStatement(sqlAlloc);
+								pstmt6.setDouble(1,updQty) ;
+								pstmt6.setString(2,itemCode.trim()) ;
+								pstmt6.setString(3, siteCode.trim()) ;
+								pstmt6.setString(4,locCode.trim()) ;
+								pstmt6.setString(5,lotNo.trim()) ;
+								pstmt6.setString(6,lotSl.trim()) ; 
+								pstmt6.executeUpdate();
+								pstmt6.close();
+								pstmt6 = null;
+								
+								sordItmQtyallc = sordItmQtyallc - (qtyStkAlloc - allocQtyAlloc - holdQtyAlloc);
+								
+							}
+							
+						}
+						
+					}
+					//Pavan R End 12/JAN/18 
 					//System.out.println("@@@@@@@@@@ forTestCnt["+forTestCnt+"]:::stockList.size()>>>>"+stockList.size());	
 					sordItemBean.setStockList(stockList);
 					//stockList.clear();
@@ -3694,6 +3773,29 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 				{
 					continue;
 				}*/
+						
+				//Pavan R Start 12/JAN/18
+				double allocQtyUpd = stockBean.getAllocQtyUpd();
+				System.out.println("allocQtyUpd::["+allocQtyUpd+"]");
+				if(allocQtyUpd > 0)
+				{
+					sqlAlloc = "UPDATE STOCK SET ALLOC_QTY =(CASE WHEN ALLOC_QTY IS NULL THEN 0 ELSE ALLOC_QTY END) + ? "
+							  +"WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
+					pstmt6 = conn.prepareStatement(sqlAlloc);
+					pstmt6.setDouble(1,(allocQtyUpd * (-1))) ;
+					pstmt6.setString(2,itemCode.trim()) ;
+					pstmt6.setString(3, siteCode.trim()) ;
+					pstmt6.setString(4,locCode.trim()) ;
+					pstmt6.setString(5,lotNo.trim()) ;
+					pstmt6.setString(6,lotSl.trim()) ; 
+					pstmt6.executeUpdate();
+					pstmt6.close();
+					pstmt6 = null;
+					
+				}
+				//Pavan R End 12/JAN/18
+				
+				
 						if(isRejected)
 						{
 							continue;

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

@@ -23,6 +23,13 @@ public class StockBean implements Serializable {
 	private SordItemBean sordItemBean;
 	private int errorCnt=0;
 	
+	private double allocQtyUpd = 0.0;	
+	public double getAllocQtyUpd() {
+		return allocQtyUpd;
+	}
+	public void setAllocQtyUpd(double allocQtyUpd) {
+		this.allocQtyUpd = allocQtyUpd;
+	}
 	
 	public String getLotNo() {
 		return lotNo;