remove blank space in station_init

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

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

@@ -1662,7 +1662,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					currCodeFrt = rs.getString("curr_code__frt") == null ? " " : rs.getString("curr_code__frt");
 					currCodeIns = rs.getString("curr_code__ins") == null ? " " : rs.getString("curr_code__ins");
 					currCodedlv = rs.getString("cust_code__dlv") == null ? " " : rs.getString("cust_code__dlv");
-					stanCode = rs.getString("stan_code") == null ? " " : rs.getString("stan_code");
+					stanCode = rs.getString("stan_code") == null ? "" : rs.getString("stan_code");
 					orderDt = rs.getDate("order_date");
 					stanCodeDlv = rs.getString("STATE_CODE__DLV") == null ? " " : rs.getString("STATE_CODE__DLV");
 					/*----------------------changes done by mahendra on dated 13-oct-14-------------*/
@@ -1676,7 +1676,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					dlvPin = rs.getString("DLV_PIN") == null ? " " : rs.getString("DLV_PIN");
 					countCodeDlv = rs.getString("COUNT_CODE__DLV") == null ? " " : rs.getString("COUNT_CODE__DLV");
 					tranCode = rs.getString("TRAN_CODE") == null ? " " : rs.getString("TRAN_CODE");
-					stanCodeInit = rs.getString("STAN_CODE__INIT") == null ? " " : rs.getString("STAN_CODE__INIT");
+					stanCodeInit = rs.getString("STAN_CODE__INIT") == null ? "" : rs.getString("STAN_CODE__INIT");
 					//status = rs.getString("STATUS") == null ? " " : rs.getString("STATUS");
 					statusRemarks = rs.getString("STATUS_REMARKS") == null ? " " : rs.getString("STATUS_REMARKS");
 					statusDate = rs.getDate("STATUS_DATE");
@@ -1779,7 +1779,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 				xmlBuff.append("<dlv_pin><![CDATA["+ dlvPin +"]]></dlv_pin>");
 				xmlBuff.append("<count_code__dlv><![CDATA["+ countCodeDlv +"]]></count_code__dlv>");
 				xmlBuff.append("<tran_code><![CDATA["+ tranCode +"]]></tran_code>");
-				xmlBuff.append("<stan_code__init><![CDATA["+ stanCodeInit +"]]></stan_code__init>");
+				xmlBuff.append("<stan_code__init><![CDATA["+ stanCodeInit.trim() +"]]></stan_code__init>");
 				xmlBuff.append("<status_remarks><![CDATA["+ statusRemarks +"]]></status_remarks>");
 				//xmlBuff.append("<status><![CDATA["+ status +"]]></status>");
 				xmlBuff.append("<status><![CDATA["+status+"]]></status>");//status set blank on dated 17-10-2014
@@ -1817,7 +1817,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					//palletWt = rs.getString("NO_PALLET") == null ? " " : rs.getString("NO_PALLET");
 					
 
-					sql =" SELECT LOT_SL,LOT_NO,LOC_CODE,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT,DIMENSION,PALLET_WT  FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO = ? ";
+					sql =" SELECT LOT_SL,LOT_NO,LOC_CODE,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT,DIMENSION,PALLET_WT,pack_code  FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1,tranId);
 					pstmt1.setString(2,lnNoSord);
@@ -1832,6 +1832,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 						tareWeightFmPorcp		= rs1.getDouble("TARE_WEIGHT");
 						netWeightFmPorcp		= rs1.getDouble("NET_WEIGHT");
 						palletWt = rs1.getInt("PALLET_WT");
+						packCode = rs1.getString("pack_code") == null ? " " : rs1.getString("pack_code");
 	
 					} 
 					rs1.close();
@@ -1839,6 +1840,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					pstmt1.close();
 					pstmt1 = null;
 				    System.out.println("pallet wt from receipt :"+palletWt);
+				    System.out.println("packCode from receipt :"+packCode);
 					// ADDED BY RITESH ON 26/05/13 START
 					sqlTemp ="SELECT A.EXP_DATE, " 
 							+"A.QUANTITY, "
@@ -2017,16 +2019,35 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 				{
 					System.out.println("@@@@@@3: retString from despatch"+retString);
 					conn.commit();
+					/*-----------------------------------------------------------------------*/
+					System.out.println("update pack code before confirmation !!! ");
+					String[] arrayForTranId = retString.split("<TranID>");
+					int endIndex = arrayForTranId[1].indexOf("</TranID>");
+					String tranIdForDesp = arrayForTranId[1].substring(0,endIndex);
+					System.out.println("-tranIdForDesp-"+tranIdForDesp);
+					System.out.println("packInstr  : "+packInstr);
+					System.out.println("packCode  : "+packCode);
+					sql = " update despatchdet set PACK_INSTR = ?,PACK_CODE = ?  where desp_id = ? ";
+					pstmt  = conn.prepareStatement(sql);
+					pstmt.setString(1,packInstr);
+					pstmt.setString(2,packCode);
+					pstmt.setString(3,tranIdForDesp);
+										
+					int row = pstmt.executeUpdate();
+					System.out.println("updated rows@@@ =="+row);
+					conn.commit();
 					
+									
+					/*-----------------------------------------------------------------------*/
 								
 					varValue = dComm.getDisparams("999999","AUTO_CONF_DESP", conn); 
 					System.out.println("varValue --"+varValue);
 					if("Y".equalsIgnoreCase(varValue.trim()))
 					{
-						String[] arrayForTranId = retString.split("<TranID>");
+						/*String[] arrayForTranId = retString.split("<TranID>");
 						int endIndex = arrayForTranId[1].indexOf("</TranID>");
 						String tranIdForDesp = arrayForTranId[1].substring(0,endIndex);
-						System.out.println("-tranIdForDesp-"+tranIdForDesp);
+						System.out.println("-tranIdForDesp-"+tranIdForDesp);*/
 						
 						retString = confirmSaleOrder("despatch",tranIdForDesp,xtraParams,conn);
 						System.out.println("retString from conf from despatch ::"+retString);