Skip to content

B
business-java
Commit 8a558e65 authored by cpatil's avatar cpatil
Browse files
Options

changes for supreme 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97449 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1923dded
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 25 deletions
webitm-mfg/ibase/webitm/ejb/mfg/MRPWizardAllocateQtyBean.java
View file @ 8a558e65
...@@ -195,8 +195,10 @@ public class MRPWizardAllocateQtyBean ...@@ -195,8 +195,10 @@ public class MRPWizardAllocateQtyBean
System.out.println("locCodeGrpList["+locCodeGrpList+"]"); System.out.println("locCodeGrpList["+locCodeGrpList+"]");
int lineCounter=0;
for (int dtlCtr = 0; dtlCtr < hdrDommList.getLength(); dtlCtr++) for (int dtlCtr = 0; dtlCtr < hdrDommList.getLength(); dtlCtr++)
{ {
lineCounter++;
Node detailListNode = hdrDommList.item(dtlCtr); Node detailListNode = hdrDommList.item(dtlCtr);
NodeList detail4List= detailListNode.getChildNodes(); NodeList detail4List= detailListNode.getChildNodes();
System.out.println("@@@@@@@@@node name[" + detailListNode.getNodeName()+"]"); System.out.println("@@@@@@@@@node name[" + detailListNode.getNodeName()+"]");
...@@ -419,7 +421,7 @@ public class MRPWizardAllocateQtyBean ...@@ -419,7 +421,7 @@ public class MRPWizardAllocateQtyBean
saleOrder = saleOrder==null?"":saleOrder.trim(); saleOrder = saleOrder==null?"":saleOrder.trim();
lineNo = lineNo==null?"":lineNo.trim(); lineNo = lineNo==null?"":lineNo.trim();
System.out.println("cpatil@@@@ctr["+dtlCtr+"]saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-" + System.out.println("cpatil@@@@lineCounter["+lineCounter+"]ctr["+dtlCtr+"]saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-" +
"qtyReqd["+qtyReqdStr+"]prevItemWorder["+prevItemWorder+"]previousItem["+previousItem+"]@@@"); "qtyReqd["+qtyReqdStr+"]prevItemWorder["+prevItemWorder+"]previousItem["+previousItem+"]@@@");
System.out.println("@@@@ctr["+dtlCtr+"]siteCode["+siteCode+"]-itemCode["+itemCode+"]" + System.out.println("@@@@ctr["+dtlCtr+"]siteCode["+siteCode+"]-itemCode["+itemCode+"]" +
"-lotNo["+lotNo+"]-lotSl["+lotSl+"]-locCode["+locCode+"]-tranSer["+tranSer+"]" + "-lotNo["+lotNo+"]-lotSl["+lotSl+"]-locCode["+locCode+"]-tranSer["+tranSer+"]" +
...@@ -440,7 +442,7 @@ public class MRPWizardAllocateQtyBean ...@@ -440,7 +442,7 @@ public class MRPWizardAllocateQtyBean
//System.out.println("key["+key+"]"); //System.out.println("key["+key+"]");
stockInfo = siteCode+"@"+itemCode+"@"+lotNo+"@"+lotSl+"@"+locCode+"@" + stockInfo = siteCode+"@"+itemCode+"@"+lotNo+"@"+lotSl+"@"+locCode+"@" +
""+tranSer+"@"+runningSupplyStr+"@"+qtyReqdStr+"@"+allocQtyStr+"@"+supplyStr+"@" + ""+tranSer+"@"+runningSupplyStr+"@"+qtyReqdStr+"@"+allocQtyStr+"@"+supplyStr+"@" +
""+suppSour+"@"+parentItem+"@" +prevItemWorder+"@"+previousItem+"@"+dtlCtr; ""+suppSour+"@"+parentItem+"@" +prevItemWorder+"@"+previousItem+"@"+lineCounter;
System.out.println("key["+key+"]stockInfo["+stockInfo+"]"); System.out.println("key["+key+"]stockInfo["+stockInfo+"]");
ArrayList<String> tempAllocationList = new ArrayList<String>(); ArrayList<String> tempAllocationList = new ArrayList<String>();
if(allocationMap.containsKey(key)) if(allocationMap.containsKey(key))
...@@ -496,7 +498,7 @@ public class MRPWizardAllocateQtyBean ...@@ -496,7 +498,7 @@ public class MRPWizardAllocateQtyBean
parentItem = keyStr[11]; parentItem = keyStr[11];
prevItemWorder = keyStr[12]; prevItemWorder = keyStr[12];
previousItem = keyStr[13]; previousItem = keyStr[13];
dtlCtr = keyStr[14]; lineCounter = Integer.parseInt(keyStr[14]);
if( runningSupplyStr.trim().length() > 0) if( runningSupplyStr.trim().length() > 0)
{ {
...@@ -547,23 +549,23 @@ public class MRPWizardAllocateQtyBean ...@@ -547,23 +549,23 @@ public class MRPWizardAllocateQtyBean
selectedItemHtml = selectedItemHtml + //Detail4.PORF0006..3.11/03/13.item_code selectedItemHtml = selectedItemHtml + //Detail4.PORF0006..3.11/03/13.item_code
//"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".sale_order' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".sale_order' value='" + saleOrder + "'></INPUT>"+ //"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".sale_order' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".sale_order' value='" + saleOrder + "'></INPUT>"+
//"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".line_no' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".line_no' value='" + lineNo + "'></INPUT>"+ //"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".line_no' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".line_no' value='" + lineNo + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".item_code' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".item_code' value='" + itemCode + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".item_code' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".item_code' value='" + itemCode + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".qty_reqd' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".qty_reqd' value='" + qtyReqd + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".qty_reqd' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".qty_reqd' value='" + qtyReqd + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".site_code' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".site_code' value='" + siteCode + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".site_code' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".site_code' value='" + siteCode + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".lot_no' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".lot_no' value='" + lotNo + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".lot_no' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".lot_no' value='" + lotNo + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".lot_sl' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".lot_sl' value='" + lotSl + "'></INPUT>" + "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".lot_sl' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".lot_sl' value='" + lotSl + "'></INPUT>" +
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".loc_code' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".loc_code' value='" + locCode + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".loc_code' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".loc_code' value='" + locCode + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".tran_ser' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".tran_ser' value='" + tranSer + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".tran_ser' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".tran_ser' value='" + tranSer + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".tran_id' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".tran_id' value='" + tranId + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".tran_id' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".tran_id' value='" + tranId + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".ref_line_no' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".ref_line_no' value='" + refLineNo + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".ref_line_no' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".ref_line_no' value='" + refLineNo + "'></INPUT>"+
//"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".supply' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".supply' value='" + ( availableSupply - QuantityReqAllocate ) + "'></INPUT>"+ //"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".supply' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".supply' value='" + ( availableSupply - QuantityReqAllocate ) + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".supply' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".supply' value='" + availableSupply + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".supply' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".supply' value='" + availableSupply + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".available_supply' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".available_supply' value='" + availableSupply + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".available_supply' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".available_supply' value='" + availableSupply + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".parent_item' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".parent_item' value='" + parentItem + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".parent_item' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".parent_item' value='" + parentItem + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".prev_item_worder' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".prev_item_worder' value='" + prevItemWorder + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".prev_item_worder' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".prev_item_worder' value='" + prevItemWorder + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".previous_item' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".previous_item' value='" + previousItem + "'></INPUT>"+ "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".previous_item' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".previous_item' value='" + previousItem + "'></INPUT>"+
"<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".alloc_qty' id='Detail4." +saleOrder+"."+lineNo+"."+dtlCtr+"."+dueDate+".alloc_qty' value='" + QuantityReqAllocate + "'></INPUT>"; "<INPUT TYPE='hidden' name='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".alloc_qty' id='Detail4." +saleOrder+"."+lineNo+"."+lineCounter+"."+dueDate+".alloc_qty' value='" + QuantityReqAllocate + "'></INPUT>";
System.out.println("@@@@@@@@ QuantityReqAllocate["+QuantityReqAllocate+"] for itemCode["+itemCode+"]locCode["+locCode+"]lotNo["+lotNo+"]lotSl["+lotSl+"]saleOrder["+saleOrder+"]lineNo["+lineNo+"]"); System.out.println("@@@@@@@@ lineCounter["+lineCounter+"]QuantityReqAllocate["+QuantityReqAllocate+"] for itemCode["+itemCode+"]locCode["+locCode+"]lotNo["+lotNo+"]lotSl["+lotSl+"]saleOrder["+saleOrder+"]lineNo["+lineNo+"]");
} }
} }
} }
......
webitm-mfg/ibase/webitm/ejb/mfg/QCTransferConf.java
View file @ 8a558e65
...@@ -654,7 +654,7 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -654,7 +654,7 @@ QCTransferConfLocal, QCTransferConfRemote
stockUpd.put("tran_type", "I"); stockUpd.put("tran_type", "I");
stockUpd.put("tran_ser","QC-TRF" ); stockUpd.put("tran_ser","QC-TRF" );
stockUpd.put("tranid",tranId ); //pending stockUpd.put("tran_id",tranId ); //pending
if(isByProduct) if(isByProduct)
{ {
stockUpd.put("item_code", qcOrderItem); stockUpd.put("item_code", qcOrderItem);
...@@ -687,6 +687,7 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -687,6 +687,7 @@ QCTransferConfLocal, QCTransferConfRemote
} }
stockUpd.put("no_art",Math.ceil(Double.parseDouble(stockUpd.get("qty_stduom").toString())/qtyPerArt)); stockUpd.put("no_art",Math.ceil(Double.parseDouble(stockUpd.get("qty_stduom").toString())/qtyPerArt));
if(stockQty != 0 ) if(stockQty != 0 )
{ {
//stockUpd.put("net_weight",stkNetWt / stockQty * Double.parseDouble( stockUpd.get("qty_stduom").toString())); //stockUpd.put("net_weight",stkNetWt / stockQty * Double.parseDouble( stockUpd.get("qty_stduom").toString()));
...@@ -694,6 +695,7 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -694,6 +695,7 @@ QCTransferConfLocal, QCTransferConfRemote
// commented above lines and below logic added as per instruction on 23/02/15 // commented above lines and below logic added as per instruction on 23/02/15
if( netWeightQCTransfer > 0 ) // for net_weight if( netWeightQCTransfer > 0 ) // for net_weight
{ {
System.out.println("");
stockUpd.put("net_weight", netWeightQCTransfer ); stockUpd.put("net_weight", netWeightQCTransfer );
} }
else else
...@@ -703,13 +705,14 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -703,13 +705,14 @@ QCTransferConfLocal, QCTransferConfRemote
if( noArtQCTransfer > 0 ) // for tare_weight if( noArtQCTransfer > 0 ) // for tare_weight
{ {
stockUpd.put("tare_weight", tareWtPerArt * noArtQCTransfer ); stockUpd.put("tare_weight", tareWtPerArt * noArtQCTransfer );
} }
else else
{ {
stockUpd.put("tare_weight", tareWtPerArt * Double.parseDouble(stockUpd.get("no_art").toString())); stockUpd.put("tare_weight", tareWtPerArt * Double.parseDouble(stockUpd.get("no_art").toString()));
} }
System.out.println("cpatil1:netWeightQCTransfer["+netWeightQCTransfer+"]noArtQCTransfer["+noArtQCTransfer+"]:net_weight["+stockUpd.get("net_weight").toString()+"]tare_weight["+stockUpd.get("tare_weight").toString()+"]");
stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) + Double.parseDouble(stockUpd.get("tare_weight").toString())) ); stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) + Double.parseDouble(stockUpd.get("tare_weight").toString())) );
}//end if }//end if
// ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd) // ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd)
...@@ -776,7 +779,10 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -776,7 +779,10 @@ QCTransferConfLocal, QCTransferConfRemote
stockUpd.put("tare_weight", tareWtPerArt * Double.parseDouble(stockUpd.get("no_art").toString())); stockUpd.put("tare_weight", tareWtPerArt * Double.parseDouble(stockUpd.get("no_art").toString()));
} }
System.out.println("cpatil2:netWeightQCTransfer["+netWeightQCTransfer+"]noArtQCTransfer["+noArtQCTransfer+"]:net_weight["+stockUpd.get("net_weight").toString()+"]tare_weight["+stockUpd.get("tare_weight").toString()+"]");
stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) + Double.parseDouble(stockUpd.get("tare_weight").toString()))); stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) + Double.parseDouble(stockUpd.get("tare_weight").toString())));
}//end if }//end if
//ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd) //ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd)
errCode = stockUpdate.updateStock(stockUpd,xtraParams, conn); errCode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
...@@ -792,9 +798,6 @@ QCTransferConfLocal, QCTransferConfRemote ...@@ -792,9 +798,6 @@ QCTransferConfLocal, QCTransferConfRemote
if (errCode == null || errCode.trim().length() == 0 ) if (errCode == null || errCode.trim().length() == 0 )
{ //if gs_run_mode = 'I' then { //if gs_run_mode = 'I' then
if(isByProduct) if(isByProduct)
{ {
if ( qcQty > convertedQty ) if ( qcQty > convertedQty )
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ 8a558e65
...@@ -7490,6 +7490,52 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7490,6 +7490,52 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// ls_org_tran_id) // ls_org_tran_id)
// ld_worder.setitem(ll_row, "ADDN_ORDER", // ld_worder.setitem(ll_row, "ADDN_ORDER",
// trim(ls_addntranid)) // trim(ls_addntranid))
System.out.println(" for addnOrder code");
ArrayList<String> addnOrderList = adpElement.getOrderList();
String refSaleOrder="";
for( int ordCnt=0; ordCnt < addnOrderList.size(); ordCnt++ )
{
String temp = addnOrderList.get(ordCnt);
String[] addnOrderArray = temp.split("@");
if( addnOrderArray.length ==3 )
{
refSaleOrder = refSaleOrder + addnOrderArray[0] + ",";
}
}
System.out.println("@@@@@ refSaleOrder["+refSaleOrder+"] for addnOrder code end");
mpsOrder.addnOrder=refSaleOrder;
if( refSaleOrder == null || refSaleOrder.trim().length()==0 )
{
if( locGroupList != null )
{
System.out.println("@@@@@ locGroupList["+locGroupList+"]");
String locGroupLst[]=locGroupList.split(",");
System.out.println("@@@@@ locGroupLst.length["+locGroupLst.length+"]");
for(int i=0;i<locGroupLst.length;i++)
{
String SOrder="";
String tempLocGroup=locGroupLst[i];
System.out.println("@@@@@ tempLocGroup["+tempLocGroup+"]");
String tempLocGroupArr[]=tempLocGroup.split("@");
if( tempLocGroupArr.length > 0 )
{
SOrder=tempLocGroupArr[0];
refSaleOrder = refSaleOrder + SOrder + ",";
}
System.out.println("@@@@@7530 refSaleOrder["+refSaleOrder+"]");
}
System.out.println("@@@@@final refSaleOrder["+refSaleOrder+"]");
mpsOrder.addnOrder=refSaleOrder;
}
}
mpsOrder.dueDate = dueDate; mpsOrder.dueDate = dueDate;
mpsOrder.status = "P"; mpsOrder.status = "P";
mpsOrder.statusDate = curDate; mpsOrder.statusDate = curDate;
...@@ -7709,6 +7755,53 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7709,6 +7755,53 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
mpsOrder.mfgType = adpElement.getMfgType(); mpsOrder.mfgType = adpElement.getMfgType();
// end 01/04/11 manoharan // end 01/04/11 manoharan
System.out.println(" for addnOrder code");
ArrayList<String> addnOrderList = adpElement.getOrderList();
String refSaleOrder="";
for( int ordCnt=0; ordCnt < addnOrderList.size(); ordCnt++ )
{
String temp = addnOrderList.get(ordCnt);
String[] addnOrderArray = temp.split("@");
if( addnOrderArray.length ==3 )
{
refSaleOrder = refSaleOrder + addnOrderArray[0] + ",";
}
}
System.out.println("@@@@@ refSaleOrder["+refSaleOrder+"] for addnOrder code end");
mpsOrder.addnOrder=refSaleOrder;
if( refSaleOrder == null || refSaleOrder.trim().length()==0 )
{
refSaleOrder="";
if( locGroupList != null )
{
System.out.println("@@@@@ locGroupList["+locGroupList+"]");
String locGroupLst[]=locGroupList.split(",");
System.out.println("@@@@@ locGroupLst.length["+locGroupLst.length+"]");
for(int i=0;i<locGroupLst.length;i++)
{
String SOrder="";
String tempLocGroup=locGroupLst[i];
System.out.println("@@@@@ tempLocGroup["+tempLocGroup+"]");
String tempLocGroupArr[]=tempLocGroup.split("@");
if( tempLocGroupArr.length > 0 )
{
SOrder=tempLocGroupArr[0];
refSaleOrder = refSaleOrder + SOrder + ",";
}
System.out.println("@@@@@7793 refSaleOrder["+refSaleOrder+"]");
}
System.out.println("@@@@@final refSaleOrder["+refSaleOrder+"]");
mpsOrder.addnOrder=refSaleOrder;
}
}
mpsList.add(mpsOrder); mpsList.add(mpsOrder);
} }
} }
...@@ -9708,6 +9801,36 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9708,6 +9801,36 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
} }
System.out.println("@@@@@@@@ tempLocGroup["+tempLocGroup+"]"); System.out.println("@@@@@@@@ tempLocGroup["+tempLocGroup+"]");
if( tempLocGroup == null || tempLocGroup.trim().length() == 0 )
{
if( locGroupList != null )
{
System.out.println("@@@@@ locGroupList["+locGroupList+"]");
String locGroupLst[]=locGroupList.split(",");
System.out.println("@@@@@ locGroupLst.length["+locGroupLst.length+"]");
for(int i=0;i<locGroupLst.length;i++)
{
String SOrder="";
String tempLocGroup1=locGroupLst[i];
System.out.println("@@@@@ tempLocGroup1["+tempLocGroup1+"]");
String tempLocGroupArr[]=tempLocGroup1.split("@");
if( tempLocGroupArr.length > 0 )
{
SOrder=tempLocGroupArr[0];
}
System.out.println("@@@@@9826 SOrder["+SOrder+"]");
if( SOrder != null )
{
tempLocGroup = locGroupMap.get(SOrder);
System.out.println("@@@@@@@@9830 tempLocGroup found------>["+tempLocGroup+"]");
break;
}
}
}
System.out.println("@@@@@9833 tempLocGroup["+tempLocGroup+"]");
}
valueXmlString.append("<loc_group protect = '1'>").append("<![CDATA[" + tempLocGroup + "]]>").append("</loc_group>\r\n"); valueXmlString.append("<loc_group protect = '1'>").append("<![CDATA[" + tempLocGroup + "]]>").append("</loc_group>\r\n");
} }
......
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