Skip to content

B
business-java
Commit 7f6dc48d authored by ppatro's avatar ppatro
Browse files
Options

mannual stock allocation bug and printer sharing 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92371 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e603f13c
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletMergeIC.java
View file @ 7f6dc48d
......@@ -224,16 +224,39 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
{
palletNo = genericUtility.getColumnValue("pallet_no__new",dom);
String palletNoOld = genericUtility.getColumnValueFromNode("pallet_no", dom1.getElementsByTagName("Detail1").item(0));
System.out.println("Old Pallet No ["+palletNoOld+"]New Pallet No["+palletNo+"]");
//Changed by sumit on 13/dec/12 validation for pallet not present in master start.
sql = "SELECT PALLET_NO FROM PALLET_NO WHERE PALLET_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,palletNo);
rs = pstmt.executeQuery();
if( !rs.next() )
{
errString = getErrorString("pallet_no__new","INVPLTNOM",userId);
break;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
//Changed by sumit on 13/dec/12 validation for pallet not present in master end.
if("palletmerge".equalsIgnoreCase(objName))
{
//Changed by sumit on 16/11/12 adding status condition
//sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ?";
sql = "SELECT COUNT(*) AS COUNT FROM DESPATCHDET WHERE DESP_ID IN(SELECT DESP_ID " +
" FROM DESPATCHDET WHERE PALLET_NO = ?) AND PALLET_NO = ?";
sqlCarton = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ? AND STATUS = 'A'";
//Changed by sumit on 13/12/12 changing status parameter
//sqlCarton = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ? AND STATUS = 'A'";
sqlCarton = "SELECT STATUS FROM PALLET_NO WHERE PALLET_NO = ?";
}
else
{
......@@ -275,7 +298,14 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
rs = pstmt.executeQuery();
if( rs.next() )
{
cnt = rs.getInt("COUNT");
//Changed by sumit on 14/12/12 adding validation in case of status 'U' start
//cnt = rs.getInt("COUNT");
if("U".equalsIgnoreCase(rs.getString("STATUS")))
{
errString = getErrorString("pallet_no__new","INVPLTDESP",userId);
break;
}
//Changed by sumit on 14/12/12 adding validation in case of status 'U' end
}
if(pstmt != null)
{
......@@ -289,11 +319,11 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
rs = null;
}
if(cnt == 0 && count == 0)
/*if(cnt == 0 && count == 0)
{
errString = getErrorString("pallet_no__new","INVPLTDESP",userId);
break;
}
}*/
/*if(cnt == 1 && )
{
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7f6dc48d
......@@ -1209,7 +1209,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//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( "<manual_allocqty><![CDATA[" ).append(rs2.getString("MAN_QTY")).append( "]]></manual_allocqty>\r\n" );
retTabSepStrBuff.append( "<manual_allocqty><![CDATA[" ).append((rs2.getString("MAN_QTY") == null) ? "0.0" :rs2.getString("MAN_QTY")).append( "]]></manual_allocqty>\r\n" );
}
else
{
......@@ -1529,11 +1529,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//String updateSql = null;
Connection conn = null;
ResultSet rs = null;
//ResultSet rs1 = null;
//ResultSet rs2 = null;
double manualAllocqty = 0.0;
String allocFlag = "";
//int updCnt = 0;
int parentNodeListLength = 0;
int childNodeListLength = 0;
......@@ -1728,9 +1728,48 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
isMasterPickChecked = childNode.getFirstChild().getNodeValue();
}
//Changed by sumit on 14/12/12 adding validation incase of manualy allocating saleorder and modifiying qty_allow start.
if (childNodeName.equals("manual_allocqty"))
{
if(childNode.getFirstChild() != null)
{
manualAllocqty = Double.parseDouble(childNode.getFirstChild().getNodeValue());
System.out.println(" manualAllocqty ["+manualAllocqty+"]");
}
else
{
manualAllocqty = 0.0;
}
}
if (childNodeName.equals("alloc_flag"))
{
if(childNode.getFirstChild() != null)
{
System.out.println(" inside manuall flag");
allocFlag = checkNull(childNode.getFirstChild().getNodeValue());
}
else
{
allocFlag = "";
}
}
//Changed by sumit on 14/12/12 adding validation incase of manualy allocating saleorder and modifiying qty_allow end.
}
System.out.println(" inside manuall flag");
if("M".equalsIgnoreCase(allocFlag) && allocQty != 0 && manualAllocqty > 0)
{
System.out.println(" manually quantity upadated in case of manuly stock allocated");
errString="INVMDYALLQ";
//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
errString = getError(saleOrder,errString,conn);
return errString;
}
// Changed by rohan on 14/08/12 for stock allocation end.
//Changed by Rohan to set resons detail null in sorder item.start
......
webitm-wms/module-resource/sql/update.sql
View file @ 7f6dc48d
......@@ -36797,6 +36797,37 @@ AND STOCK.SITE_CODE =AS_SITE_CODE;
RETURN AS_STK_QTY;
END;
/
---17DEC12 sumit
INSERT INTO MESSAGES (
msg_no ,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input,
mail_option )
VALUES (
'INVMDYALLQ',
'Invalid Quantity Allocated!!',
'Mannualy Stock allocated line item should not be allocated through Wave !!',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'BASE ',
'BASE ',
NULL,
NULL);
commit;
COMMIT;
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