Skip to content

B
business-java
Commit 3f2efa3a authored by pshinde's avatar pshinde
Browse files
Options

changes done by Chandrakant 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98710 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 745a8ff4
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 20 deletions
webitm-mfg/ibase/webitm/ejb/mfg/MrpWizPrsSaveBean.java
View file @ 3f2efa3a
...@@ -326,6 +326,64 @@ public class MrpWizPrsSaveBean ...@@ -326,6 +326,64 @@ public class MrpWizPrsSaveBean
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
// modify for ref_no start on urse 10/10/15
String refWorkOrder="";
String tempSO="",tempLineNo="";
System.out.println("@@@@@@@@@@@ sorderList["+sorderList+"]");
String sorderArray[]=sorderList.split("@");
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
for(int i=0;i<sorderArray.length;i++)
{
tempSO=sorderArray[i];
String sorderLineArray[]=tempSO.split(",");
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
if( sorderLineArray.length > 1)
{
tempSO=sorderLineArray[0];
tempLineNo=sorderLineArray[1];
}
System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]....");
}
if( tempSO != null && tempSO.trim().length() > 0 )
{
sql1=" select work_order from workorder where sale_order = ? AND site_code = ? ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1,tempSO);
pstmt1.setString(2,siteCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
refWorkOrder = rs1.getString("work_order");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
System.out.println("@@@@@ 1 refWorkOrder ["+refWorkOrder+"]");
if( refWorkOrder == null || refWorkOrder.trim().length() == 0 )
{
sql1=" select work_order from workorder where addn_order like '%"+tempSO+"%' and site_code = ? ";
pstmt1=conn.prepareStatement(sql1);
// pstmt1.setString(1,saleOrder);
pstmt1.setString(1,siteCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
refWorkOrder =rs1.getString("work_order");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
System.out.println("@@@@@ 2 refWorkOrder ["+refWorkOrder+"]");
}
}
System.out.println("@@@@@ final refWorkOrder ["+refWorkOrder+"]");
// modify for ref_no end on urse 10/10/15
if( runningSupplyStr.trim().length() > 0) if( runningSupplyStr.trim().length() > 0)
{ {
runningSupply = runningSupplyStr==null?0:Double.parseDouble(runningSupplyStr); runningSupply = runningSupplyStr==null?0:Double.parseDouble(runningSupplyStr);
...@@ -379,14 +437,15 @@ public class MrpWizPrsSaveBean ...@@ -379,14 +437,15 @@ public class MrpWizPrsSaveBean
tranId = generateTranId( "w_inv_allocate",siteCode, conn ); tranId = generateTranId( "w_inv_allocate",siteCode, conn );
sql = " insert into inv_allocate ( TRAN_ID,TRAN_DATE,TRAN_TYPE,WORK_ORDER,SITE_CODE,ITEM_CODE," + sql = " insert into inv_allocate ( TRAN_ID,TRAN_DATE,TRAN_TYPE,WORK_ORDER,SITE_CODE,ITEM_CODE," +
" CHG_DATE,CHG_USER,CHG_TERM,REMARKS,CONFIRMED,CONF_DATE,STATUS,STATUS_DATE )" + " CHG_DATE,CHG_USER,CHG_TERM,REMARKS,CONFIRMED,CONF_DATE,STATUS,STATUS_DATE )" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
System.out.println("header sql :"+sql); System.out.println("header sql :"+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
pstmt.setDate(2,date); // TRAN_DATE pstmt.setDate(2,date); // TRAN_DATE
pstmt.setString(3, tranType); // TRAN_TYPE VARCHAR2(3) pstmt.setString(3, tranType); // TRAN_TYPE VARCHAR2(3)
pstmt.setString(4, prevItemWorder); // WORK_ORDER CHAR(10) //pstmt.setString(4, prevItemWorder); // WORK_ORDER CHAR(10)
pstmt.setString(4, refWorkOrder); // added by cpatil for ref no as workorder
pstmt.setString(5, siteCode); // SITE_CODE CHAR(5) pstmt.setString(5, siteCode); // SITE_CODE CHAR(5)
pstmt.setString(6, previousItem); // ITEM_CODE CHAR(10) pstmt.setString(6, previousItem); // ITEM_CODE CHAR(10)
pstmt.setDate(7, date); //CHG_DATE DATE pstmt.setDate(7, date); //CHG_DATE DATE
...@@ -404,8 +463,8 @@ public class MrpWizPrsSaveBean ...@@ -404,8 +463,8 @@ public class MrpWizPrsSaveBean
// for inserting detail // for inserting detail
sql = " insert into inv_alloc_det ( TRAN_ID,LINE_NO,SITE_CODE,ITEM_CODE,LOT_NO,LOT_SL,QUANTITY,REMARKS,REAS_CODE," + sql = " insert into inv_alloc_det ( TRAN_ID,LINE_NO,SITE_CODE,ITEM_CODE,LOT_NO,LOT_SL,QUANTITY,REMARKS,REAS_CODE," +
" LOC_CODE,EXP_LEV,POTENCY_ADJ,ISSUE_QTY,DEALLOC_QTY,ALLOC_QTY,DEALLOCATED )" + " LOC_CODE,EXP_LEV,POTENCY_ADJ,ISSUE_QTY,DEALLOC_QTY,ALLOC_QTY,DEALLOCATED )" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
System.out.println("detail sql :"+sql); System.out.println("detail sql :"+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -682,7 +741,7 @@ public class MrpWizPrsSaveBean ...@@ -682,7 +741,7 @@ public class MrpWizPrsSaveBean
} }
// for sorder updation // for sorder updation
if ( ( errString == null || errString.trim().length() == 0 ) && sorderList != null ) if ( ( errString == null || errString.trim().length() == 0 ) && sorderList != null )
{ {
System.out.println("@@@@@@@@@@@ sorderList["+sorderList+"]"); System.out.println("@@@@@@@@@@@ sorderList["+sorderList+"]");
...@@ -691,27 +750,38 @@ public class MrpWizPrsSaveBean ...@@ -691,27 +750,38 @@ public class MrpWizPrsSaveBean
for(int i=0;i<sorderArray.length;i++) for(int i=0;i<sorderArray.length;i++)
{ {
String tempSO="",tempLineNo=""; String tempSO="",tempLineNo="";
tempSO=sorderArray[i]; tempSO=sorderArray[i];
String sorderLineArray[]=tempSO.split(","); String sorderLineArray[]=tempSO.split(",");
System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]"); System.out.println("@@@@@ sorderArray.length["+sorderArray.length+"]");
if( sorderLineArray.length > 1) if( sorderLineArray.length > 1)
{ {
tempSO=sorderLineArray[0]; tempSO=sorderLineArray[0];
tempLineNo=sorderLineArray[1]; tempLineNo=sorderLineArray[1];
} }
System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]...."); System.out.println("@@@@@::: sorder ["+tempSO+"]tempLineNo["+tempLineNo+"] updated next i["+i+"]....");
// update qty_alloc in sorditem after finish click in ATP @urse on 12/10/15
sql2 = " update sorditem set alloc_flag = 'Y' where sale_order = ? and ltrim(rtrim(line_no)) = ? "; sql2 = " update sorditem set alloc_flag = 'Y' , qty_alloc= qty_alloc+ ? where sale_order = ? and ltrim(rtrim(line_no)) = ? ";
System.out.println("sql2 :"+sql2 ); System.out.println("sql2 :"+sql2 );
pstmt2 = conn.prepareStatement(sql2); pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,tempSO); pstmt2.setDouble(1,allocQty);
pstmt2.setString(2,tempLineNo); pstmt2.setString(2,tempSO);
pstmt2.setString(3,tempLineNo);
int cnt2 = pstmt2.executeUpdate(); int cnt2 = pstmt2.executeUpdate();
pstmt2.close(); pstmt2.close();
pstmt2 = null; pstmt2 = null;
/*
sql2 = " update sorditem set alloc_flag = 'Y' , qty_alloc= qty_alloc+ ? where sale_order = ? and ltrim(rtrim(line_no)) = ? ";
System.out.println("sql2 :"+sql2 );
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setDouble(1,allocQty);
pstmt2.setString(2,tempSO);
pstmt2.setString(3,tempLineNo);
int cnt2 = pstmt2.executeUpdate();
pstmt2.close();
pstmt2 = null;
*/
System.out.println("@@@@@ cnt ["+cnt2+"]:::sorditem:::sorder["+tempSO+"]tempLineNo["+tempLineNo+"]alloc_flag[Y]updated sucessfully"); System.out.println("@@@@@ cnt ["+cnt2+"]:::sorditem:::sorder["+tempSO+"]tempLineNo["+tempLineNo+"]alloc_flag[Y]updated sucessfully");
} }
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ 3f2efa3a
...@@ -5388,7 +5388,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -5388,7 +5388,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String tmpSO=checkNull(adpElement.getSaleOrder()); String tmpSO=checkNull(adpElement.getSaleOrder());
if(tmpSO.trim().length()==0) if(tmpSO.trim().length()==0)
{ {
adpeList.remove(adpeList.indexOf(adpElement)); // adpeList.remove(adpeList.indexOf(adpElement));
if( adpeList.indexOf(adpElement) > -1) // add this condition at urse on 11/10/15 for remove exception
{
adpeList.remove(adpeList.indexOf(adpElement));
}
} }
} }
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPWiz.java
View file @ 3f2efa3a
...@@ -538,7 +538,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz ...@@ -538,7 +538,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
" and (sorder.cust_code = customer.cust_code )" + " and (sorder.cust_code = customer.cust_code )" +
//" and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' " + //" and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' " +
" and case when sorditem.alloc_flag is null then 'N' else sorditem.alloc_flag end <> 'Y' " + " and case when sorditem.alloc_flag is null then 'N' else sorditem.alloc_flag end <> 'Y' " +
" and ( siteitem.item_code = item.item_code ) and ( siteitem.site_code = sorditem.site_code ) " ; " and ( siteitem.item_code = item.item_code ) and ( siteitem.site_code = sorditem.site_code )" +
" and (select count(1) from mps_order where mps_order.sale_order = sorder.sale_order and siteitem.mfg_type = 'S') = 0" ;
if("order_date".equalsIgnoreCase(viewByDate)) if("order_date".equalsIgnoreCase(viewByDate))
{ {
...@@ -711,7 +712,10 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz ...@@ -711,7 +712,10 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
itemCodeOnlyList = itemCodeOnlyList + ",'"+itemCode+"'" ; itemCodeOnlyList = itemCodeOnlyList + ",'"+itemCode+"'" ;
//locGroupList = locGroupList + ",'"+saleOrder+itemCode+"@"+locGroup+"'" ; //locGroupList = locGroupList + ",'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = locGroupList + ","+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ; if( locGroup!= null && locGroup.trim().length() > 0)
{
locGroupList = locGroupList + ","+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
}
soItemList = soItemList + ","+saleOrder+"@"+itemCode+"" ; soItemList = soItemList + ","+saleOrder+"@"+itemCode+"" ;
} }
else else
...@@ -720,7 +724,10 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz ...@@ -720,7 +724,10 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
itemCodeOnlyList = "'"+itemCode+"'" ; itemCodeOnlyList = "'"+itemCode+"'" ;
//locGroupList = "'"+saleOrder+itemCode+"@"+locGroup+"'" ; //locGroupList = "'"+saleOrder+itemCode+"@"+locGroup+"'" ;
locGroupList = ""+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ; if( locGroup!= null && locGroup.trim().length() > 0)
{
locGroupList = ""+checkNull(saleOrder).trim()+"@"+checkNull(locGroup).trim()+"" ;
}
soItemList = saleOrder+"@"+itemCode ; soItemList = saleOrder+"@"+itemCode ;
} }
System.out.println("itemCodeList=="+itemCodeList); System.out.println("itemCodeList=="+itemCodeList);
......
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