Request Id:W15HSUN003,pallet request with stock details.

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

webitm-wms/ibase/webitm/ejb/wms/PalletReqConf.java

@@ -184,6 +184,7 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 				{
 					System.out.println("linearray"+lineList.get(i));
 				}
+
 				palletNo = checkNullAndTrim(rs.getString("PALLET_NO"));
 				itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
 				lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
@@ -191,6 +192,7 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 				noArt = checkNullAndTrim(rs.getString("NO_ART"));
 				quantity = checkNullAndTrim(rs.getString("QUANTITY"));
 				lineNo = rs.getString("LINE_NO");
+
 				lineNo = "   " + lineNo;
 				lineNo = lineNo.substring( lineNo.length()-3 );
 
@@ -226,6 +228,22 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 						hm.put("TOTAL_QTY", quantity);
 						hm.put("PALLET_NO", palletNo);
 						hm.put("LINE_NO", lineNo);
+						hm.put("DESCR", "");
+						hm.put("UNIT", "");
+						hm.put("ITEM_TYPE", "");
+						hm.put("FAMILY_GRP", "");
+						hm.put("TRAN_ID", "");
+						hm.put("IN_OUT", "O");
+						hm.put("EXP_DATE", "");
+						hm.put("MFG_DATE", "");
+						hm.put("PALLET_STATUS", "");
+						hm.put("MSG_STAT", "N");
+						hm.put("LOCK_STAT", "");
+						hm.put("ERR_COD", "");
+						hm.put("ERR_DESC", "");
+						hm.put("QC_TYPE", "");
+						hm.put("TRANS_DT_ACK","");
+						hm.put("STRO_PREF", "");
 
 						interfaceArrList.add(hm);
 						System.out.println("interfacearraylist"+interfaceArrList.size());
@@ -241,12 +259,6 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 					hm.put("TRAN_DATE", checkNullAndTrim(String.valueOf(today)));
 					hm.put("PALLET_NO", palletNo);
 					hm.put("LINE_NO", lineNo);
-
-					interfaceArrList.add(hm);
-					System.out.println("interfacearraylist"+interfaceArrList.size());
-
-				}
-				HashMap hm = new HashMap();
 					hm.put("DESCR", "");
 					hm.put("UNIT", "");
 					hm.put("ITEM_TYPE", "");
@@ -264,6 +276,10 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 					hm.put("TRANS_DT_ACK","");
 					hm.put("STRO_PREF", "");
 
+					interfaceArrList.add(hm);
+					System.out.println("interfacearraylist"+interfaceArrList.size());
+
+				}
 			}
 			rs.close();
 			pstmt.close();

webitm-wms/ibase/webitm/ejb/wms/PalletReqIC.java

@@ -107,16 +107,18 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 		GenericUtility genericUtility;
 		String remarks="",addUser="",addTerm="",addDate="",chgUser="",chgTerm="",chgDate="",descr="" ;
 		int lotSlcnt=0,lotNocnt=0,itemCodecnt=0,locCodecnt=0;
+		double quantity=0,noArt=0,qtyPerArt,noArtQuot=0,noArtRem =0 , notArt = 0;
 		int locCount = 0;
 		String quantityStr="",noArtStr="";
 		ResultSet rs= null;
+		Document currFormDataDom = null;
 		String loginSite = "",objName="";
 		ArrayList<String> palletList = new ArrayList();
 		ArrayList ArrList = new ArrayList();
 		PreparedStatement pstmt = null;
 		int palletCount = 0;
 		Connection conn = null;
-		double quantityStock=0,noArtStock=0;
+		double quantityStock=0,noArtStock=0, noArtD=0;
 		String siteCode = "",userId = "",childNodeName = "",errString = "";
 		int ctr = 0, currentFormNo = 0, childNodeListLength = 0, siteCount = 0, cnt = 0;
 		objName = getObjNameFromDom(dom, "objName", "2");
@@ -521,11 +523,11 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 						if("no_art".equalsIgnoreCase(childNodeName))
 						{
 							noArtStr = noArtStr.length() == 0 ? "0" : noArtStr;
-							double noArt = Double.parseDouble(noArtStr);
+							noArtD = Double.parseDouble(noArtStr);
 
 							if( "E".equalsIgnoreCase(editFlag) || "A".equalsIgnoreCase(editFlag))
 							{
-								if(noArt == 0 ) 
+								if(noArtD == 0 ) 
 								{
 									errCode = "VMNOARTNUL";
 									errList.add( errCode );
@@ -536,9 +538,17 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 								}
 								else 
 								{
+									lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
+									lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
+									itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
+									palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
+									loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
 
-									System.out.println("quantity else---");
-									String sql = "SELECT S.NO_ART FROM STOCK S ,LOCATION L WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND  S.LOT_SL=?";
+
+									//	String sql = "SELECT S.QUANTITY,S.NO_ART FROM STOCK S ,LOCATION L WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
+									String sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+									"WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? " +
+									"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
 
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, "AWMS");
@@ -547,30 +557,43 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 									pstmt.setString(4, itemCode);
 									pstmt.setString(5, lotNo);
 									pstmt.setString(6, lotSl);
-
 									rs = pstmt.executeQuery();
 									if(rs.next())
 									{
-										noArtStock = rs.getDouble("NO_ART");
-										System.out.println("noArtStock >>>>>>>" +noArtStock );
-										if(noArt > noArtStock)
+										quantity = rs.getDouble("QUANTITY");
+										qtyPerArt = rs.getDouble("QTY_PER_ART");
+
+										noArtQuot= quantity / qtyPerArt ;
+										noArtRem = quantity % qtyPerArt ;
+										if(noArtRem > 0)
 										{
-											System.out.println("NOART ERROR>>>>>>>");
+											noArtRem = 1;
+										}
+										noArtQuot = (int) noArtQuot;
+
+										noArt = noArtQuot + noArtRem;
+										System.out.println( "noArt>>>>>>>::"+noArt);
+										System.out.println( "noArtQuot>>>>>>>::"+noArtQuot);
+										System.out.println( "noArtRem>>>>>>>::"+noArtRem);
+										System.out.println( "qtyPerArt>>>>>>>::"+qtyPerArt);
+										System.out.println( "quantity()>>>>>>>::"+quantity);
+
+										if(noArtD > noArt)
+										{
+											System.out.println("QUANTITY ERROR>>>>>>>");
 											errCode = "VMNOARTEXT";
 											errList.add( errCode );
 											errFields.add( childNodeName.toLowerCase() );
 										}
-									}
-									rs.close();
-									pstmt.close();
 
 									}
 								}
 							}
+						}
 						if("quantity".equalsIgnoreCase(childNodeName))
 						{
 							quantityStr = quantityStr.length() == 0 ? "0" : quantityStr;
-							double quantity = Double.parseDouble(quantityStr);
+							quantity = Double.parseDouble(quantityStr);
 
 							if( "E".equalsIgnoreCase(editFlag) || "A".equalsIgnoreCase(editFlag))
 							{
@@ -807,9 +830,10 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 		StringBuffer valueXmlString;		
 		String loginSite = "",loginEmpCode = "",chgUser = "" , chgTerm = "",siteDescr = "", siteCodeSupp = "" ,tranDate = "";
-		String siteCode = "";
+		String siteCode = "",lotNo="",lotSl="",itemCode="",palletNo="",noArtStr="",quantityStr="";
 		int currentFormNo = 0;
-		double quantity=0,noArt=0,qtyPerArt,noArtQuot=0,noArtRem =0 , notArt = 0, totalQuantity = 0;
+		ResultSet rs=null;
+		double quantity=0,noArt=0,qtyPerArt,noArtQuot=0,noArtRem =0 , notArt = 0, totalQuantity = 0, noArtD=0;
 
 		System.out.println("xtraParams=["+xtraParams+"]");
 		GenericUtility genericUtility = GenericUtility.getInstance();		
@@ -922,14 +946,17 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 				}
 				else if( currentColumn.trim().equalsIgnoreCase( "lot_sl" ) )
 				{
-					String lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
-					String lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
-					String itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
-					String palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
+					lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
+					lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
+					itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
+					palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
 					loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
 
 
-					String sql = "SELECT S.QUANTITY,S.NO_ART FROM STOCK S ,LOCATION L WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
+					//	String sql = "SELECT S.QUANTITY,S.NO_ART FROM STOCK S ,LOCATION L WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
+					String sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+					"WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? " +
+					"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
 
 					PreparedStatement pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "AWMS");
@@ -938,24 +965,43 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 					pstmt.setString(4, itemCode);
 					pstmt.setString(5, lotNo);
 					pstmt.setString(6, lotSl);
-					ResultSet rs = pstmt.executeQuery();
+					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
 						quantity = rs.getDouble("QUANTITY");
-						noArt = rs.getDouble("NO_ART");
+						//noArt = rs.getDouble("NO_ART");
+						qtyPerArt = rs.getDouble("QTY_PER_ART");
+
+						noArtQuot= quantity / qtyPerArt ;
+						noArtRem = quantity % qtyPerArt ;
+						if(noArtRem > 0)
+						{
+							noArtRem = 1;
+						}
+						noArtQuot = (int) noArtQuot;
+
+						noArt = noArtQuot + noArtRem;
+						System.out.println( "noArt>>>>>>>::"+noArt);
+						System.out.println( "noArtQuot>>>>>>>::"+noArtQuot);
+						System.out.println( "noArtRem>>>>>>>::"+noArtRem);
+						System.out.println( "qtyPerArt>>>>>>>::"+qtyPerArt);
+						System.out.println( "quantity()>>>>>>>::"+quantity);
 
 						valueXmlString.append( "<quantity><![CDATA[" ).append( quantity ).append( "]]></quantity>\r\n" );
 						valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
 					}
+					rs.close();
+					pstmt.close();
 				}
+
 				else if( currentColumn.trim().equalsIgnoreCase( "quantity" ) )
 				{
-					String lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
-					String lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
-					String itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
-					String palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
+					lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
+					lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
+					itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
+					palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
 					loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
-					String quantityStr = checkNullAndTrim(genericUtility.getColumnValue("quantity",currFormDataDom));
+					quantityStr = checkNullAndTrim(genericUtility.getColumnValue("quantity",currFormDataDom));
 					quantityStr = quantityStr.length() == 0 ? "0" : quantityStr;
 					quantity = Double.parseDouble(quantityStr);
 
@@ -970,7 +1016,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 					pstmt.setString(5, lotNo);
 					pstmt.setString(6, lotSl);
 
-					ResultSet rs = pstmt.executeQuery();
+					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
 						qtyPerArt = rs.getDouble("QTY_PER_ART");
@@ -992,6 +1038,49 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 						valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
 					}
+					rs.close();
+					pstmt.close();
+				}
+				else if( currentColumn.trim().equalsIgnoreCase( "no_art" ) )
+				{
+					lotSl = checkNullAndTrim(genericUtility.getColumnValue("lot_sl",currFormDataDom));
+					lotNo = checkNullAndTrim(genericUtility.getColumnValue("lot_no",currFormDataDom));
+					itemCode = checkNullAndTrim(genericUtility.getColumnValue("item_code",currFormDataDom));
+					palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
+					loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
+					noArtStr = checkNullAndTrim(genericUtility.getColumnValue("no_art",currFormDataDom));
+					noArtStr = noArtStr.length() == 0 ? "0" : noArtStr;
+					noArtD = Double.parseDouble(noArtStr);
+
+
+					String sql = "SELECT S.QTY_PER_ART FROM STOCK S ,LOCATION L" +
+					" WHERE L.INV_STAT=? AND L.LOC_CODE=? AND  L.SITE_CODE=? AND" +
+					" S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND " +
+					"S.LOT_NO=? AND S.LOT_SL=? ";
+
+					PreparedStatement pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, "AWMS");
+					pstmt.setString(2, palletNo);
+					pstmt.setString(3, loginSite);
+					pstmt.setString(4, itemCode);
+					pstmt.setString(5, lotNo);
+					pstmt.setString(6, lotSl);
+
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						qtyPerArt = rs.getDouble("QTY_PER_ART");
+
+						quantity  = noArtD* qtyPerArt ;
+
+						System.out.println( "noArt>>>>>>>::"+noArt);
+						System.out.println( "qtyPerArt>>>>>>>::"+qtyPerArt);
+						System.out.println( "quantity()>>>>>>>::"+quantity);
+
+						valueXmlString.append( "<quantity><![CDATA[" ).append( quantity ).append( "]]></quantity>\r\n" );
+					}
+					rs.close();
+					pstmt.close();
 				}
 
 				valueXmlString.append( "</Detail2>\r\n" );

webitm-wms/module-resource/sql/W15HSUN003.sql

@@ -198,14 +198,14 @@ VALUES ('QUANTITY','W_PALLET_REQ_STK','SELECT DISTINCT S.QUANTITY FROM STOCK S ,
 '
 ,'User-defined Type',0,0,SYSDATE,'BASE','BASE','0',':pallet_no,:site_code,:item_code,:lot_no,:lot_sl',
 '0');
----------------------------------------OBJ_ITEMCHANGE-------------------------------------------------------------------------------------------
+------------------------------------------------OBJ_ITEMCHANGE-------------------------------------------------------------------------------------------
 insert into obj_itemchange (obj_name,form_no,field_name,mandatory) 
 values ('pallet_req_stk','2','lot_sl','Y');
 
 insert into obj_itemchange (obj_name,form_no,field_name,mandatory) 
 values ('pallet_req_stk','2','quantity','Y');
 
----------------------------------------------------pophelp for location code------------------------------------------------------------
+-----------------------------------------------------pophelp for location code------------------------------------------------------------
 
 INSERT INTO POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER
 ,CHG_TERM,DIST_OPT,SQL_INPUT,HELP_OPTION)