Commit 4bbe7c16 authored by cpatil's avatar cpatil

FK_WORKORDER_PROJ added for exception


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94299 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 068335ac
......@@ -712,7 +712,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn);
return errString;
}
System.out.println("Made To Oerder............." + madeToOrder);
System.out.println("Made To Order............." + madeToOrder);
// Fetching Balance Intersite from Entered by User in GUI
balIntersite = genericUtility.getColumnValue("balance_intersite", dom);
......@@ -1029,6 +1029,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// System.out.println("Database Name:............"+CommonConstants.DB_NAME);
try
{
System.out.println("@@@@@CommonConstants.DB_NAME["+CommonConstants.DB_NAME+"]::::::isDetailReq["+isDetailReq+"]");
if(isDetailReq)
{
if ((CommonConstants.DB_NAME).equalsIgnoreCase("db2")) /// added for db2 on 17/02/14
......@@ -1042,27 +1043,6 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
}
/*
SELECT CASE WHEN C.ITEM_CODE__PLAN IS NULL THEN C.ITEM_CODE ELSE C.ITEM_CODE__PLAN END ITEM_CODE,
CASE WHEN B.ITEM_CODE IS NULL THEN C.ITEM_SER ELSE CASE WHEN
B.VALID_UPTO IS NULL THEN B.ITEM_SER ELSE C.ITEM_SER END END ITEM_SER,A.MASTER_SCH
FROM rcplive2.SITEITEM A join rcplive2.ITEMSER_CHANGE B on A.ITEM_CODE = B.ITEM_CODE join
rcplive2.ITEM C
on A.ITEM_CODE = C.ITEM_CODE
where
C.ITEM_CODE >= '00'
AND C.ITEM_CODE <= 'ZZ ' AND A.SITE_CODE = 'SI249'
AND CASE WHEN A.MASTER_SCH IS NULL THEN 'Y' ELSE A.MASTER_SCH END <> 'N'
AND B.VALID_UPTO IS NULL
AND C.ITEM_SER >= '0'
AND C.ITEM_SER <= 'ZZ '
AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM rcplive2.SORDDET
WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN('URSO410003CS50018H1B')
// WHERE SALE_ORDER||ITEM_CODE IN('URSO410003 CS50018H1B ')
)
ORDER BY ITEM_CODE ASC
;
*/
if ((CommonConstants.DB_NAME).equalsIgnoreCase("db2"))
{
sql = "SELECT CASE WHEN C.ITEM_CODE__PLAN IS NULL THEN C.ITEM_CODE ELSE C.ITEM_CODE__PLAN END ITEM_CODE,";
......@@ -1095,7 +1075,7 @@ ORDER BY ITEM_CODE ASC
}
// System.out.println("sql :"+sql);
System.out.println("@@@@@ sql :["+sql+"]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCodeFrom);
pstmt.setString(2, itemCodeTo);
......@@ -2621,7 +2601,7 @@ ORDER BY ITEM_CODE ASC
ArrayList tempList = new ArrayList();
try
{
System.out.println("@@@@@@@@ cpatil populateADPList madeToOrder [" + madeToOrder + "]");
if ("0".equals(madeToOrder))
{
System.out.println("adpeList.size()-------------"+adpeList.size());
......@@ -5780,6 +5760,13 @@ ORDER BY ITEM_CODE ASC
// added by sabyasachi 30-03-11
saleOrder = mpsOrder.saleOrder;
lineNo = mpsOrder.lineNo;
if( "".equalsIgnoreCase(projCode) || ( projCode != null && projCode.trim().length() == 0 )) //FK_WORKORDER_PROJ added for exception
{
projCode = null;
}
System.out.println("@@@@@@@@@@@projCode["+projCode+"]");
// added by sabyasachi ends 30-03-11
// 20/01/09 manoharan
// xmlValues
......@@ -5929,7 +5916,7 @@ ORDER BY ITEM_CODE ASC
}
else if (winName.equalsIgnoreCase("W_INDENT"))
{
System.out.println("@@@@@cpatillist.size()["+list.size()+"]");
System.out.println("@@@@@cpatil_W_INDENT_list.size()["+list.size()+"]");
for (int count = 0; count < list.size(); count++)
{
indent = (Indent) list.get(count);
......
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