Skip to content

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

Issue tracker points 215,226,227 and 230 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93354 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b8c73315
Show whitespace changes
Inline Side-by-side
Showing with 266 additions and 108 deletions
webitm-wms/ibase/webitm/ejb/wms/PickIssIC.java
View file @ d95e71e6
...@@ -2863,7 +2863,9 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -2863,7 +2863,9 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
"PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) AS QUANTITY ,PODET.CARTON_NO,PODET.PACK_CODE, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+ //,PODET.LOC_CODE__TO "PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) AS QUANTITY ,PODET.CARTON_NO,PODET.PACK_CODE, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+ //,PODET.LOC_CODE__TO
"FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER = ? AND PODET.ITEM_CODE = ITEM.ITEM_CODE " + "FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER = ? AND PODET.ITEM_CODE = ITEM.ITEM_CODE " +
"AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+ "AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+
"ORDER BY PODET.LOC_CODE "; //Changed by Rohan on 12-07-13 for sortion data of active picking as order by carton no and loc code
//"ORDER BY PODET.LOC_CODE ";
"ORDER BY PODET.CARTON_NO,PODET.LOC_CODE ";
pstmtOrd = conn.prepareStatement( sql ); pstmtOrd = conn.prepareStatement( sql );
pstmtOrd.setString( 1, pickOrder ); pstmtOrd.setString( 1, pickOrder );
rsOrd = pstmtOrd.executeQuery(); rsOrd = pstmtOrd.executeQuery();
...@@ -3003,6 +3005,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -3003,6 +3005,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
pstmtOrd.close(); pstmtOrd = null; pstmtOrd.close(); pstmtOrd = null;
pstmtIss.close(); pstmtIss = null; pstmtIss.close(); pstmtIss = null;
//Changed by Rohan on 12-07-13 for sortion data of active picking as order by carton no and loc code.start
/*
sql = "SELECT PODET.PICK_ORDER,PODET.LINE_NO,PODET.ITEM_CODE,PODET.SITE_CODE,PODET.LOC_CODE,"+ sql = "SELECT PODET.PICK_ORDER,PODET.LINE_NO,PODET.ITEM_CODE,PODET.SITE_CODE,PODET.LOC_CODE,"+
//Changed by sumit on 09/03/13 getting quantity , quantity-dealloc_qty //Changed by sumit on 09/03/13 getting quantity , quantity-dealloc_qty
//" PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, PODET.QUANTITY, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+ //" PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, PODET.QUANTITY, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+
...@@ -3011,6 +3015,29 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -3011,6 +3015,29 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
" AND PODET.LINE_NO NOT IN (SELECT PICK_ISS_DET.LINE_NO__ORD FROM PICK_ISS_DET WHERE PICK_ISS_DET.PICK_ORDER = ? ) "+ " AND PODET.LINE_NO NOT IN (SELECT PICK_ISS_DET.LINE_NO__ORD FROM PICK_ISS_DET WHERE PICK_ISS_DET.PICK_ORDER = ? ) "+
" AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+ " AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+
" ORDER BY PODET.LOC_CODE "; " ORDER BY PODET.LOC_CODE ";
*/
if ( "A".equalsIgnoreCase(pickType.trim()) )
{
sql = "SELECT PODET.PICK_ORDER,PODET.LINE_NO,PODET.ITEM_CODE,PODET.SITE_CODE,PODET.LOC_CODE,"+
" PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) AS QUANTITY ,PODET.CARTON_NO,PODET.PACK_CODE , ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+
" FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER = ? AND PODET.ITEM_CODE = ITEM.ITEM_CODE "+
" AND PODET.LINE_NO NOT IN (SELECT PICK_ISS_DET.LINE_NO__ORD FROM PICK_ISS_DET WHERE PICK_ISS_DET.PICK_ORDER = ? ) "+
" AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+
" ORDER BY PODET.CARTON_NO,PODET.LOC_CODE ";
}
else
{
sql = "SELECT PODET.PICK_ORDER,PODET.LINE_NO,PODET.ITEM_CODE,PODET.SITE_CODE,PODET.LOC_CODE,"+
//Changed by sumit on 09/03/13 getting quantity , quantity-dealloc_qty
//" PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, PODET.QUANTITY, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+
" PODET.LOT_NO, PODET.LOT_SL, PODET.NO_ART, (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) AS QUANTITY ,PODET.CARTON_NO,PODET.PACK_CODE , ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT, LOC_CODE__TO "+
" FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER = ? AND PODET.ITEM_CODE = ITEM.ITEM_CODE "+
" AND PODET.LINE_NO NOT IN (SELECT PICK_ISS_DET.LINE_NO__ORD FROM PICK_ISS_DET WHERE PICK_ISS_DET.PICK_ORDER = ? ) "+
" AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 "+
" ORDER BY PODET.LOC_CODE ";
}
//Changed by Rohan on 12-07-13 for sortion data of active picking as order by carton no and loc code.end
pstmtOrd = conn.prepareStatement( sql ); pstmtOrd = conn.prepareStatement( sql );
pstmtOrd.setString( 1, pickOrder ); pstmtOrd.setString( 1, pickOrder );
pstmtOrd.setString(2 , pickOrder ); pstmtOrd.setString(2 , pickOrder );
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ d95e71e6
...@@ -76,6 +76,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -76,6 +76,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null;
// changed by sankara on 12-07-13 for confirmation of consumption issue start...
String winName = "";
String objName = "";
// changed by sankara on 12-07-13 for confirmation of consumption issue end...
try try
{ {
conn = connDriver.getConnectDB( "DriverITM" ); conn = connDriver.getConnectDB( "DriverITM" );
...@@ -258,6 +262,23 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -258,6 +262,23 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//conn.commit(); //conn.commit();
} }
//changed by sankara on 12-07-13 for confirmation of consumption issue start....
else
{
sql = " SELECT TRAN_WINDOW FROM TRANSETUP WHERE REF_SER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer.trim());
rs = pstmt.executeQuery();
if( rs.next() )
{
winName = rs.getString("TRAN_WINDOW");
}
objName = winName.substring(2);
System.out.println("OBJNAME=="+objName);
errString = confirmShipment( objName, refId.trim(), xtraParam, forcedFlag, conn);
System.out.println(" errString ---------------- > ["+errString);
}
//changed by sankara on 12-07-13 for confirmation of consumption issue end....
} }
rs.close(); rs.close();
rs = null; rs = null;
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ d95e71e6
...@@ -687,6 +687,12 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen ...@@ -687,6 +687,12 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
{ {
sql = "SELECT COUNT(*) FROM PORDER WHERE PURC_ORDER = ? AND CONFIRMED != 'Y' "; sql = "SELECT COUNT(*) FROM PORDER WHERE PURC_ORDER = ? AND CONFIRMED != 'Y' ";
} }
//changed by sankara on 12-07-13 added for purchase return[p-ret] confirmation start....
else if ("P-RET".equalsIgnoreCase(refSer.trim()))
{
sql = "SELECT COUNT(*) FROM PORCP WHERE TRAN_ID = ? AND CONFIRMED != 'Y' ";
}
//changed by sankara on 12-07-13 added for purchase return[p-ret] confirmation end....
//Changed by sumit on 22/09/12 validation for all reference series end. //Changed by sumit on 22/09/12 validation for all reference series end.
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue); pstmt.setString(1, columnValue);
......
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ d95e71e6
...@@ -29,6 +29,8 @@ import java.sql.ResultSet; ...@@ -29,6 +29,8 @@ import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.naming.InitialContext; import javax.naming.InitialContext;
...@@ -186,7 +188,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -186,7 +188,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
ResultSet rsTask = null; ResultSet rsTask = null;
PreparedStatement pstmtInv = null; PreparedStatement pstmtInv = null;
ResultSet rsInv = null; ResultSet rsInv = null;
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages
HashMap<String,String> ptcnVoidPackagesMap = new HashMap<String,String>();
PreparedStatement pstmtDesp = null; PreparedStatement pstmtDesp = null;
PreparedStatement pstmtReplDet = null; PreparedStatement pstmtReplDet = null;
...@@ -205,8 +208,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -205,8 +208,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
PreparedStatement pstmtSql = null; PreparedStatement pstmtSql = null;
ResultSet rs = null; ResultSet rs = null;
ResultSet rsPick = null; ResultSet rsPick = null;
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
ADSIShippingSoap soap = null;
try try
{ {
...@@ -882,28 +885,41 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -882,28 +885,41 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
} }
//Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.start //Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.start
System.out.println("RefSeries checking for void packages"+refSer+"}"); System.out.println("RefSeries checking for void packages"+refSer+"}");
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages.start
if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK") ) if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK") )
{ {
System.out.println("GOing for VOid PAckage::::::"); System.out.println("GOing for VOid PAckage::::::["+ptcnVoidPackagesMap+"]");
if(!ptcnVoidPackagesMap.containsKey(ptcn));
{
ptcnVoidPackagesMap.put(ptcn,refSer);
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages.end
String serviceSymbol = ""; String serviceSymbol = "";
String sqlSymbol = ""; String sqlSymbol = "";
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null;
ResultSet rs1 = null; ResultSet rs1 = null;
String adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
ADSIShippingLocator locator = new ADSIShippingLocator(); ADSIShippingLocator locator = new ADSIShippingLocator();
ADSIShippingSoap soap = locator.getADSIShippingSoap(new URL("http://172.20.0.137/ADSIShippingWS/ADSIShipping.asmx")); //ADSIShippingSoap soap = locator.getADSIShippingSoap(new URL("http://172.20.0.137/ADSIShippingWS/ADSIShipping.asmx"));
String imagePath = discommon.getDisparams("999999","SHIP_WITH_PATH",conn); long timeBefore = System.currentTimeMillis();
locator = new ADSIShippingLocator();
sqlSymbol = "SELECT CARRIER_SYMBOL FROM WAVE_STATUS_ORG WHERE PTCN = ?"; if(soap == null)
pstmt1 = conn.prepareStatement(sqlSymbol); {
System.out.println("Connecting ADSI Server.......");
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
}
long timeAfter = System.currentTimeMillis();
System.out.println("Differance In Tme for connecting to ADSI Server time differance in seconds["+(timeAfter-timeBefore)/1000+"]");
if(soap.testADSIServer())
{
if(refSer.equalsIgnoreCase("M-PICK")) if(refSer.equalsIgnoreCase("M-PICK"))
{ {
sql = "SELECT MSN_NO FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER = 'M-PACK' AND CARTON_TYPE = 'M'"; sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER = 'M-PACK' AND CARTON_TYPE = 'M'";
} }
else else
{ {
sql = "SELECT MSN_NO FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER='P-PICK' AND CARTON_TYPE= 'P' "; sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER='P-PICK' AND CARTON_TYPE= 'P' ";
} }
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn); pstmt.setString(1, ptcn);
...@@ -911,49 +927,21 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -911,49 +927,21 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
while(rs.next()) while(rs.next())
{ {
msnNo = rs.getLong("MSN_NO"); msnNo = rs.getLong("MSN_NO");
/* serviceSymbol = checkNull(rs.getString("CARRIER_SYMBOL"));
//reading shipment result2 object.start
InputStream file2 = new FileInputStream( imagePath+ File.separator+"Ship_Label"+File.separator+ ptcn + File.separator + ptcn+"_"+"ShipRslt"+".ser" );
InputStream buffer2 = new BufferedInputStream( file2 );
ObjectInput input1 = new ObjectInputStream ( buffer2 );
ShipmentResultReturn2 shipReslt =(ShipmentResultReturn2)input1.readObject();
//reading shipment result2 object.end
ShipmentResult2 objShipResulttest = shipReslt.getShipmentResultResponse2();
serviceSymbol = objShipResulttest.getServiceSymbol();
System.out.println("Service Symbol original"+serviceSymbol);
serviceSymbol = serviceSymbol.substring(0,serviceSymbol.lastIndexOf(".") );
System.out.println("Service Symbol final"+serviceSymbol);
*/
pstmt1.setString(1, ptcn);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
serviceSymbol = checkNull(rs1.getString("CARRIER_SYMBOL"));
}
else
{
serviceSymbol = "";
}
System.out.println("Service Symbol original"+serviceSymbol);
/*
if(!"".equalsIgnoreCase(serviceSymbol) && serviceSymbol.trim().length() > 0)
{
serviceSymbol = serviceSymbol.substring(0,serviceSymbol.lastIndexOf(".") );
}
*/
System.out.println("Service Symbol final"+serviceSymbol); System.out.println("Service Symbol final"+serviceSymbol);
System.out.println("Service Symbol for void packages:"+serviceSymbol+":MSN NO:"+msnNo); System.out.println("Service Symbol for void packages:["+serviceSymbol+"]:MSN NO:["+msnNo+"]");
StringReturn testReturn = soap.voidPackage(serviceSymbol,msnNo); StringReturn testReturn = soap.voidPackage(serviceSymbol,msnNo);
response = testReturn.getResponse(); response = testReturn.getResponse();
System.out.println("response ["+response+"]"); System.out.println("response ["+response+"]");
if(!response.contains("No Error")) if(!response.contains("No Error"))
{ {
//retString = itmDBAccess.getErrorString("","NTVOIDPKGS",""); isError = true;
retString = getError(response,"NTVOIDPKGS",conn); retString = getError(response,"NTVOIDPKGS",conn);
return retString; return retString;
} }
pstmt1.clearParameters();
} }
...@@ -978,9 +966,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -978,9 +966,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
}
else
{
System.out.println("---ADSI Server Not Connected throw error---");
isError = true;
retString = itmDBAccess.getErrorString("","ADSISRVERR","","",conn);
return retString;
}
} }
}//if close
//Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.end //Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.end
}//while close }//while close
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ d95e71e6
...@@ -191,7 +191,8 @@ etc ...@@ -191,7 +191,8 @@ etc
valueXmlString.append("<parcelpack_allow protect ='1'><![CDATA[").append("").append("]]></parcelpack_allow>\r\n"); valueXmlString.append("<parcelpack_allow protect ='1'><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append("<master_override><![CDATA[").append("N").append("]]></master_override>\r\n"); valueXmlString.append("<master_override><![CDATA[").append("N").append("]]></master_override>\r\n");
valueXmlString.append("<parcel_override><![CDATA[").append("N").append("]]></parcel_override>\r\n"); valueXmlString.append("<parcel_override><![CDATA[").append("N").append("]]></parcel_override>\r\n");
//Changed by Rohan on 12-07-13 for shipment type default to as per routing
valueXmlString.append("<ship_type><![CDATA[").append("A").append("]]></ship_type>\r\n");
valueXmlString.append( "</Detail1>\r\n" ); valueXmlString.append( "</Detail1>\r\n" );
} }
//Changed By Pragyan 21/06/12 Statrt //Changed By Pragyan 21/06/12 Statrt
...@@ -445,7 +446,8 @@ etc ...@@ -445,7 +446,8 @@ etc
//Changed by sumit on 29/12/12 display parcel pick allow //Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n"); valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n"); valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n"); //Chnaged by Rohan on 12-07-13 for shipment type default to as per routing
//valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n"); valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
} }
...@@ -472,7 +474,8 @@ etc ...@@ -472,7 +474,8 @@ etc
//Changed by sumit on 29/12/12 display parcel pick allow //Changed by sumit on 29/12/12 display parcel pick allow
valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n"); valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n"); valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n"); //Chnaged by Rohan on 12-07-13 for shipment type default to as per routing
//valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n"); valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
} }
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ d95e71e6
...@@ -2815,9 +2815,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2815,9 +2815,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn); HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
double itemPackSize = (Double)itmVolumeMap.get("PACK_SIZE"); double itemPackSize = (Double)itmVolumeMap.get("PACK_SIZE");
populateReplHistory(itemCode,siteCode,lotNo,lotSl,locCd,conn);
double stkQuantity = getStockQuantity(itemCode,siteCode,locCd,lotNo,lotSl,qtyAllocate,conn); double stkQuantity = getStockQuantity(itemCode,siteCode,locCd,lotNo,lotSl,qtyAllocate,conn);
//changed by Pragyan to Mannualy Allocated Stock is on Hold.start
if(stkQuantity <= 0)
{
System.out.println(" Mannualy Allocated Stock is on Hold");
errString = getError(saleOrder + "] Line No ["+lineNo+"]Item Code["+itemCode+"]","VTMNSTKHLD",conn);
return errString;
}
//changed by Pragyan to Mannualy Allocated Stock is on Hold.end
populateReplHistory(itemCode,siteCode,lotNo,lotSl,locCd,conn);
Map tempMapReplenishment =new HashMap(); Map tempMapReplenishment =new HashMap();
String lastReplenishmentID="",locCodeTo=""; String lastReplenishmentID="",locCodeTo="";
int lineNoRepl=0; int lineNoRepl=0;
...@@ -14368,8 +14379,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14368,8 +14379,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? " + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
//Changed By Pragyan 16JUL13 To pass the customer code is null
// + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? "; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? AND T.TRAN_CODE = A.TRAN_CODE "; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm); pstmt.setString(1,pinFrm);
...@@ -14412,8 +14425,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14412,8 +14425,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? " + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? "
//Changed By Pragyan 16JUL13 To pass the customer code is null
// + " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')"; // + " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE "; // + " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm); pstmt.setString(1,pinFrm);
...@@ -14454,8 +14469,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14454,8 +14469,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? " + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
//Changed By Pragyan 16JUL13 To pass the customer code is null
// + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')"; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE "; //+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pinFrm); pstmt.setString(1,pinFrm);
...@@ -14508,8 +14525,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14508,8 +14525,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE , T.TRAN_CODE AS TRAN_CODE , T.SERVICE_CODE AS SERVICE_CODE,T.SHIPMENT_TYPE AS SHIPMENT_TYPE FROM DISTROUTEDET A,DISTROUTE B , TRANSPORTER T" sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE , T.TRAN_CODE AS TRAN_CODE , T.SERVICE_CODE AS SERVICE_CODE,T.SHIPMENT_TYPE AS SHIPMENT_TYPE FROM DISTROUTEDET A,DISTROUTE B , TRANSPORTER T"
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
//Changed By Pragyan 16JUL13 To pass the customer code is null
// + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ?"; // + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ?";
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE "; // + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL";
} }
else if ("".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType)) else if ("".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType))
{ {
...@@ -14518,8 +14537,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14518,8 +14537,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? " + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
//Changed By Pragyan 16JUL13 To pass the customer code is null
// + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ? "; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ? ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE "; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ? AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL";
} }
else else
{ {
...@@ -14527,9 +14548,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -14527,9 +14548,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) " + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') " + " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? " + " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
//Changed By Pragyan 16JUL13 To pass the customer code is null
//+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?"; //+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
// + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')"; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE "; // + " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE ";
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P') AND T.TRAN_CODE = A.TRAN_CODE AND B.CUST_CODE IS NULL";
} }
...@@ -15401,7 +15424,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -15401,7 +15424,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String begPart = errString.substring(0,errString.indexOf("<message>")+9); String begPart = errString.substring(0,errString.indexOf("<message>")+9);
String endDesc = errString.substring(errString.indexOf("</description>")); String endDesc = errString.substring(errString.indexOf("</description>"));
mainStr= begPart+"Invalid Data"+"</message><description>"; mainStr= begPart+"Invalid Data"+"</message><description>";
mainStr= mainStr+"Sale Order ="+saleOrder+""+endDesc; mainStr= mainStr+"Sale Order ["+saleOrder+""+endDesc;
System.out.println("mainStr:::::::::::::::::: "+mainStr); System.out.println("mainStr:::::::::::::::::: "+mainStr);
begPart = null; begPart = null;
} }
...@@ -17424,10 +17447,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17424,10 +17447,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double quantity = 0.0; double quantity = 0.0;
double allocQty = 0.0; double allocQty = 0.0;
double stockQty = 0.0; double stockQty = 0.0;
double holdQty = 0.0;
try try
{ {
sql= "SELECT QUANTITY,ALLOC_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? " sql= "SELECT QUANTITY,ALLOC_QTY,(CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END) AS HOLD_QTY " +
" FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? "
+" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?"; +" AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
...@@ -17441,9 +17466,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -17441,9 +17466,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
quantity = rs.getDouble("QUANTITY"); quantity = rs.getDouble("QUANTITY");
allocQty = rs.getDouble("ALLOC_QTY"); allocQty = rs.getDouble("ALLOC_QTY");
holdQty = rs.getDouble("HOLD_QTY");
} }
stockQty = quantity - (allocQty - qtyAllocate); stockQty = quantity - (allocQty - qtyAllocate);
stockQty = stockQty - holdQty;
} }
......
webitm-wms/module-resource/metadata/shipment22.xml
View file @ d95e71e6
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<item display="P-ORD" data="P-ORD"/> <item display="P-ORD" data="P-ORD"/>
<item display="D-ISS" data="D-ISS"/> <item display="D-ISS" data="D-ISS"/>
<item display="C-ISS" data="C-ISS"/> <item display="C-ISS" data="C-ISS"/>
<item display="P-RET" data="P-RET"/>
</values> </values>
</table_column> </table_column>
<table_column> <table_column>
...@@ -2554,11 +2555,18 @@ ...@@ -2554,11 +2555,18 @@
<y>81</y> <y>81</y>
<height>16</height> <height>16</height>
<width>392</width> <width>392</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>error_msg</name> <name>error_msg</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -2618,11 +2626,19 @@ ...@@ -2618,11 +2626,19 @@
<y>60</y> <y>60</y>
<height>16</height> <height>16</height>
<width>91</width> <width>91</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>desp_confirmed</name> <name>desp_confirmed</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit">
<limit>1</limit>
<case>upper</case>
<focusrectangle>no</focusrectangle>
<autoselect>no</autoselect>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
......
webitm-wms/module-resource/sql/update.sql
View file @ d95e71e6
...@@ -42152,6 +42152,66 @@ VALUES ( ...@@ -42152,6 +42152,66 @@ VALUES (
NULL, NULL,
NULL); NULL);
commit; commit;
///Sankara and Rohan 17-JUL-13
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 (
'VTMNSTKHLD',
'Stock is on Hold',
'Manually allocated Stock is on Hold',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
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 (
'NULLPOLINE',
'Null purchase order Line No.',
'Purchase order Line No is blank.Please enter valid Purchase Order Line No',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base',
'Base',
NULL,
NULL);
commit;
commit; commit;
webitm-wms/module-resource/srd/d_shipment_docs_edit.srd
View file @ d95e71e6
...@@ -6,7 +6,7 @@ footer(height=0 color="536870912" ) ...@@ -6,7 +6,7 @@ footer(height=0 color="536870912" )
detail(height=457 color="536870912" ) detail(height=457 color="536870912" )
table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=shipment_id dbname="ship_docs.shipment_id" ) table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=shipment_id dbname="ship_docs.shipment_id" )
column=(type=char(3) update=yes updatewhereclause=yes key=yes name=line_no dbname="ship_docs.line_no" ) column=(type=char(3) update=yes updatewhereclause=yes key=yes name=line_no dbname="ship_docs.line_no" )
column=(type=char(6) update=yes updatewhereclause=yes name=ref_ser dbname="ship_docs.ref_ser" values="S-DSP S-DSP/P-ORD P-ORD/D-ISS D-ISS/C-ISS C-ISS/" ) column=(type=char(6) update=yes updatewhereclause=yes name=ref_ser dbname="ship_docs.ref_ser" values="S-DSP S-DSP/P-ORD P-ORD/D-ISS D-ISS/C-ISS C-ISS/P-RET P-RET/" )
column=(type=datetime update=yes updatewhereclause=yes name=start_dt dbname="ship_docs.start_dt" ) column=(type=datetime update=yes updatewhereclause=yes name=start_dt dbname="ship_docs.start_dt" )
column=(type=char(20) update=yes updatewhereclause=yes name=road_permit_no dbname="ship_docs.road_permit_no" ) column=(type=char(20) update=yes updatewhereclause=yes name=road_permit_no dbname="ship_docs.road_permit_no" )
column=(type=char(60) update=yes updatewhereclause=yes name=remarks dbname="ship_docs.remarks" ) column=(type=char(60) update=yes updatewhereclause=yes name=remarks dbname="ship_docs.remarks" )
......
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