Skip to content

B
business-java
Commit 15894036 authored by dpawar's avatar dpawar
Browse files
Options

change for consolidate replenishment 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98148 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 61805363
Expand all Show whitespace changes
Inline Side-by-side
Showing with 409 additions and 63 deletions
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java
View file @ 15894036
......@@ -134,7 +134,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
pstmtStock = conn.prepareStatement(sql);
sql = "SELECT O.LINE_NO LINE_NO__ORD,H.WAVE_ID WAVE_ID,R.PTCN PTCN,R.TRAN_ID,R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, "
+ "R.LOC_CODE LOC_CODE, R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, "
+ "R.LOC_CODE LOC_CODE, R.LOT_NO LOT_NO, R.LOT_SL LOT_SL,O.LOC_CODE__TO, "
+ "(R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) AS QUANTITY,"
+ " R.NO_ART NO_ART,O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, O.PICK_ORDER,H.PICK_TYPE,"
+ " O.EXP_LEV EXP_LEV "
......@@ -187,7 +187,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
lotSl = rs.getString( "LOT_SL" );
quantity = rs.getDouble( "QUANTITY" );
//noArt = rs.getDouble( "NO_ART" );
//locCodeTo = rs.getString( "loc_code__to" );
locCodeTo = rs.getString( "LOC_CODE__TO" );
saleOrder = rs.getString( "SALE_ORDER" );
lineNoSord = rs.getString( "LINE_NO__SORD" );
lineNoSord = " " + lineNoSord;
......@@ -198,6 +198,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
dExpLev = checkNull(rs.getString( "EXP_LEV" ));
System.out.println("dExpLev->> ["+dExpLev+"]");
System.out.println("locCode->> ["+locCode+"]");
System.out.println("locCodeTo@@------->> ["+locCodeTo+"]");
ptcnScanSet.add(checkNull(ptcn));
itmVolumeMap.clear();
itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
......@@ -221,8 +222,12 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
}
else
{
stagingLoc = checkNull(distCommon.getDisparams( "999999", "IMEDIATE_LOC", conn));
//Changed by Dadaso pawar on 18/06/15 [Start]
//stagingLoc = checkNull(distCommon.getDisparams( "999999", "IMEDIATE_LOC", conn));
stagingLoc = locCodeTo;
//Changed by Dadaso pawar on 18/06/15 [End]
}
System.out.println("stagingLoc@@-------->>["+stagingLoc+"]");
//Changed by samadhan on 15/05/2015 D14ISUN007 for Multi pick. End
dataMap.put("wave_id", waveId);
dataMap.put("ptcn", ptcn);
......@@ -999,8 +1004,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
sql = "INSERT INTO PICK_ISS_HDR (TRAN_DATE,EMP_CODE__APRV,CHG_DATE,CONFIRMED,PICK_ORDER,CHG_TERM,"
+ "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,CONF_DATE,PALLET_NO,PTCN ) "
+ "values (?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,CONF_DATE,PALLET_NO ) "
+ "values (?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, currDate);
......@@ -1016,7 +1021,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
//pstmt.setString(11, checkNull(issueDataMap.get("ptcn")));
pstmt.setTimestamp(11, currDate);
pstmt.setString(12, checkNull(issueDataMap.get("ptcn")));
pstmt.setString(13, checkNull(issueDataMap.get("ptcn")));
//pstmt.setString(13, checkNull(issueDataMap.get("ptcn")));
rowIns = pstmt.executeUpdate();
System.out.println("rowIns------>>["+rowIns+"]");
......
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizPos.java
View file @ 15894036
......@@ -48,8 +48,8 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
Document dom = null;
ResultSet rs = null;
PreparedStatement pstmt = null;
String errorString = "",sql = "",ptcn= "",saleOrder= "",childNodeName = "",mark = "";
int count = 0,nodeLength = 0,cnt = 0,childNodeListLength= 0;
String errorString = "",sql = "",ptcn= "",saleOrder= "",childNodeName = "",mark = "",objName = "";
int count = 0,nodeLength = 0,cnt = 0,childNodeListLength= 0,multiCnt=0,totalCnt = 0,ReqTotCnt = 0;
Node parentNode = null;
Node childNode = null;
NodeList detail3List = null,detail2List = null;
......@@ -80,6 +80,10 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
if(dom != null)
{
System.out.println("dom ins not null..............");
objName = getObjNameFromDom(dom, "objName", "1");
objName = objName == null ? "" : objName.trim();
System.out.println("objName------->>["+objName+"]");
if(tranId.length() == 0)
{
tranId = checkNull( genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail1").item(0)) );
......@@ -173,7 +177,6 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
}
System.out.println("PICK_ORD_DET count--------->>"+count);
sql = "SELECT COUNT(*) FROM MULTI_PICK_ISS_DET WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -187,14 +190,78 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
pstmt.close();
pstmt = null;
System.out.println("multi_pick_iss_det count---->>["+cnt+"]");
//nodeLength = detail3List.getLength();
if("multi_master_pick".equalsIgnoreCase(objName))
{
mark ="";
sqlBuf.setLength(0);
sqlBuf.append("select count(a.ptcn) total, count(b.ptcn) req_tot from ");
sqlBuf.append("( select distinct carton_no, ptcn from carton_master where ptcn in ( ");
System.out.println("ptcnList111 ---->>["+ptcnList+"]");
for(int i = 0; i < ptcnList.size(); i++)
{
mark = mark + "?,";
}
mark = mark.substring(0,mark.length() - 1);
sqlBuf.append(mark);
mark ="";
sqlBuf.append(" ) and status <>'R' and carton_type = 'C' group by carton_no, ptcn ) a left outer join ( select distinct m.carton_no, m.ptcn from carton_master m,pack_det d where trim(m.carton_no) = trim(d.carton_no) and m.ptcn in (");
System.out.println("ptcnList222 ---->>["+ptcnList+"]");
for(int i = 0; i < ptcnList.size(); i++)
{
mark = mark + "?,";
}
mark = mark.substring(0,mark.length() - 1);
sqlBuf.append(mark);
sqlBuf.append(") and m.status <>'R' and m.carton_type = 'C' group by m.carton_no, m.ptcn ) b on a.carton_no = b.carton_no");
System.out.println("multi_master_pick SQl ---->>["+sqlBuf.toString()+"]");
pstmtCnt = 0;
pstmt = conn.prepareStatement(sqlBuf.toString());
//pstmt.setString(1, tranId);
for (String list : ptcnList)
{
pstmt.setString(++pstmtCnt,list);
}
for (String list : ptcnList)
{
pstmt.setString(++pstmtCnt,list);
}
rs = pstmt.executeQuery();
if(rs.next())
{
totalCnt = rs.getInt(1);
ReqTotCnt = rs.getInt(2);
}
System.out.println("multi_master_pick count---->>["+totalCnt+"] ReqTotCnt["+ReqTotCnt+"]");
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( count != 0 && cnt == count && totalCnt == ReqTotCnt)
{
MultiplePtcnWizConfobj = new MultiplePtcnWizConf();
errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ;
//errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn);
}
}
else
{
if( count != 0 && cnt == count)
{
MultiplePtcnWizConfobj = new MultiplePtcnWizConf();
errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ;
//errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn);
}
}
//nodeLength = detail3List.getLength();
System.out.println("errorString in MultiplePtcnWizPos postSave------->>["+errorString+"] "+isLocalConn);
if(errorString != null && errorString.length() > 0 && (!isLocalConn))
{
......@@ -1194,6 +1261,29 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
return dataVolumeMap;
}
private String getObjNameFromDom( Document dom, String attribute, String objContext ) throws RemoteException,ITMException
{
NodeList detailList = null;
Node currDetail = null,reqDetail = null;
String objName = "";
int detailListLength = 0;
try
{
detailList = dom.getElementsByTagName("Detail"+objContext);
detailListLength = detailList.getLength();
for (int ctr = 0; ctr < detailListLength; ctr++)
{
currDetail = detailList.item(ctr);
objName = currDetail.getAttributes().getNamedItem(attribute).getNodeValue();
}
}
catch ( Exception e )
{
throw new ITMException(e);
}
return objName;
}
private String checkNull(String str)
{
if(str == null)
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 15894036
......@@ -7633,14 +7633,30 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String returnRefId = "";
PreparedStatement pstmt = null;
String insertSql = "";
String refSer = "",refType = "",status = "";
try
{
String refSer = getRefSer(winNameArr[lineNo-1], conn);
//Changed by Dadaso pawar on 23/06/15 [Start]
//String refSer = getRefSer(winNameArr[lineNo-1], conn);
//returnRefId = getTranId(winNameArr[lineNo-1], conn);
//String refType = refTypeArr[lineNo-1];
//String status = "N";
if("C-STG".equalsIgnoreCase(subRefSer) || "A-STG".equalsIgnoreCase(subRefSer) )
{
refSer = getRefSer(winNameArr[lineNo-1], conn);
returnRefId = getTranId("w_consolidate_repl", conn);
refType = subrefType;
status = "N";
}
else
{
refSer = getRefSer(winNameArr[lineNo-1], conn);
returnRefId = getTranId(winNameArr[lineNo-1], conn);
String refType = refTypeArr[lineNo-1];
String status = "N";
refType = refTypeArr[lineNo-1];
status = "N";
}
//Changed by Dadaso pawar on 23/06/15 [END]
refSer = subRefSer.length() > 0? subRefSer:refSer;
refType = subrefType.length() > 0?subrefType:refType;
......@@ -23524,6 +23540,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt1.close(); pstmt1 = null;
}
}
//Changed by Dadaso pawar on 23/06/15 [Start]
else if ( "C-STG".equalsIgnoreCase(refSer) || "A-STG".equalsIgnoreCase(refSer))
{
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ? AND STATUS = 'N'";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, refId);
pstmt1.setString(2, waveId);
pstmt1.setString(3, saleOrder);
if( pstmt1.executeUpdate() > 0 )
{
System.out.println(refId +" is updated successfully ");
}
pstmt1.close(); pstmt1 = null;
}
//Changed by Dadaso pawar on 23/06/15 [End]
if(pstmt1 != null)
{
......
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