Skip to content

B
business-java
Commit b16c914e authored by pjain's avatar pjain
Browse files
Options

Changed by Dhanraj -Pragyan for SUN USA Points Issue tracker no 1 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96055 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6c52105f
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 100 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ b16c914e
......@@ -162,6 +162,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
DistCommon discommon = new DistCommon();
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.start
ibase.webitm.utility.wms.CommonWmsUtil commonWmsUtility = ibase.webitm.utility.wms.CommonWmsUtil.getInstance();
private HashMap itemInfoMapForRepl = new HashMap();
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue]
private HashMap itemQtyMapForActiveRepl = new HashMap();
......@@ -483,6 +484,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 14/08/14 for tran code argumnet and loc type parent start.
tranCodeInput = checkNull(genericUtility.getColumnValue("tran_code",headerDom));
locTypeParentInput = checkNull(genericUtility.getColumnValue("loc_type_parent",headerDom));
System.out.println("saleOrdertype:::"+saleOrdertype);
getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
......@@ -543,6 +545,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
getDataSql = getDataSql + " AND SORDDET.LOC_TYPE = ITEM.LOC_TYPE AND ITEM.LOC_TYPE__PARENT = '"+locTypeParentInput+"'";
}
//Changed By Pragyan 14/08/14 for tran code argumnet and loc type parent end.
if( saleOrdertype != null && saleOrdertype.trim().length() > 0 )
{
System.out.println("ordtypeGetData::::::::"+saleOrdertype);
......@@ -762,6 +765,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
pickType = "P";
}
//Changed By Pragyan 14/08/14 for tran code and loc type parent start.
if(tranCodeInput == null || tranCodeInput.trim().length() <= 0)
{
......@@ -804,7 +808,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
getTranInfo = getArgTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,tranCodeInput, conn);
}
//Changed By Pragyan 14/08/14 for tran code and loc type parent end.
if(getTranInfo != null & getTranInfo.size() > 0)
{
tranCod = (String)getTranInfo.get("TRAN_CODE");
......@@ -6475,6 +6478,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String transMode = "";
//changed by pragyan on 14/08/14 for tran_code and loc type argumnet.
String tranCodeInput = "";
//changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
String locTypeParentInput = "";
//Changed by Rohan on 1-12-11 on [WM1ESUN006] to generate automatic ptcn number
String ptcnID = "";
String itemCode = "";
......@@ -6507,6 +6512,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String frmDomParcelPackAllow = "";
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
String remarks = "";
try
{
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -6524,6 +6530,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
directPickLoc = genericUtility.getColumnValue("direct_pick_loc",headerDom);
//changed by pragyan on 14/08/14 for tran_code and loc type argumnet.
tranCodeInput = genericUtility.getColumnValue("tran_code",headerDom);
//changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
locTypeParentInput = genericUtility.getColumnValue("loc_type__parent",headerDom);
/*pickType = checkNull(genericUtility.getColumnValue("master_pack_allow",headerDom));
pickType = checkNull(genericUtility.getColumnValue("parcelpack_allow",headerDom));
shipType = genericUtility.getColumnValue("ship_type",headerDom);
......@@ -6559,12 +6567,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL)" +
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE)" +
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS)" +
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS)" +
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT)" +
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
// "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by Rohan on 1-12-11 on [WM1ESUN006] to add ptcn into wave_task.end
pstmt = conn.prepareStatement(insertSql);
pstmt.setString(1,waveId);
......@@ -6586,6 +6597,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(14,sitCodeWave);
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
pstmt.setString(15,remarks);
//changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
pstmt.setString(16,tranCodeInput);
pstmt.setString(17,locTypeParentInput);
pstmt.executeUpdate();
System.out.println("Start Wave Genartion.......................");
......@@ -6955,11 +6970,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment,totCaseCount, conn);
//HashMap transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start
//Changed By Pragyan 14-AUG-14.start
HashMap transPorterInfoMap = null;
if( tranCodeInput == null || tranCodeInput.trim().length() <= 0 )
{
//Changed By Pragyan 25-aug-14 changed logic for getting transporter.
/*if( tranCodeInput == null || tranCodeInput.trim().length() <= 0 )
{*/
if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
{
pickType = "M";
......@@ -7039,14 +7055,54 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
tranCode = "";
transMode = "";
}
//Changed By Pragyan 25-aug-14 changed logic for getting transporter.start
//}
//else
if( tranCodeInput != null && tranCodeInput.trim().length() > 0 && transPorterInfoMap != null & transPorterInfoMap.size() > 0)
{
String chkDistADSIFlag = "",chkDistADSIFlagIn = "",distShipType = "";
System.out.println("Transporter Info from dist Route1 ["+transPorterInfoMap.toString()+"]");
chkDistADSIFlag = (String)transPorterInfoMap.get("ADSI_FLAG");
distShipType = (String)transPorterInfoMap.get("SHIP_TYPE");
HashMap tempTtransPorterInfoMap = getArgTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,tranCodeInput, conn);
System.out.println("Transporter Info from dist Route2 ["+tempTtransPorterInfoMap.toString()+"]");
chkDistADSIFlagIn = (String)tempTtransPorterInfoMap.get("ADSI_FLAG");
tranCode = (String)tempTtransPorterInfoMap.get("TRAN_CODE");
transMode = (String)tempTtransPorterInfoMap.get("TRANS_MODE");
System.out.println("chkDistADSIFlagIn1 ["+chkDistADSIFlagIn+"]");
chkDistADSIFlagIn = chkDistADSIFlagIn != null && chkDistADSIFlagIn.trim().length() > 0 ?chkDistADSIFlagIn:"N";
System.out.println("chkDistADSIFlagIn1 ["+chkDistADSIFlagIn+"]");
if(("M".equalsIgnoreCase(distShipType) || "P".equalsIgnoreCase(distShipType)) && "N".equalsIgnoreCase(chkDistADSIFlagIn))
{
return errString = getError(saleOrder,"VTNOTPARCT",conn);
}
else
if(("L".equalsIgnoreCase(distShipType)) && "Y".equalsIgnoreCase(chkDistADSIFlagIn))
{
transPorterInfoMap = getArgTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,tranCodeInput, conn);
tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE");
return errString = getError(saleOrder,"VTNOTLTLT",conn);
}
if(tranCode != null && tranCode.length() > 0)
{
transPorterInfoMap.put("TRAN_CODE", tranCode);
}
if(transMode != null && transMode.length() > 0)
{
transPorterInfoMap.put("TRAN_MODE", transMode);
}
}
//Changed By Pragyan 25-aug-14 changed logic for getting transporter.end
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end
......@@ -7060,6 +7116,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return errString = itmDBAccessEJB.getErrorString("","NVLTRANCOD","","",conn);
}
//Changed By Pragyan 14/08/14 for tran_code and loc_type_parent start.
if(transMode == null || transMode.length() <= 0)
{
......@@ -7774,8 +7831,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//masterPackAllow = isMasterPackAllow;
System.out.println("Check the weight and volume for master Pack ["+masterPackAllow+"]");
//Changed By Pragyan 25/08/14 tran code input start.
//Changed By Pragyan 14/08/14 tran code input start.
if("N".equalsIgnoreCase(isTrancodeInput))
/*if("N".equalsIgnoreCase(isTrancodeInput))
{
if(!"M".equalsIgnoreCase(dbShipType) || !masterPackAllow)
{
......@@ -7796,7 +7854,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
mPackAllow = "N";
System.out.println("Master Pack will not generate.........");
}
}*/
if(!"M".equalsIgnoreCase(dbShipType) || !masterPackAllow)
{
mPackAllow = "N";
System.out.println("Master Pack will not generate.........");
}
if(!"P".equalsIgnoreCase(dbShipType))
{
pPickAllow = "N";
System.out.println("Parcel Pack will not generate.........");
}
//Changed By Pragyan 25/08/14 tran code input end.
//Changed By Pragyan 14/08/14 tran code input end.
//Changed By Pragyan 25/02/13 To get the valu of values from each line item wize.end
......@@ -12466,7 +12536,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
else
{
//changed by pragyan on 08/08/14 Start.
System.out.println("tempCaseReplList..replenishment");
System.out.println("in replenishment block");
System.out.println("oh new change..["+locCodeCase+"]org location["+locCode+"]");
......@@ -12751,7 +12820,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
//Changed By Pragyan 06-AUG-14.end
//changed by pragyan on 08/08/14 end.
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","C",ptcn,conn);
......@@ -12840,8 +12909,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
itemVolumeTotal = itemVolumeTotal + quantity*itemVolume;
itemWeightTotal = itemWeightTotal + quantity*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
}//2nd else
}
}
}
else
......@@ -15981,6 +16051,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
continue;
}
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
/*pstmtOrder.setString(1, suggLocCode);
rsOrder = pstmtOrder.executeQuery();
......@@ -16380,7 +16451,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String invStatDisparmVar = "";
double quantity = 0;
int count = 0;
ArrayList suggestedLocList = new ArrayList();
......@@ -16470,6 +16540,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
if( singleLotSl.trim().equalsIgnoreCase("Y") )
{
......
webitm-wms/module-resource/sql/update.sql
View file @ b16c914e
......@@ -49311,7 +49311,30 @@ VALUES ('VMFACI2','QUANTITY','Diffrent Loc Code from location and site','E','Y',
Insert into obj_itemchange (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('inv_hold_rel','2 ','line_no__hold',null);
---ended by mahendra
--Changed by Dharnaj on 25-Aug-14
alter table wave_task add tran_code char(10);
alter table wave_task add loc_type__parent char(10);
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
('VTNOTPOAT','Invalid Parcel Carrier','Please input proper Parcel Carrier','E',null,null,null,null,to_date('25-AUG-14','DD-MON-RR'),'BASE','04BASE209',null,null);
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
('VTNOTLTLT','Invalid LTL Carrier','Please input proper LTL Carrier','E',null,null,null,null,to_date('25-AUG-14','DD-MON-RR'),'BASE','04BASE209',null,null);
--End Changed by Dhanraj 25/08/14
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