Remove remarks2 and remarks3 column while updating despach in Autobackflush

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

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

@@ -4874,7 +4874,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs=null;
 				
 				    
-					sql = "SELECT SALE_ORDER FROM SORDER WHERE CUST_PORD = ? AND CONFIRMED ='Y'";
+					sql = "SELECT SALE_ORDER FROM SORDER WHERE trim(CUST_PORD) = ? AND CONFIRMED ='Y'";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, purcOrder);
 					rs = pstmt.executeQuery();
@@ -4941,14 +4941,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				rs.close();
 				rs=null;
 				
-				generatedTranId=this.generateTranId("W_DESPATCH", sordSite,today, conn);
+				generatedTranId=this.generateTranId("w_despatch", sordSite,today, conn);
 				if("ERROR".equalsIgnoreCase(generatedTranId))
 				{
 					retString = itmDBAccessLocal.getErrorString("","VTTRANID","");
 					return retString;
 				}
 				
-				sql = "INSERT INTO DESPATCH(DESP_ID,DESP_DATE, SITE_CODE, SORD_NO, SORD_DATE, CUST_CODE, CUST_CODE__DLV, EFF_DATE, DLV_ADD1, DLV_ADD2, DLV_ADD3, DLV_CITY, DLV_PIN, COUNT_CODE__DLV, CURR_CODE, EXCH_RATE, CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, REMARKS, REMARKS2, REMARKS3,GP_SER, STAN_CODE, TRAN_CODE, TRANS_MODE, STAN_CODE__INIT, TOT_VALUE, GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				sql = "INSERT INTO DESPATCH(DESP_ID,DESP_DATE, SITE_CODE, SORD_NO, SORD_DATE, CUST_CODE, CUST_CODE__DLV, EFF_DATE, DLV_ADD1, DLV_ADD2, DLV_ADD3, DLV_CITY, DLV_PIN, COUNT_CODE__DLV, CURR_CODE, EXCH_RATE, CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, REMARKS,GP_SER, STAN_CODE, TRAN_CODE, TRANS_MODE, STAN_CODE__INIT, TOT_VALUE, GROSS_WEIGHT, TARE_WEIGHT, NETT_WEIGHT) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				pstmtDspHdr = conn.prepareStatement(sql);
 				
 				pstmtDspHdr.setString(1,generatedTranId);	
@@ -4974,19 +4974,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				pstmtDspHdr.setDouble(21, exchRateIns );	
 				pstmtDspHdr.setDouble(22, insAmt );	
 				pstmtDspHdr.setString(23, remarks );	
-				pstmtDspHdr.setString(24, remarks2 );	
-				pstmtDspHdr.setString(25, remarks3 );	
+				/*pstmtDspHdr.setString(24, remarks2 );	
+				pstmtDspHdr.setString(25, remarks3 );	*/
 				
-				
-				if(orderType.equals("E"))
+				if(("E").equals(orderType))
 				{
 					pstmtDspHdr.setNull(26,Types.CHAR);
-					
 				}else
 				{
 					pstmtDspHdr.setString(26,orderType);	
 				}
-				
 				pstmtDspHdr.setString(27, stanCode);
 				pstmtDspHdr.setString(28,tranCode);
 				pstmtDspHdr.setString(29, transMode);
@@ -5078,7 +5075,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pendingQty = orderQty - despatchedQty;
 					minusQty = 0.0;
 
-					sql = "SELECT SUM(QUANTITY) FROM DESPATCHDET WHERE	SORD_NO = ? AND DESP_ID = ?  AND LINE_NO__SORD = ?";
+					sql = "SELECT SUM(QUANTITY) AS QUANTITY FROM DESPATCHDET WHERE	SORD_NO = ? AND DESP_ID = ?  AND LINE_NO__SORD = ?";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, saleOrder );
 					pstmt1.setString(2, generatedTranId);
@@ -5096,8 +5093,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs1 = null;
 					
 
-
-					sql = "SELECT ITEM_CODE__ORD, QUANTITY,	EXP_LEV	, QTY_ALLOC FROM SORDITEM WHERE  SALE_ORDER = ? AND	 LINE_NO = ? AND LINE_TYPE = 'I'";
+					sql = "SELECT ITEM_CODE__ORD, QUANTITY,	EXP_LEV	, QTY_ALLOC FROM SORDITEM WHERE  SALE_ORDER = ? AND	 TRIM(LINE_NO)= ? AND LINE_TYPE = 'I'";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, saleOrder );
 					pstmt1.setString(2, lineNoSord );
@@ -5225,15 +5221,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtUpd.setDouble(1, additionalCost);
 					pstmtUpd.setString(2, tranId);
 					pstmtUpd.setString(3, linePoRcpDet);
-					updCnt = pstmtUpd.executeUpdate();
-					if ( updCnt != 1)
+					
+					System.out.println("update couunt is ="+pstmtUpd.executeUpdate());
+					
+					/*if ( updCnt <=0 )
 					{
 						pstmtUpd.close();
 						pstmtUpd = null;
 
 						retString =  itmDBAccessLocal.getErrorString("","UPDCNTNOT1","");
 						return retString;
-					}
+					}*/
 						pstmtUpd.close();
 						pstmtUpd = null;
 				
@@ -5255,6 +5253,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					
 					
 					
+					
+					
+					
+					
+					
+					
 					retString=allocTraceBean.updateInvallocTrace(hashMap, conn);
 					
 					hashMap.clear();
@@ -5411,6 +5415,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				pstmtDspHdr.setDouble(32, hGrWgh );
 				pstmtDspHdr.setDouble(33, hTareWgh );
 				pstmtDspHdr.setDouble(34, hNetWgh );
+				
 				pstmtDspHdr.addBatch();
 				pstmtDspHdr.clearParameters();
 				
@@ -5426,9 +5431,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				pstmtUpd = null;
 				
 				
-				pstmtDspHdr.executeUpdate();
+				pstmtDspHdr.executeBatch();
 				pstmtDspHdr.clearBatch();
-				pstmtDspDtl.executeUpdate();
+				pstmtDspDtl.executeBatch();
 				pstmtDspDtl.clearBatch();