Skip to content

B
business-java
Commit 12789bbf authored by wansari's avatar wansari
Browse files
Options

W15JSUN006 updated for comma separated disparm location and considering other... 

W15JSUN006 updated for comma separated disparm location and considering other location for D-SO/S-ORD.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100160 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5db43f41
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 28 deletions
webitm-wms/ibase/webitm/utility/wms/ScheduleAWMSInOutTasks.java
View file @ 12789bbf
...@@ -910,7 +910,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -910,7 +910,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
{ {
sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.LOT_NO,D.LOT_SL,D.LOC_CODE,H.SITE_CODE" sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.LOT_NO,D.LOT_SL,D.LOC_CODE,H.SITE_CODE"
+" FROM DISTORD_ISSDET D,DISTORD_ISS H WHERE D.TRAN_ID = H.TRAN_ID AND H.CONFIRMED = 'N' AND D.DIST_ORDER = ?" +" FROM DISTORD_ISSDET D,DISTORD_ISS H WHERE D.TRAN_ID = H.TRAN_ID AND H.CONFIRMED = 'N' AND D.DIST_ORDER = ?"
+ "AND D.LINE_NO = ? AND D.QUANTITY > 0"; +" AND D.LINE_NO = ? AND D.QUANTITY > 0";
} }
else else
{ {
...@@ -918,7 +918,8 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -918,7 +918,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
+ " FROM DISTORDER_ALLOC WHERE DIST_ORDER = ? AND LINE_NO = ?";*/ + " FROM DISTORDER_ALLOC WHERE DIST_ORDER = ? AND LINE_NO = ?";*/
sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,H.SITE_CODE" sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,H.SITE_CODE"
//+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LINE_NO = ?" //+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LINE_NO = ?"
+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ?" //+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ?"
+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ?"//Changed by wasim on 09-02-2016 to conside X location for D-SO/S-ORD
+" AND D.DIST_ORDER = H.DIST_ORDER AND S.SITE_CODE = H.SITE_CODE AND S.ITEM_CODE = D.ITEM_CODE" +" AND D.DIST_ORDER = H.DIST_ORDER AND S.SITE_CODE = H.SITE_CODE AND S.ITEM_CODE = D.ITEM_CODE"
+" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_SL = D.LOT_SL AND S.LOT_NO = D.LOT_NO"; +" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_SL = D.LOT_SL AND S.LOT_NO = D.LOT_NO";
} }
...@@ -929,11 +930,10 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -929,11 +930,10 @@ public class ScheduleAWMSInOutTasks implements Schedule
+ "SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";*/ + "SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";*/
sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE" sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE"
+" FROM SORDALLOC D,SORDER H,STOCK S" +" FROM SORDALLOC D,SORDER H,STOCK S"
//+" WHERE D.SALE_ORDER = '0000001440' AND D.LINE_NO = ' 2' AND S.QUANTITY > 0" +" WHERE D.SALE_ORDER = ? AND (D.LOC_CODE = ? OR S.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0"
+" WHERE D.SALE_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
+" AND D.SALE_ORDER = H.SALE_ORDER" +" AND D.SALE_ORDER = H.SALE_ORDER"
+" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL" +" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL"
+" AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE AND D.SITE_CODE = S.SITE_CODE"; +" AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE AND D.SITE_CODE = S.SITE_CODE";//Changed by wasim on 09-02-2016 to conside X location for D-SO/S-ORD
} }
else if("PZ".equalsIgnoreCase(refSer)) else if("PZ".equalsIgnoreCase(refSer))
{ {
...@@ -1013,12 +1013,18 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1013,12 +1013,18 @@ public class ScheduleAWMSInOutTasks implements Schedule
if("D-SO".equalsIgnoreCase(refSer) && countDso > 0) if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
{ {
pstmt.setString(2, locCodeFrom); pstmt.setString(2, locCodeFrom);
pstmt.setString(3, lineNoInterface); pstmt.setString(3, locCodeFrom+"X");
pstmt.setString(4, locCodeFrom+"B");
pstmt.setString(5, locCodeFrom+"P");
pstmt.setString(6, lineNoInterface);//Changed by wasim on 09-02-2016 to consider X location for D-SO/S-ORD
} }
else if("S-ORD".equalsIgnoreCase(refSer)) else if("S-ORD".equalsIgnoreCase(refSer))
{ {
pstmt.setString(2, locCodeFrom); pstmt.setString(2, locCodeFrom);
pstmt.setString(3, lineNoInterface); pstmt.setString(3, locCodeFrom+"X");
pstmt.setString(4, locCodeFrom+"B");
pstmt.setString(5, locCodeFrom+"P");
pstmt.setString(6, lineNoInterface);//Changed by wasim on 09-02-2016 to consider X location for D-SO/S-ORD
} }
else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
{ {
...@@ -1041,25 +1047,9 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1041,25 +1047,9 @@ public class ScheduleAWMSInOutTasks implements Schedule
while(rs.next()) while(rs.next())
{ {
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
//quantity = rs.getDouble("QUANTITY");
//allocQty = rs.getDouble("QTY_ALLOC");
//unit = checkNullAndTrim(rs.getString("UNIT"));
lotNo = checkNullAndTrim(rs.getString("LOT_NO")); lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
lotSl = checkNullAndTrim(rs.getString("LOT_SL")); lotSl = checkNullAndTrim(rs.getString("LOT_SL"));
locCode = checkNullAndTrim(rs.getString("LOC_CODE"));
//Changed by wasim on 08-12-2015 to TAKE loc code for PR/PRS as it will be pallet no [START]
//locCode = checkNullAndTrim(rs.getString("LOC_CODE"));
if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
{
//locCode = checkNullAndTrim(rs.getString("PALLET_NO"));//Changed by wasim on 22-12-2015 as pallet_no = stock loc_code
locCode = checkNullAndTrim(rs.getString("LOC_CODE"));
}
else
{
locCode = checkNullAndTrim(rs.getString("LOC_CODE"));
}
//Changed by wasim on 08-12-2015 to TAKE loc code for PR/PRS as it will be pallet no [START]
siteCode = checkNullAndTrim(rs.getString("SITE_CODE")); siteCode = checkNullAndTrim(rs.getString("SITE_CODE"));
lineNo++; lineNo++;
...@@ -4440,6 +4430,9 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4440,6 +4430,9 @@ public class ScheduleAWMSInOutTasks implements Schedule
exempted = checkNullAndTrim(distComm.getDisparams("999999", "EXTEMP_LOC_PARM" , conn)); exempted = checkNullAndTrim(distComm.getDisparams("999999", "EXTEMP_LOC_PARM" , conn));
itemSerRgDisparm = checkNullAndTrim(distComm.getDisparams("999999", "ITEM_SER_RG1" , conn)); itemSerRgDisparm = checkNullAndTrim(distComm.getDisparams("999999", "ITEM_SER_RG1" , conn));
System.out.println("ITEM_SER_RG1 found from disparm["+itemSerRgDisparm+"]");
System.out.println("Exempted found from disparm["+exempted+"]");
sql = "SELECT LOC_GROUP FROM LOCATION WHERE LOC_CODE = ? AND SITE_CODE = ?"; sql = "SELECT LOC_GROUP FROM LOCATION WHERE LOC_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCodeFrom); pstmt.setString(1, locCodeFrom);
...@@ -4453,6 +4446,31 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4453,6 +4446,31 @@ public class ScheduleAWMSInOutTasks implements Schedule
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
System.out.println("Location group found from location["+locGroup+"]"); System.out.println("Location group found from location["+locGroup+"]");
String[] exp = exempted.split(",");
String disparmExemp = "";
boolean exempFlag = false;
System.out.println("Exemp Disparm Lenght="+exp.length);
for (int j = 0; j < exp.length; j++)
{
disparmExemp = exp[j].trim();
System.out.println("item ser rg1 disparm=["+disparmExemp+"] and site item rg1["+locGroup+"]");
if(disparmExemp.equalsIgnoreCase(locGroup))
{
System.out.println("****Match found in disparm for"+locGroup);
exempted = locGroup;
exempFlag = true;
break;
}
else
{
System.out.println("****Match not found****");
}
}
System.out.println("####Final flag for Exempted="+exempFlag);
sql = "SELECT ITEM_SER__RG1 FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ?"; sql = "SELECT ITEM_SER__RG1 FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
...@@ -4466,6 +4484,30 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4466,6 +4484,30 @@ public class ScheduleAWMSInOutTasks implements Schedule
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
System.out.println("Item series RG found from item["+itemSerRg+"]"); System.out.println("Item series RG found from item["+itemSerRg+"]");
String[] rg1 = itemSerRgDisparm.split(",");
String disparmRg1 = "";
boolean flag = false;
System.out.println("Disparm Lenght="+rg1.length);
for (int x = 0; x < rg1.length; x++)
{
disparmRg1 = rg1[x].trim();
System.out.println("item ser rg1 disparm=["+disparmRg1+"] and site item rg1["+itemSerRg+"]");
if(disparmRg1.equalsIgnoreCase(itemSerRg))
{
System.out.println("****Match found in disparm for"+itemSerRg);
itemSerRgDisparm = itemSerRg;
flag = true;
break;
}
else
{
System.out.println("****Match not found****");
}
}
System.out.println("####Final flag for item ser rg1="+flag);
sql = "SELECT STATUS FROM QC_ORDER WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ?"; sql = "SELECT STATUS FROM QC_ORDER WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -4484,17 +4526,17 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4484,17 +4526,17 @@ public class ScheduleAWMSInOutTasks implements Schedule
{ {
QcStatus = "NA"; QcStatus = "NA";
} }
if(locGroup == null || locGroup.length() == 0 || !exempted.equalsIgnoreCase(locGroup)) //if(locGroup == null || locGroup.length() == 0 || !exempted.equalsIgnoreCase(locGroup))
if(locGroup == null || locGroup.length() == 0 || !exempFlag)
{ {
locGroup = "NA"; locGroup = "NA";
} }
if(itemSerRg == null || itemSerRg.length() == 0 || !itemSerRgDisparm.equalsIgnoreCase(itemSerRg)) //if(itemSerRg == null || itemSerRg.length() == 0 || !itemSerRgDisparm.equalsIgnoreCase(itemSerRg))
if(itemSerRg == null || itemSerRg.length() == 0 || !flag)
{ {
itemSerRg = "NA"; itemSerRg = "NA";
} }
System.out.println("Exempted found from disparm["+exempted+"]");
System.out.println("ITEM_SER_RG1 found from disparm["+itemSerRgDisparm+"]");
System.out.println("********Loc Group["+locGroup+"]Item RG1["+itemSerRg+"]QC Status["+QcStatus+"]**********"); System.out.println("********Loc Group["+locGroup+"]Item RG1["+itemSerRg+"]QC Status["+QcStatus+"]**********");
if(exempted.equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus)) if(exempted.equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus))
......
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