updated for hold status,shipp size

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

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

@@ -404,7 +404,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 
 						totQty = qtyConf - qtyShip;
 						
-						if(totQty <= 0)
+						if(totQty < 0)
 						{
 							errCode = "DIDOTQLTZ";
 							errString = getErrorString("lot_sl",errCode,userId);
@@ -1293,7 +1293,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 				distOrder = genericUtility.getColumnValue("dist_order1", dom1);
 				siteCodeDlv = genericUtility.getColumnValue("site_code__dlv",dom2);
 				System.out.println("tran val"+tranid+"dist_order1>>>"+distOrder);
-
+				
 				
 				sql = "select add_user,dist_order from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ?";
 				pstmt=conn.prepareStatement(sql);
@@ -1372,6 +1372,12 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 				chgUser = chgUser.trim();
 				if(currentColumn.trim().equalsIgnoreCase("itm_default"))
 				{
+					double holdQty = 0.0;
+					String holdsts = "HOLD";
+
+					lotSl = genericUtility.getColumnValue("lot_sl",dom);
+					siteCode = genericUtility.getColumnValue("site_code", dom2,"2");
+					
 					System.out.println("in itm default for>>> check itm_default");
 					System.out.println("FIND CHK ...>>>>>>.."+addUser+">>>>>>"+chgUser);
 					
@@ -1480,6 +1486,32 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							valueXmlString.append("<batch_no>").append("<![CDATA[").append( ( (rs.getString("batch_no") == null) ? "":rs.getString("batch_no") ) ).append("]]>").append("</batch_no>\r\n");
 							valueXmlString.append("<grade>").append("<![CDATA[").append( ( (rs.getString("grade") == null) ? "": rs.getString("grade") ) ).append("]]>").append("</grade>\r\n");
 							valueXmlString.append("<lot_no>").append("<![CDATA[").append(( (rs.getString("lot_no") == null) ? "": rs.getString("lot_no"))).append("]]>").append("</lot_no>\r\n");
+							
+							sql = "select HOLD_QTY  from stock where site_code = ? AND LOT_SL = ? AND QUANTITY > 0";
+							pstmt1=conn.prepareStatement(sql);
+							pstmt1.setString(1,siteCode);
+							pstmt1.setString(2,lotSl);
+							rs1 = pstmt1.executeQuery();
+							if(rs1.next())
+							{
+								holdQty = rs1.getDouble(1);
+							}
+							pstmt1.close();
+							rs1.close();
+							pstmt1 = null;
+							rs1 = null;
+							System.out.println("holdQty value >>>>>>>"+holdQty);
+							if(holdQty > 0)
+							{
+								valueXmlString.append("<lot_status>").append("<![CDATA[" + holdsts + "]]>").append("</lot_status>\r\n");
+								
+							}
+							else
+							{
+								//not on hold
+							}
+							
+							
 							valueXmlString.append("</Detail3>");
 						}
 						pstmt.close();
@@ -2013,8 +2045,9 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							valueXmlString.append("<pack_instr>").append("<![CDATA[").append((rs1.getString(21) == null) ? "":rs1.getString(21)).append("]]>").append("</pack_instr>\r\n"); //Gulzar 24/03/07
 							valueXmlString.append("<retest_date>").append("<![CDATA[").append((rs1.getDate(19) == null) ? "":sdf.format(rs1.getDate(19))).append("]]>").append("</retest_date>\r\n");
 							valueXmlString.append("<dimension>").append("<![CDATA[").append((rs1.getString(18) == null) ? "":rs1.getString(18)).append("]]>").append("</dimension>\r\n");
+							System.out.println("supp_code__mfg>>>>>>>>DD>>>>ass"+rs1.getString(20) == null ? "":rs1.getString(20));
 							valueXmlString.append("<supp_code__mfg>").append("<![CDATA[").append((rs1.getString(20) == null) ? "":rs1.getString(20)).append("]]>").append("</supp_code__mfg>\r\n"); //Gulzar 24/03/07
-						    System.out.println("site_code__mfg>>>>>>>>>>"+siteCodeDlv);
+						    System.out.println("site_code__mfg>>>>>>DDFF>>>>>>ass"+siteCodeDlv+" F>>>>>>>>"+rs1.getString("site_code__mfg") == null ? "":rs1.getString("site_code__mfg"));
 							valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append(siteCodeDlv).append("]]>").append("</site_code__mfg>\r\n");
 						    valueXmlString.append("<mfg_date>").append("<![CDATA[").append((rs1.getDate(8) == null) ? "":sdf.format(rs1.getDate(8))).append("]]>").append("</mfg_date>\r\n");
 							valueXmlString.append("<exp_date>").append("<![CDATA[").append((rs1.getDate(4) == null) ? "":sdf.format(rs1.getDate(4))).append("]]>").append("</exp_date>\r\n");