Add Validation for Sample Quantity to allow zero sample quantity(M14HFRA001)

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

webitm-mfg/ibase/webitm/ejb/mfg/QCSampleWizIC.java

@@ -337,12 +337,12 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 						if (sampleQtyStr != null && sampleQtyStr.trim().length() > 0)
 						{
 							sampleQty= Double.parseDouble(sampleQtyStr);
-							if( sampleQty == 0 )
+							/*if( sampleQty == 0 )
 							{
 								errCode = "VMQCQTN";
 								errString = getErrorString("sample_qty",errCode,userId);
 								break ;
-							}
+							}*/
 							if( sampleQty < 0 )
 							{
 								errCode = "VMQCQTM";
@@ -451,7 +451,7 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 		String tranId="", sql = "",qcOrdNo="",locDescr="",loginSite="",refSer="XFRX";
 		String itemCode = "",siteCode = "",itemDescr = "",currDateStr=""; 
 		String lotNo="",locCode="",lotSl="",locCodeFrom="",locDescrFrom="",lotNoFrom="",lotNoTo="",lotSlFrom="",lotSlTo="",locCodeTo="";
-		String descr = "",unit = "";
+		String descr = "",unit = "",containerNo="";
 		String userId = "", termId = "",errCode="",chgTerm="";
 		int lineNo = 0;
 		int currentFormNo =0;
@@ -571,7 +571,7 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 							+" ( stock.site_code = ?) AND  "
 							+" ( stock.lot_no = ?) AND  "
 							+" ( stock.inv_stat = 'NOSL') AND  "
-							+" ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 )"; //Add location Code "QUAR"
+							+" ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 ) order by  stock.lot_no, stock.lot_sl "; 
 					pstmt= conn.prepareStatement(sql);
 					pstmt.setString(1, itemCode);
 					pstmt.setString(2, siteCode);
@@ -606,7 +606,7 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 						valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
 						valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
 						valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
-						valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull(lotSl)).append("]]></line_no_sl>\r\n");
+						valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull("1")).append("]]></line_no_sl>\r\n");
 						valueXmlString.append("</Detail3>\r\n");
 				    }
 				    pstmt.close();
@@ -650,6 +650,8 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 						lotSlTo = genericUtility.getColumnValueFromNode("lot_sl__to", parentNode);
 						quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", parentNode));
 						noArt = Integer.parseInt(genericUtility.getColumnValueFromNode("no_art", parentNode));
+						containerNo = genericUtility.getColumnValueFromNode("line_no_sl", parentNode);
+						
 				        //Prepare Selected row..
 						valueXmlString.append("<Detail4 domID='" + newInt + "' selected=\"N\">\r\n");
 						valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
@@ -667,6 +669,7 @@ public class QCSampleWizIC extends ValidatorEJB implements QCSampleWizICLocal,QC
 						valueXmlString.append( "<quantity><![CDATA[" ).append( quantity ).append( "]]></quantity>\r\n" );
 						valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
 						valueXmlString.append( "<sample_qty><![CDATA[" ).append( "" ).append( "]]></sample_qty>\r\n" );
+						valueXmlString.append( "<line_no_sl><![CDATA[").append(checkNull(containerNo)).append("]]></line_no_sl>\r\n");
 						valueXmlString.append("</Detail4>\r\n");
 					}//end for loop for get selected/...
 				}//end itemdefault in case 4..