Commit 26768a66 authored by wansari's avatar wansari

W15GSUN003 changed by wasim to update validation that quantity should be greater than 0


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98927 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6d533dbb
...@@ -267,25 +267,25 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -267,25 +267,25 @@ public class ScheduleAWMSInOutTasks implements Schedule
if("D-SO".equalsIgnoreCase(refSer)) if("D-SO".equalsIgnoreCase(refSer))
{ {
sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,QTY_ALLOC,UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE__MFG AS SITE_CODE" sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,QTY_ALLOC,UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE__MFG AS SITE_CODE"
+ " FROM DISTORDER_ALLOC WHERE DIST_ORDER = ? AND LINE_NO = ?"; + " FROM DISTORDER_ALLOC WHERE DIST_ORDER = ? AND LINE_NO = ? AND QUANTITY > 0";
} }
else if("S-ORD".equalsIgnoreCase(refSer)) else if("S-ORD".equalsIgnoreCase(refSer))
{ {
sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,QTY_ALLOC,UNIT__STD AS UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE " sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,QTY_ALLOC,UNIT__STD AS UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE "
+ "FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?"; + "FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? AND QUANTITY > 0";
} }
else if("PZ".equalsIgnoreCase(refSer)) else if("PZ".equalsIgnoreCase(refSer))
{ {
sql = "SELECT P.ITEM_CODE,P.LINE_NO,P.QUANTITY,S.ALLOC_QTY,S.UNIT,P.LOT_NO,P.LOT_SL,S.MFG_DATE,S.EXP_DATE," sql = "SELECT P.ITEM_CODE,P.LINE_NO,P.QUANTITY,S.ALLOC_QTY,S.UNIT,P.LOT_NO,P.LOT_SL,S.MFG_DATE,S.EXP_DATE,"
+ " P.LOC_CODE,P.SITE_CODE,P.PALLET_NO FROM PALLET_DET P,STOCK S WHERE TRAN_ID = ? AND P.LINE_NO = ?" + " P.LOC_CODE,P.SITE_CODE,P.PALLET_NO FROM PALLET_DET P,STOCK S WHERE TRAN_ID = ? AND P.LINE_NO = ?"
+ " AND P.ITEM_CODE = S.ITEM_CODE AND P.SITE_CODE = S.SITE_CODE" + " AND P.ITEM_CODE = S.ITEM_CODE AND P.SITE_CODE = S.SITE_CODE"
+ " AND P.LOC_CODE = S.LOC_CODE AND P.LOT_NO = S.LOT_NO AND P.LOT_SL = S.LOT_SL"; + " AND P.LOC_CODE = S.LOC_CODE AND P.LOT_NO = S.LOT_NO AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0";
} }
else if("PR".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer))
{ {
sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,P.LOC_CODE,P.PALLET_NO,"+ sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,P.LOC_CODE,P.PALLET_NO,"+
" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE S.LOC_CODE = P.PALLET_NO AND S.INV_STAT = 'AWMS'" + " S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE S.LOC_CODE = P.PALLET_NO AND S.INV_STAT = 'AWMS'" +
" AND P.TRAN_ID = ? AND P.LINE_NO = ?"; " AND P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0";
} }
insertSql = "INSERT INTO STOCK_TRANSFER_DET(TRAN_ID, LINE_NO, ITEM_CODE, QUANTITY, LOC_CODE__FR," insertSql = "INSERT INTO STOCK_TRANSFER_DET(TRAN_ID, LINE_NO, ITEM_CODE, QUANTITY, LOC_CODE__FR,"
...@@ -470,7 +470,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -470,7 +470,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
else if("S-ORD".equalsIgnoreCase(refSer)) else if("S-ORD".equalsIgnoreCase(refSer))
{ {
System.out.println("Going for Despatch"); System.out.println("Going for Despatch");
errString = createDespatch(refId,lineNoInterface,conn);//VTCONPARM errString = createDespatch(refId,lineNoList,conn);//VTCONPARM
System.out.println("Return from despatch"+errString); System.out.println("Return from despatch"+errString);
if( errString != null && errString.indexOf( "VTCONPARM" ) > -1) if( errString != null && errString.indexOf( "VTCONPARM" ) > -1)
...@@ -2918,14 +2918,14 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -2918,14 +2918,14 @@ public class ScheduleAWMSInOutTasks implements Schedule
return (int)noArt; return (int)noArt;
} }
private String createDespatch(String refId,String lineNoInterface, Connection conn) throws ITMException, Exception private String createDespatch(String refId,ArrayList lineNoList, Connection conn) throws ITMException, Exception
{ {
String resultStr = "",sql = "",despId = "",despDetSql = "",sordItemSql = "",sordSql = "",sordDetSql = "",stockSql = "",itemSql = "", String resultStr = "",sql = "",despId = "",despDetSql = "",sordItemSql = "",sordSql = "",sordDetSql = "",stockSql = "",itemSql = "",
sqlHdr = ""; sqlHdr = "";
String despLineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo= "",lotSl = "", String despLineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo= "",lotSl = "",
mbaseUnit = "", unit = "",unitStd = "",locCode = "",siteCode = "",partNo = "",siteCodeMfg = "", mbaseUnit = "", unit = "",unitStd = "",locCode = "",siteCode = "",partNo = "",siteCodeMfg = "",
custItemRef = "",rateClg = "",packInstr = "",siteCodeSord = "",rateStduom = "",packCode = "",lineType = "I",palletNo = ""; custItemRef = "",rateClg = "",packInstr = "",siteCodeSord = "",rateStduom = "",packCode = "",lineType = "I",palletNo = "",lineNoInterface = "";
PreparedStatement pstmt=null,despDetPstmt = null,pstmtSordItem = null,pstmtSord = null,pstmtSordDet = null,pstmtStock = null, PreparedStatement pstmt=null,despDetPstmt = null,pstmtSordItem = null,pstmtSord = null,pstmtSordDet = null,pstmtStock = null,
pstmtItem = null,pstmtHdr = null; pstmtItem = null,pstmtHdr = null;
...@@ -2987,10 +2987,18 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -2987,10 +2987,18 @@ public class ScheduleAWMSInOutTasks implements Schedule
"VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?) "; "VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?) ";
despDetPstmt = conn.prepareStatement(despDetSql); despDetPstmt = conn.prepareStatement(despDetSql);
sql = "SELECT LINE_NO,EXP_LEV,ITEM_CODE__ORD,ITEM_CODE,LOT_NO,LOT_SL,UNIT,QUANTITY,LOC_CODE," sql = "SELECT LINE_NO,EXP_LEV,ITEM_CODE__ORD,ITEM_CODE,LOT_NO,LOT_SL,UNIT,QUANTITY,LOC_CODE,"
+ " MFG_DATE,EXP_DATE,SITE_CODE,SITE_CODE__MFG FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?"; + " MFG_DATE,EXP_DATE,SITE_CODE,SITE_CODE__MFG FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
Iterator itr = lineNoList.iterator();
while(itr.hasNext())
{
lineNoInterface = (String) itr.next();
lineNoInterface = " " + lineNoInterface;
lineNoInterface = lineNoInterface.substring( lineNoInterface.length()-3 );
pstmt.setString(1, refId); pstmt.setString(1, refId);
pstmt.setString(2, lineNoInterface); pstmt.setString(2, lineNoInterface);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -3186,7 +3194,9 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -3186,7 +3194,9 @@ public class ScheduleAWMSInOutTasks implements Schedule
despDetPstmt.clearBatch(); despDetPstmt.clearBatch();
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null;
despDetPstmt.close();despDetPstmt = null; despDetPstmt.close();despDetPstmt = null;
}
sqlHdr = "UPDATE DESPATCH SET GROSS_WEIGHT = ?, TARE_WEIGHT = TARE_WEIGHT + ? ,NETT_WEIGHT = ?, NO_ART = ? " sqlHdr = "UPDATE DESPATCH SET GROSS_WEIGHT = ?, TARE_WEIGHT = TARE_WEIGHT + ? ,NETT_WEIGHT = ?, NO_ART = ? "
+ "WHERE DESP_ID = ? "; + "WHERE DESP_ID = ? ";
......
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