Commit c2524cf9 authored by ppatro's avatar ppatro

mannual stock allocation bug and printer sharing


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92366 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1b3a62fa
......@@ -1194,8 +1194,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//Changed by sumit on 22/08/12 getting alloc flag end.
*/
sql = "SELECT QTY_ALLOC FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? " +
//Changed by Pragyan 17/12/12 to get the total amount for allocation
/*sql = "SELECT QTY_ALLOC FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? " +
"AND (CASE WHEN WAVE_FLAG IS NULL THEN 'N' ELSE WAVE_FLAG END) = 'N'";*/
sql = "SELECT SUM(QTY_ALLOC) AS MAN_QTY FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? " +
"AND (CASE WHEN WAVE_FLAG IS NULL THEN 'N' ELSE WAVE_FLAG END) = 'N'";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, saleOrderTran);
......@@ -1203,15 +1205,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs2 = pstmt1.executeQuery();
if( rs2.next())
{
//Changed by Pragyan 17/12/12 to get the total amount for allocation
//Changed by sankara on 23/11/12 append qty_alloc porpar format
//retTabSepStrBuff.append(rs2.getString("QTY_ALLOC")).append("\t");
retTabSepStrBuff.append( "<qty_alloc><![CDATA[" ).append(rs2.getString("QTY_ALLOC")).append( "]]></qty_alloc>\r\n" );
//retTabSepStrBuff.append( "<qty_alloc><![CDATA[" ).append(rs2.getString("QTY_ALLOC")).append( "]]></qty_alloc>\r\n" );
retTabSepStrBuff.append( "<manual_allocqty><![CDATA[" ).append(rs2.getString("MAN_QTY")).append( "]]></manual_allocqty>\r\n" );
}
else
{
//Changed by Pragyan 17/12/12 to get the total amount for allocation
//Changed by sankara on 23/11/12 append qty_alloc value 0.0 porpar format
//retTabSepStrBuff.append("0.0").append("\t");
retTabSepStrBuff.append( "<qty_alloc><![CDATA[" ).append("0.0").append( "]]></qty_alloc>\r\n" );
//retTabSepStrBuff.append( "<qty_alloc><![CDATA[" ).append("0.0").append( "]]></qty_alloc>\r\n" );
retTabSepStrBuff.append( "<manual_allocqty><![CDATA[" ).append("0.0").append( "]]></manual_allocqty>\r\n" );
}
if(pstmt1 != null)
{
......@@ -1569,7 +1575,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//Changed sumit on 25/08/12
waveId = "";
//Changed by sumit on 14/12/12 getting value of printer start
printer = "";
printer = checkNull(genericUtility.getColumnValue("printer_name",headerDom));
printLabel = genericUtility.getColumnValue("print_label",headerDom);
System.out.println("* printLabel ["+printLabel+"] printer ["+printer+"]");
PrintService[] printServices = PrinterJob.lookupPrintServices();
ArrayList<String> arry = new ArrayList<String>();
//Changed by sumit on 24/11/12 adding print label condition
if(printer.trim().length() == 0 && "Y".equalsIgnoreCase(printLabel))
{
/*errFields.add( childNodeName.toLowerCase() );
errList.add( "NLLPRINTER" );*/
errString="NLLPRINTER";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
return errString;
}
else if(printer.trim().length() > 0 && "Y".equalsIgnoreCase(printLabel))
{
for (PrintService printService : printServices)
{
String name = printService.getName();
System.out.println("printer service name --> "+name);
arry.add(name);
}
if( !arry.contains(printer.trim()))
{
errString="INVPRINTER";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
return errString;
}
arry.clear();
}
//Changed by sumit on 14/12/12 getting value of printer end
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment