Skip to content

B
business-java
Commit 7b57e331 authored by ppatro's avatar ppatro
Browse files
Options

Issue tracker 130 & price list asn on conf 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92568 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fc55faf6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 456 additions and 239 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnConf.java
View file @ 7b57e331
...@@ -15,6 +15,7 @@ import java.util.Date; ...@@ -15,6 +15,7 @@ import java.util.Date;
import java.util.*; import java.util.*;
import java.text.*; import java.text.*;
import java.sql.*; import java.sql.*;
import javax.ejb.*; import javax.ejb.*;
import ibase.webitm.ejb.MasterStatefulLocal; import ibase.webitm.ejb.MasterStatefulLocal;
import javax.naming.InitialContext; import javax.naming.InitialContext;
...@@ -40,7 +41,18 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe ...@@ -40,7 +41,18 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
String errString = ""; String errString = "";
//Changed by sumit 24/01/13 start.
String suppCode = "",qtyStr = "", priceList = "";
String itemCode = "";
double quantity = 0.0, rate = 0.0;
java.util.Date currDate = null;
String dbDateFormat = null;
String applDateFormat = null;
DateFormat dateFormat = null;
String currDateStr = null;
PreparedStatement pstmt1 = null;
ResultSet rs1 = null;
//Changed by sumit 24/01/13 end.
ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB();
try try
...@@ -81,6 +93,66 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe ...@@ -81,6 +93,66 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
errString = itmdbAccess.getErrorString("","ASNCONFEMD",loginEmpCode); errString = itmdbAccess.getErrorString("","ASNCONFEMD",loginEmpCode);
return errString; return errString;
} }
//Changed by sumit on 23/01/13
currDate = new java.util.Date();
dbDateFormat = genericUtility.getDBDateFormat();
applDateFormat = genericUtility.getApplDateFormat();
dateFormat = new SimpleDateFormat(applDateFormat);
currDateStr = dateFormat.format(currDate);
SimpleDateFormat simpleDateFormatDB = new SimpleDateFormat(genericUtility.getDBDateFormat());
Timestamp timestamp = Timestamp.valueOf(simpleDateFormatDB.format(currDate).toString() + " 00:00:00.0");
sql = "SELECT AH.SUPP_CODE, AD.QUANTITY, AD.ITEM_CODE FROM ASN_HDR AH, ASN_DET AD WHERE AH.TRAN_ID = ? AND AH.TRAN_ID = AD.TRAN_ID";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next())
{
suppCode = rs.getString("SUPP_CODE");
quantity = rs.getDouble("QUANTITY");
itemCode = rs.getString("ITEM_CODE");
System.out.println(" suppCode ["+suppCode+"] quantity ["+quantity+"] itemCode ["+itemCode+"]");
sql = " SELECT PRICE_LIST FROM SUPPLIER WHERE SUPP_CODE = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, suppCode);
rs1 = pstmt1.executeQuery();
if( rs1.next() )
{
priceList = rs1.getString("PRICE_LIST");
}
rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null;
sql="select rate from pricelist where item_code = ? and price_list= ? and ? >= eff_from and ? <= valid_upto ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, itemCode);// item_code
pstmt1.setString(2,checkNull(priceList));
pstmt1.setTimestamp(3,timestamp);
pstmt1.setTimestamp(4,timestamp );
rs1 = pstmt1.executeQuery();
if( rs1.next() )
{
rate = rs1.getDouble("rate");
}
rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null;
if ( rate == 0 )
{
/*// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString("rate","INVRATE",userId);
errList.add( "INVRATE" );
errFields.add( childNodeName.toLowerCase() );*/
errString = itmdbAccess.getErrorString("","INVRATE",loginEmpCode);
return errString;
}
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//Changed by sumit on 23/01/13 end
sql = "UPDATE ASN_HDR SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__APRV = ? WHERE TRAN_ID = ?"; sql = "UPDATE ASN_HDR SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__APRV = ? WHERE TRAN_ID = ?";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setTimestamp(1, Timestamp.valueOf( confDateStr ) ); pstmt.setTimestamp(1, Timestamp.valueOf( confDateStr ) );
...@@ -95,7 +167,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe ...@@ -95,7 +167,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
// 16/10/11 manoharan call po generation here // 16/10/11 manoharan call po generation here
errString = generatePurcOrder(tranId, xtraParams, forcedFlag, conn); errString = generatePurcOrder(tranId, xtraParams, forcedFlag, conn);
...@@ -113,7 +185,6 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe ...@@ -113,7 +185,6 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
else else
{ {
isError = true; isError = true;
return errString;
} }
System.out.println("isError111 =["+isError+"]"); System.out.println("isError111 =["+isError+"]");
// end 16/10/11 manoharan call po generation here // end 16/10/11 manoharan call po generation here
...@@ -1284,13 +1355,6 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe ...@@ -1284,13 +1355,6 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
} }
*/ */
} }
//Chnaged By Pragyan 18/01/13 To gererate error if PO not generated.start
else
{
errString = itmdbAccess.getErrorString("","ERRGENPOD",userId);
return errString;
}
//Chnaged By Pragyan 18/01/13 To gererate error if PO not generated.start
} }
} }
else else
......
webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java
View file @ 7b57e331
...@@ -233,11 +233,11 @@ public class ConsolidatToDoc { ...@@ -233,11 +233,11 @@ public class ConsolidatToDoc {
// 23/09/12 manoharan M-PICK and M-PACK to considered together and split accordingly to number of M-PACK // 23/09/12 manoharan M-PICK and M-PACK to considered together and split accordingly to number of M-PACK
//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "M-PICK".equalsIgnoreCase(key) || "M-PACK".equalsIgnoreCase(key) ) //if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "M-PICK".equalsIgnoreCase(key) || "M-PACK".equalsIgnoreCase(key) )
//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key)) //if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key))
if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "P-PICK".equalsIgnoreCase(key)) if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "P-PICK".equalsIgnoreCase(key) || "M-PICK".equalsIgnoreCase(key))
{ {
//Changed by rohan on 10-08-12 //Changed by rohan on 10-08-12
//isPick = true; //isPick = true;
System.out.println(" inside M-PICK ");
sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+ //sql added by Kunal On 03/08/12 as per S Monoharan Sir intruction sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+ //sql added by Kunal On 03/08/12 as per S Monoharan Sir intruction
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+ " POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART, P.QUANTITY , POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+ " POD.NO_ART, P.QUANTITY , POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
...@@ -254,9 +254,10 @@ public class ConsolidatToDoc { ...@@ -254,9 +254,10 @@ public class ConsolidatToDoc {
//End changes by gulzar on 12/27/2011 //End changes by gulzar on 12/27/2011
} }
else if("M-PACK".equalsIgnoreCase(key)) //Changed by sumit on 25/01/13 commenting not require, This would happen against "M-PICK" end.
/*else if("M-PACK".equalsIgnoreCase(key))
{ {
/*sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+ //sql added by Kunal On 03/08/12 as per S Monoharan Sir intruction sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+ //sql added by Kunal On 03/08/12 as per S Monoharan Sir intruction
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+ " POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART, P.QUANTITY , POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+ " POD.NO_ART, P.QUANTITY , POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
" POD.LINE_NO__SORD,PH.PALLET_NO "+ // change done by Kunal on 03/08/12 select pallet no " POD.LINE_NO__SORD,PH.PALLET_NO "+ // change done by Kunal on 03/08/12 select pallet no
...@@ -265,7 +266,7 @@ public class ConsolidatToDoc { ...@@ -265,7 +266,7 @@ public class ConsolidatToDoc {
" AND POD.PICK_ORDER = P.PICK_ORDER "+ " AND POD.PICK_ORDER = P.PICK_ORDER "+
" AND POD.LINE_NO = P.LINE_NO__ORD "+ " AND POD.LINE_NO = P.LINE_NO__ORD "+
" AND PH.PICK_ORDER = P.PICK_ORDER "+ " AND PH.PICK_ORDER = P.PICK_ORDER "+
" AND PO.PICK_ORDER = ? ";*/ " AND PO.PICK_ORDER = ? ";
sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE, " sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE, "
+ " POD.ITEM_CODE,PKD.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL, " + " POD.ITEM_CODE,PKD.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL, "
...@@ -286,7 +287,8 @@ public class ConsolidatToDoc { ...@@ -286,7 +287,8 @@ public class ConsolidatToDoc {
+ " POD.LINE_NO__SORD,PKH.OUTER_CARTON_NO " ; + " POD.LINE_NO__SORD,PKH.OUTER_CARTON_NO " ;
} }*/
//Changed by sumit on 25/01/13 commenting not require, This would happen against "M-PICK" end.
// //
//CHANGED BY PRAGYAN 07-SEP-12 To ADD PND LOCATION //CHANGED BY PRAGYAN 07-SEP-12 To ADD PND LOCATION
//CHANGED BY PRAGYAN 12-JUL-12 To ADD PND LOCATION //CHANGED BY PRAGYAN 12-JUL-12 To ADD PND LOCATION
...@@ -436,7 +438,9 @@ public class ConsolidatToDoc { ...@@ -436,7 +438,9 @@ public class ConsolidatToDoc {
palletNo = rs.getString("CARTON_NO"); palletNo = rs.getString("CARTON_NO");
} }
//else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK")) //else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK"))
else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK") || key.equalsIgnoreCase("P-PICK")) //Changed by sumit on 25/01/13 removing M-PACK from if condition
//else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK") || key.equalsIgnoreCase("P-PICK"))
else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("P-PICK"))
{ {
//Selecting loc_code__to from pick_iss_det //Selecting loc_code__to from pick_iss_det
pstmtIss.setString(1, pickOrder); pstmtIss.setString(1, pickOrder);
...@@ -879,7 +883,7 @@ public class ConsolidatToDoc { ...@@ -879,7 +883,7 @@ public class ConsolidatToDoc {
System.out.println("CURRENT KEY ["+keyList+"]"); System.out.println("CURRENT KEY ["+keyList+"]");
//if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList)) //if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList))
if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList) || "P-PICK".equalsIgnoreCase(keyList)) if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList) || "P-PICK".equalsIgnoreCase(keyList) || "M-PICK".equalsIgnoreCase(keyList))
{ {
sql2 = " SELECT P.ITEM_CODE,PO.WAVE_ID "+ sql2 = " SELECT P.ITEM_CODE,PO.WAVE_ID "+
...@@ -894,7 +898,8 @@ public class ConsolidatToDoc { ...@@ -894,7 +898,8 @@ public class ConsolidatToDoc {
} }
else if("M-PACK".equalsIgnoreCase(keyList)) //Changed by sumit on 25/01/13 commenting, this would happen against "M-PICK" start
/*else if("M-PACK".equalsIgnoreCase(keyList))
{ {
sql2 = "SELECT PKD.ITEM_CODE,PO.WAVE_ID " sql2 = "SELECT PKD.ITEM_CODE,PO.WAVE_ID "
+ " FROM PACK_DET PKD, PACK_HDR PKH, PICK_ISS_DET P, PICK_ORD_HDR PO , PICK_ORD_DET POD,PICK_ISS_HDR PH " + " FROM PACK_DET PKD, PACK_HDR PKH, PICK_ISS_DET P, PICK_ORD_HDR PO , PICK_ORD_DET POD,PICK_ISS_HDR PH "
...@@ -912,8 +917,8 @@ public class ConsolidatToDoc { ...@@ -912,8 +917,8 @@ public class ConsolidatToDoc {
+ " POD.LINE_NO__SORD,PKH.OUTER_CARTON_NO " ; + " POD.LINE_NO__SORD,PKH.OUTER_CARTON_NO " ;
} }*/
//Changed by sumit on 25/01/13 commenting, this would happen against "M-PICK" end
else if(keyList.equalsIgnoreCase("R-TASK") || keyList.equalsIgnoreCase("S-DOC") || keyList.equalsIgnoreCase("RS-DSO") || keyList.equalsIgnoreCase("RO-DSO") || keyList.equalsIgnoreCase("R-DSO") || keyList.equalsIgnoreCase("R-PND") || "RP-PND".equalsIgnoreCase(keyList) ) else if(keyList.equalsIgnoreCase("R-TASK") || keyList.equalsIgnoreCase("S-DOC") || keyList.equalsIgnoreCase("RS-DSO") || keyList.equalsIgnoreCase("RO-DSO") || keyList.equalsIgnoreCase("R-DSO") || keyList.equalsIgnoreCase("R-PND") || "RP-PND".equalsIgnoreCase(keyList) )
{ {
sql2 = " SELECT P.ITEM_CODE,PO.WAVE_ID " + sql2 = " SELECT P.ITEM_CODE,PO.WAVE_ID " +
......
webitm-wms/ibase/webitm/ejb/wms/MasterPackIC.java
View file @ 7b57e331
...@@ -144,9 +144,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -144,9 +144,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
String status = ""; String status = "";
String itemCode = ""; String itemCode = "";
String sqlInner = ""; String sqlInner = "";
double weight = 0.0; double weight = 0.0;
double cartVolume = 0.0;
double selectCartVolume = 0.0;
int noCases = 0; int noCases = 0;
double masterPackCount = 0.0, masterPackWeight = 0.0; // Added by sumit on 16/01/13 double masterPackCount = 0.0, masterPackWeight = 0.0; // Added by sumit on 16/01/13
...@@ -670,23 +668,6 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -670,23 +668,6 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
case 3 : case 3 :
{ {
System.out.println("Inside case3 validation"); System.out.println("Inside case3 validation");
//Changed By Pragyan 21/01/13.start
outerCarton = checkNull(genericUtility.getColumnValue( "outer_carton_no", hdrDom ));
System.out.println("outerCarton["+outerCarton+"]");
sql = "SELECT C.PACK_CODE,(P.LENGTH * P.WIDTH * P.HEIGHT) FROM CARTON_MASTER C,PACKING P WHERE C.CARTON_TYPE = 'M' AND C.CARTON_NO = ? AND " +
" C.PACK_CODE = P.PACK_CODE ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, outerCarton );
rs = pstmt.executeQuery();
if( rs.next() )
{
cartVolume = rs.getDouble(2);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changed By Pragyan 21/01/12.end
parentList = allDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = allDom.getElementsByTagName( "Detail" + currentFormNo );
int noOfParent = parentList.getLength(); int noOfParent = parentList.getLength();
System.out.println("no of parent="+noOfParent); System.out.println("no of parent="+noOfParent);
...@@ -731,16 +712,13 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -731,16 +712,13 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
System.out.println("item Code="+itemCode+" weight ="+weight+" no of item"+noCases); System.out.println("item Code="+itemCode+" weight ="+weight+" no of item"+noCases);
noCases++; noCases++;
//sqlInner = "select gross_weight from item_lot_packsize where item_code = ? "; sqlInner = "select gross_weight from item_lot_packsize where item_code = ? ";
sqlInner = "select gross_weight,(length*width*height) from item_lot_packsize where item_code = ? ";
pstmtInner = conn.prepareStatement( sqlInner ); pstmtInner = conn.prepareStatement( sqlInner );
pstmtInner.setString( 1,itemCode ); pstmtInner.setString( 1,itemCode );
rsInner = pstmtInner.executeQuery(); rsInner = pstmtInner.executeQuery();
while( rsInner.next() ) while( rsInner.next() )
{ {
weight += rsInner.getDouble("gross_weight"); weight += rsInner.getDouble("gross_weight");
selectCartVolume += rsInner.getDouble(2);
} }
rsInner.close(); rsInner.close();
rsInner = null; rsInner = null;
...@@ -754,8 +732,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -754,8 +732,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
//if(weight > 70 || noCases > 60) //if(weight > 70 || noCases > 60)
masterPackCount = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_CASE_COUNT",conn)); masterPackCount = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_CASE_COUNT",conn));
masterPackWeight = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT",conn)); masterPackWeight = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT",conn));
//if(weight > masterPackWeight || noCases > masterPackCount ) if(weight > masterPackWeight || noCases > masterPackCount )
if(weight > masterPackWeight || selectCartVolume > cartVolume || noCases > masterPackCount )
{ {
//Changed by sumit on 16/01/13 changing weight size as well getting these value from dispram end //Changed by sumit on 16/01/13 changing weight size as well getting these value from dispram end
errList.add( "VTWGTEXD" ); errList.add( "VTWGTEXD" );
...@@ -1140,6 +1117,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1140,6 +1117,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
String pickOrder = ""; String pickOrder = "";
String outerCarton = ""; String outerCarton = "";
String objName = "";//added by sumit on 13/01/13 String objName = "";//added by sumit on 13/01/13
String palletNo = "";//Added by sumit on 25/01/13
int lineNo = 0; int lineNo = 0;
int count= 0; int count= 0;
...@@ -1168,8 +1146,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1168,8 +1146,7 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
//Changed by sumit on 16/01/13 getting site_code //Changed by sumit on 16/01/13 getting site_code
siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ); siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
System.out.println(" site *** code ["+siteCode+"]");
DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat()); DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
String dbDateFormat = genericUtility.getDBDateFormat(); String dbDateFormat = genericUtility.getDBDateFormat();
...@@ -1301,11 +1278,15 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1301,11 +1278,15 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
java.sql.Date tranDateDb = null; java.sql.Date tranDateDb = null;
java.sql.Date confDateDb = null; java.sql.Date confDateDb = null;
sql = "SELECT PHDR.TRAN_ID, PHDR.TRAN_DATE, PHDR.SITE_CODE, PHDR.SALE_ORDER, PHDR.WAVE_ID, "+ /*sql = "SELECT PHDR.TRAN_ID, PHDR.TRAN_DATE, PHDR.SITE_CODE, PHDR.SALE_ORDER, PHDR.WAVE_ID, "+
" PHDR.CONFIRMED, PHDR.PICK_ORDER, SITE.DESCR SITE_DESCR " + " PHDR.CONFIRMED, PHDR.PICK_ORDER, SITE.DESCR SITE_DESCR " +
//Changed by sumit on 16/01/13 adding site code in below line //Changed by sumit on 16/01/13 adding site code in below line
//" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?)"; //" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?)";
" FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?) AND SITE.SITE_CODE = ? "; " FROM PACK_HDR PHDR , SITE SITE WHERE TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?) AND SITE.SITE_CODE = ? ";*/
sql = "SELECT PHDR.TRAN_ID, PHDR.TRAN_DATE, PHDR.SITE_CODE, PHDR.SALE_ORDER, PHDR.WAVE_ID, "+
" PHDR.CONFIRMED, PHDR.PICK_ORDER, SITE.DESCR SITE_DESCR, PIH.PALLET_NO " +
" FROM PACK_HDR PHDR , SITE SITE, PICK_ISS_HDR PIH WHERE PHDR.TRAN_ID =(SELECT PICK_ORDER FROM CARTON_MASTER WHERE CARTON_NO = ? AND PTCN = ?) " +
" AND SITE.SITE_CODE = ? AND PIH.PICK_ORDER = PHDR.PICK_ORDER ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, outerCarton); pstmt.setString(1, outerCarton);
pstmt.setString(2, PTCN); pstmt.setString(2, PTCN);
...@@ -1332,12 +1313,13 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1332,12 +1313,13 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
waveId = rs.getString("wave_id"); waveId = rs.getString("wave_id");
siteDescr = rs.getString("site_descr"); siteDescr = rs.getString("site_descr");
pickOrder = rs.getString("pick_order");//changed by chaitali pickOrder = rs.getString("pick_order");//changed by chaitali
palletNo = rs.getString("PALLET_NO");//Changed by sumit on 25/01/13
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println(" pallet_no ["+palletNo+"]");
valueXmlString.append( "<sale_order><![CDATA[" ).append( checkNull(saleOrder) ).append( "]]></sale_order>\r\n" ); valueXmlString.append( "<sale_order><![CDATA[" ).append( checkNull(saleOrder) ).append( "]]></sale_order>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull(siteCode) ).append( "]]></site_code>\r\n" ); valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull(siteCode) ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull(siteDescr) ).append( "]]></site_descr>\r\n" ); valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull(siteDescr) ).append( "]]></site_descr>\r\n" );
...@@ -1349,6 +1331,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1349,6 +1331,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
valueXmlString.append( "<chg_user><![CDATA[" ).append( userId ).append( "]]></chg_user>\r\n" ); valueXmlString.append( "<chg_user><![CDATA[" ).append( userId ).append( "]]></chg_user>\r\n" );
valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" ); valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" );
valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" ); valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
//Changed by sumit on 25/01/13 adding pallet_no
valueXmlString.append( "<pallet_no><![CDATA[" ).append( palletNo ).append( "]]></pallet_no>\r\n" );
valueXmlString.append( "</Detail2>" ); valueXmlString.append( "</Detail2>" );
} }
}//case 2 end here }//case 2 end here
...@@ -1368,16 +1353,21 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma ...@@ -1368,16 +1353,21 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
ptcn = genericUtility.getColumnValue("ptcn", hdrDom, "1"); ptcn = genericUtility.getColumnValue("ptcn", hdrDom, "1");
//Changed by sumit on 12/01/13 modified sql ( Getting all selected record from carton master) //Changed by sumit on 12/01/13 modified sql ( Getting all selected record from carton master)
sql = "SELECT TRAN_ID,LINE_NO, CARTON_NO,SALE_ORDER,LINE_NO__SORD,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,NO_ART FROM PACK_DET WHERE TRAN_ID = ? ORDER BY CARTON_NO"; //sql = "SELECT TRAN_ID,LINE_NO, CARTON_NO,SALE_ORDER,LINE_NO__SORD,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,NO_ART FROM PACK_DET WHERE TRAN_ID = ? ORDER BY CARTON_NO";
sql = " SELECT PD.TRAN_ID,PD.LINE_NO, PD.CARTON_NO, PD.SALE_ORDER, PD.LINE_NO__SORD,PD.ITEM_CODE," +
" PD.SITE_CODE,PD.LOC_CODE,PD.LOT_NO,PD.LOT_SL,PD.QUANTITY,PD.NO_ART " +
" FROM PACK_DET PD, PACK_HDR PH WHERE PD.TRAN_ID = PH.TRAN_ID " +
" AND PH.PTCN = ? " +
" AND PD.carton_no in ( select carton_no from carton_master where ptcn = ? AND STATUS ='U' )" +
" ORDER BY PD.CARTON_NO ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//Changed by sumit on 13/01/13 setting input as per sql //Changed by sumit on 13/01/13 setting input as per sql
pstmt.setString(1, tranID); //pstmt.setString(1, tranID);
/*pstmt.setString(1, ptcn); pstmt.setString(1, ptcn);
pstmt.setString(2, ptcn); */ pstmt.setString(2, ptcn);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
//Changed by sumit on 13/01/13 showing seleted detail in case of master unpacking only //Changed by sumit on 13/01/13 showing seleted detail in case of master unpacking only
//while(rs.next())
//while(rs.next() && "master_repack".equalsIgnoreCase(objName))
while(rs.next()) while(rs.next())
{ {
//domID++; //domID++;
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ 7b57e331
...@@ -565,10 +565,26 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen ...@@ -565,10 +565,26 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
{ {
errList.add( "DUPPTCNNO" ); errList.add( "DUPPTCNNO" );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
s.clear(); s.clear();
//Changed by sumit on 23/01/13 validating repeat ptcn end //Changed by sumit on 23/01/13 validating repeat ptcn end
//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not start.
sql = "SELECT PTCN FROM SHIP_DOCS WHERE PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
errList.add( "VTPTCNALLX");
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changed by sumit on 25/01/13 validating whether this ptcn is already used in ship_docs or not end
} }
} }
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7b57e331
...@@ -2859,25 +2859,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2859,25 +2859,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
tempListForRepl = new ArrayList(); tempListForRepl = new ArrayList();
qtyActual=0.0; qtyActual=0.0;
System.out.println("Location Code To Found To Create Replenishment Before ["+locCodeTo+"]");
ArrayList locCodeToList = getAvilableCasePickLocationList("C", conn, locType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
int suggestLocLen = locCodeToList.size();
if( suggestLocLen > 0)
{
int prvLocIndex = locCodeToList.indexOf(prevsLocCode);
if( prvLocIndex != -1 && (prvLocIndex + 1) < suggestLocLen)
{
locCodeTo = (String)locCodeToList.get((prvLocIndex + 1));
}
else
{
locCodeTo = (String)locCodeToList.get(0);
}
}
prevsLocCode = locCodeTo;
System.out.println("Location Code To Found To Create Replenishment After ["+locCodeTo+"]");
if(lotQtyToBeAllocated < packSizeActive) if(lotQtyToBeAllocated < packSizeActive)
{ {
tempMapReplenishment.put("QTY_AVAIL",packSizeActive); tempMapReplenishment.put("QTY_AVAIL",packSizeActive);
...@@ -2898,6 +2880,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2898,6 +2880,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
tempListForRepl.add(tempMapReplenishment); tempListForRepl.add(tempMapReplenishment);
itemInfoMapForRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode, tempListForRepl); itemInfoMapForRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode, tempListForRepl);
System.out.println("itemInfoMapForReplPPPPPPPPPPPPPPPPPPP"+itemInfoMapForRepl); System.out.println("itemInfoMapForReplPPPPPPPPPPPPPPPPPPP"+itemInfoMapForRepl);
System.out.println("prevsLocCode ["+prevsLocCode+"]");
System.out.println("Location Code To Found To Create Replenishment Before ["+locCodeTo+"]");
ArrayList locCodeToList = getAvilableCasePickLocationList("C", conn, locType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
int suggestLocLen = locCodeToList.size();
if( suggestLocLen > 0)
{
int prvLocIndex = locCodeToList.indexOf(prevsLocCode);
if( prvLocIndex != -1 && (prvLocIndex + 1) < suggestLocLen)
{
locCodeTo = (String)locCodeToList.get((prvLocIndex + 1));
System.out.println("Inside prevsLocCode1 ["+locCodeTo+"]");
}
else
{
locCodeTo = (String)locCodeToList.get(0);
System.out.println("Inside prevsLocCode2 ["+locCodeTo+"]");
}
}
prevsLocCode = locCodeTo;
System.out.println("Location Code To Found To Create Replenishment After ["+locCodeTo+"]");
} }
} }
...@@ -11157,9 +11162,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11157,9 +11162,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
aPickAllow =(String)dataMap.get("active_pick"); aPickAllow =(String)dataMap.get("active_pick");
pPickAllow =(String)dataMap.get("parcel_pick");*/ pPickAllow =(String)dataMap.get("parcel_pick");*/
expLevel = (String)dataMap.get("exp_lev"); expLevel = (String)dataMap.get("exp_lev");
String sugCode = (String)dataMap.get("sugg_loc");
System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]"); System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]");
System.out.println("SITE_CODE["+siteCode+"]\n LOCCODE["+locCode+"]\n" + System.out.println("SITE_CODE["+siteCode+"]\n LOCCODE["+locCode+"]\n Suggested Loc" +sugCode+
"ITEM CODE["+itemCode+"]\n LOTNO["+lotNo+"]\n LOT SL["+lotSl+"]\n ALLOC QUANTITY["+quantity+"]\n Exp Level["+expLevel+"]"); "]ITEM CODE["+itemCode+"]\n LOTNO["+lotNo+"]\n LOT SL["+lotSl+"]\n ALLOC QUANTITY["+quantity+"]\n Exp Level["+expLevel+"]");
HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn); HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
masterPackAllow = isMasterPackAllow; masterPackAllow = isMasterPackAllow;
double packSize = (Double)itmVolumeMap.get("PACK_SIZE");//How many item contains in the Case double packSize = (Double)itmVolumeMap.get("PACK_SIZE");//How many item contains in the Case
......
webitm-wms/module-resource/metadata/master_pack12.xml
View file @ 7b57e331
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<color>536870912</color> <color>536870912</color>
</Summary> </Summary>
<Footer> <Footer>
<height>0</height> <height>8</height>
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
...@@ -138,8 +138,15 @@ ...@@ -138,8 +138,15 @@
<name>emp_name</name> <name>emp_name</name>
<dbname>emp_name</dbname> <dbname>emp_name</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;pack_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pack_hdr.tran_id&quot;) COLUMN(NAME=&quot;pack_hdr.tran_date&quot;) COLUMN(NAME=&quot;pack_hdr.site_code&quot;) COLUMN(NAME=&quot;pack_hdr.sale_order&quot;) COLUMN(NAME=&quot;pack_hdr.wave_id&quot;) COLUMN(NAME=&quot;pack_hdr.confirmed&quot;) COLUMN(NAME=&quot;pack_hdr.conf_date&quot;) COLUMN(NAME=&quot;pack_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pack_hdr.chg_user&quot;) COLUMN(NAME=&quot;pack_hdr.chg_date&quot;) COLUMN(NAME=&quot;pack_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) JOIN (LEFT=&quot;pack_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pack_hdr.site_code&quot; ) JOIN (LEFT=&quot;pack_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pack_hdr.emp_code__aprv&quot; )) </retrieve> <table_column>
<update>pack_hdr</update> <type size="25">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>pallet_no</name>
<dbname>pack_hdr.pallet_no</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;pack_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pack_hdr.tran_id&quot;) COLUMN(NAME=&quot;pack_hdr.tran_date&quot;) COLUMN(NAME=&quot;pack_hdr.site_code&quot;) COLUMN(NAME=&quot;pack_hdr.sale_order&quot;) COLUMN(NAME=&quot;pack_hdr.wave_id&quot;) COLUMN(NAME=&quot;pack_hdr.confirmed&quot;) COLUMN(NAME=&quot;pack_hdr.conf_date&quot;) COLUMN(NAME=&quot;pack_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pack_hdr.chg_user&quot;) COLUMN(NAME=&quot;pack_hdr.chg_date&quot;) COLUMN(NAME=&quot;pack_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) COLUMN(NAME=&quot;pack_hdr.pallet_no&quot;) JOIN (LEFT=&quot;pack_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pack_hdr.site_code&quot; ) JOIN (LEFT=&quot;pack_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pack_hdr.emp_code__aprv&quot; )) </retrieve>
<update>PACK_HDR</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
</TableDefinition> </TableDefinition>
...@@ -479,73 +486,6 @@ ...@@ -479,73 +486,6 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Change Term</text>
<border>6</border>
<color>33554432</color>
<x>965</x>
<y>1</y>
<height>16</height>
<width>50</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>965</x>
<y>1</y>
<height>16</height>
<width>50</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<tag>Terminal from which the transaction has been last modified, internally updated by the system</tag>
<visible>1</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>134217748</color>
</background>
</ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>1</id> <id>1</id>
...@@ -1011,6 +951,130 @@ ...@@ -1011,6 +951,130 @@
<color>134217748</color> <color>134217748</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Change Term</text>
<border>6</border>
<color>33554432</color>
<x>965</x>
<y>1</y>
<height>16</height>
<width>50</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>965</x>
<y>1</y>
<height>16</height>
<width>50</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<tag>Terminal from which the transaction has been last modified, internally updated by the system</tag>
<visible>1</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>134217748</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Pallet No</text>
<border>6</border>
<color>33554432</color>
<x>1017</x>
<y>1</y>
<height>16</height>
<width>65</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>pallet_no_t</name>
<visible>0</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>33554432</color>
<x>1018</x>
<y>1</y>
<height>16</height>
<width>64</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>pallet_no</name>
<visible>0</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>134217748</color>
</background>
</ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
webitm-wms/module-resource/metadata/master_pack22.xml
View file @ 7b57e331
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<dbname>emp_name</dbname> <dbname>emp_name</dbname>
</table_column> </table_column>
<table_column> <table_column>
<type size="15">char</type> <type size="20">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>outer_carton_no</name> <name>outer_carton_no</name>
...@@ -147,8 +147,15 @@ ...@@ -147,8 +147,15 @@
<name>pick_order</name> <name>pick_order</name>
<dbname>pack_hdr.pick_order</dbname> <dbname>pack_hdr.pick_order</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;pack_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pack_hdr.tran_id&quot;) COLUMN(NAME=&quot;pack_hdr.tran_date&quot;) COLUMN(NAME=&quot;pack_hdr.site_code&quot;) COLUMN(NAME=&quot;pack_hdr.sale_order&quot;) COLUMN(NAME=&quot;pack_hdr.wave_id&quot;) COLUMN(NAME=&quot;pack_hdr.confirmed&quot;) COLUMN(NAME=&quot;pack_hdr.conf_date&quot;) COLUMN(NAME=&quot;pack_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pack_hdr.chg_user&quot;) COLUMN(NAME=&quot;pack_hdr.chg_date&quot;) COLUMN(NAME=&quot;pack_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) COLUMN(NAME=&quot;pack_hdr.outer_carton_no&quot;) COLUMN(NAME=&quot;pack_hdr.pick_order&quot;) JOIN (LEFT=&quot;pack_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pack_hdr.site_code&quot; ) JOIN (LEFT=&quot;pack_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pack_hdr.emp_code__aprv&quot; )WHERE( EXP1 =&quot;pack_hdr.tran_id&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve> <table_column>
<update>pack_hdr</update> <type size="25">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>pallet_no</name>
<dbname>pack_hdr.pallet_no</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;pack_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pack_hdr.tran_id&quot;) COLUMN(NAME=&quot;pack_hdr.tran_date&quot;) COLUMN(NAME=&quot;pack_hdr.site_code&quot;) COLUMN(NAME=&quot;pack_hdr.sale_order&quot;) COLUMN(NAME=&quot;pack_hdr.wave_id&quot;) COLUMN(NAME=&quot;pack_hdr.confirmed&quot;) COLUMN(NAME=&quot;pack_hdr.conf_date&quot;) COLUMN(NAME=&quot;pack_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pack_hdr.chg_user&quot;) COLUMN(NAME=&quot;pack_hdr.chg_date&quot;) COLUMN(NAME=&quot;pack_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) COLUMN(NAME=&quot;pack_hdr.outer_carton_no&quot;) COLUMN(NAME=&quot;pack_hdr.pick_order&quot;) COLUMN(NAME=&quot;pack_hdr.pallet_no&quot;) JOIN (LEFT=&quot;pack_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pack_hdr.site_code&quot; ) JOIN (LEFT=&quot;pack_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pack_hdr.emp_code__aprv&quot; )WHERE( EXP1 =&quot;pack_hdr.tran_id&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<update>PACK_HDR</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -430,45 +437,6 @@ ...@@ -430,45 +437,6 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>147</x>
<y>198</y>
<height>16</height>
<width>100</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<tag>Terminal from which the transaction has been last modified, internally updated by the system</tag>
<visible>0</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>1</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>6</id> <id>6</id>
...@@ -585,45 +553,6 @@ ...@@ -585,45 +553,6 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>413</x>
<y>173</y>
<height>16</height>
<width>90</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_date</name>
<tag>Date when the transaction has last modified, internally updated by system</tag>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>1</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>7</id> <id>7</id>
...@@ -1096,6 +1025,113 @@ ...@@ -1096,6 +1025,113 @@
<color>536870912</color> <color>536870912</color>
</background> </background>
</TextObject> </TextObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>413</x>
<y>173</y>
<height>16</height>
<width>90</width>
<format>[shortdate] [time]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_date</name>
<tag>Date when the transaction has last modified, internally updated by system</tag>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>1</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>11</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>147</x>
<y>198</y>
<height>16</height>
<width>100</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<tag>Terminal from which the transaction has been last modified, internally updated by the system</tag>
<visible>0</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>1</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>16</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<color>255</color>
<x>413</x>
<y>198</y>
<height>16</height>
<width>90</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>pallet_no</name>
<visible>0</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>1</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
webitm-wms/module-resource/sql/update.sql
View file @ 7b57e331
...@@ -29348,6 +29348,37 @@ INSERT INTO SYSTEM_SERVICE_ARGS ( ...@@ -29348,6 +29348,37 @@ INSERT INTO SYSTEM_SERVICE_ARGS (
UPDATE MESSAGES SET MSG_STR = 'Invalid ptcn Number', MSG_DESCR ='Ship consignee group are not same for entered ptcn numbers.' UPDATE MESSAGES SET MSG_STR = 'Invalid ptcn Number', MSG_DESCR ='Ship consignee group are not same for entered ptcn numbers.'
WHERE MSG_NO ='INVSHIPCON'; WHERE MSG_NO ='INVSHIPCON';
alter table pack_hdr add pallet_no varchar2(25);
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 (
'VTPTCNALLX',
'Invalid PTCN Number',
'Entered PTCN number is already confirmed !',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('8-05-2012 16:36:55','DD-MM-YYYY HH24:MI:SS'),
'BASE ',
'BASE ',
NULL,
NULL);
COMMIT; 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