Commit 32a33205 authored by pjain's avatar pjain

changed by sankara on 11/04/14 updated pickissconf,repliossic,wavegenerationic for wms live


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94550 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ebf56931
...@@ -1243,9 +1243,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1243,9 +1243,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
String status = ""; String status = "";
Boolean isUpdateHdr=true; Boolean isUpdateHdr=true;
int updCntPickOrdHdr= 0; int updCntPickOrdHdr= 0;
double pickQty = 0;
try { try {
String sqlPickOrd = "SELECT STATUS FROM PICK_ORD_DET WHERE PICK_ORDER = ? "; //String sqlPickOrd = "SELECT STATUS FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
String sqlPickOrd = "SELECT STATUS,(QUANTITY - (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END )) AS QUANTITY FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
pstmtPickOrdHdr = conn.prepareStatement(sqlPickOrd); pstmtPickOrdHdr = conn.prepareStatement(sqlPickOrd);
pstmtPickOrdHdr.setString(1, pickOrder); pstmtPickOrdHdr.setString(1, pickOrder);
...@@ -1254,7 +1256,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1254,7 +1256,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
while(rsPicKordHdr.next()) while(rsPicKordHdr.next())
{ {
status = rsPicKordHdr.getString("STATUS") == null ? "": rsPicKordHdr.getString("STATUS"); status = rsPicKordHdr.getString("STATUS") == null ? "": rsPicKordHdr.getString("STATUS");
if( !("C".equalsIgnoreCase(status) )) pickQty = rsPicKordHdr.getDouble("QUANTITY");
//Changed By Pragyan 09-apr-14 to start and end
//if( !("C".equalsIgnoreCase(status) ))
System.out.println("@@@@ Inside Check Status["+status+"]pickQty["+pickQty+"]");
if( !("C".equalsIgnoreCase(status) ) && pickQty >0)
{ {
isUpdateHdr =false; isUpdateHdr =false;
break; break;
...@@ -1262,6 +1268,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1262,6 +1268,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
} }
if(isUpdateHdr) if(isUpdateHdr)
{ {
System.out.println("@@@@ Updating hader status as C ");
String updatePickOrdSql = "UPDATE PICK_ORD_HDR SET STATUS = ? " String updatePickOrdSql = "UPDATE PICK_ORD_HDR SET STATUS = ? "
+ " WHERE PICK_ORDER = ? "; + " WHERE PICK_ORDER = ? ";
......
...@@ -184,7 +184,10 @@ etc ...@@ -184,7 +184,10 @@ etc
valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" ); valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
//Changed by sumit on 18/09/12 for single lot and Packing allow end. //Changed by sumit on 18/09/12 for single lot and Packing allow end.
//Changed by sumit on 18/09/12 adding print_label and printer name start. //Changed by sumit on 18/09/12 adding print_label and printer name start.
valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" ); //changed by sankara on 09/04/14 print label set by default no start.
//valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
//changed by sankara on 09/04/14 print label set by default no end.
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" ); valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
//Changed by sumit on 18/09/12 adding print_label and printer name end. //Changed by sumit on 18/09/12 adding print_label and printer name end.
...@@ -551,10 +554,11 @@ etc ...@@ -551,10 +554,11 @@ etc
System.out.println(" waveMode "+waveMode); System.out.println(" waveMode "+waveMode);
if("P".equalsIgnoreCase(waveMode)) if("P".equalsIgnoreCase(waveMode))
{ {
//changed by sankara on 09/04/14 print label set as No in item change
valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "Y" ).append( "]]></print_label>\r\n" ); //valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "Y" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<printer_name protect ='0'><![CDATA[" ).append( "PDFCreator" ).append( "]]></printer_name>\r\n" ); //valueXmlString.append( "<printer_name protect ='0'><![CDATA[" ).append( "PDFCreator" ).append( "]]></printer_name>\r\n" );
valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
} }
else else
{ {
......
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