Skip to content

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

Issue tracker point no 210,249 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93491 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 76281091
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1104 additions and 511 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnConf.java
View file @ 9eb6f9cd
......@@ -717,6 +717,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
//changed by chaitali on 05/12/11
String priceListStd = "";
String postType = "";
String tranType = ""; //changed by sankara WM3ESUN007 on 12/08/13
double rateStd = 0d;
//End changed by chaitali 05/12/11
double rateClg = 0d; //Added By Mahesh Patidar on 28/06/12
......@@ -771,7 +772,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
System.out.println("sysDate is :"+sysDate+" sysDate str is : "+sysDateStr);
//Changed by sumit on 17/05/13 added asn_no column
//sql = "SELECT CONFIRMED, PURC_ORDER, SCAC_CODE, SITE_CODE, SUPP_CODE FROM ASN_HDR WHERE TRAN_ID = ?";
sql = "SELECT CONFIRMED, PURC_ORDER, SCAC_CODE, SITE_CODE, SUPP_CODE,ASN_NO FROM ASN_HDR WHERE TRAN_ID = ?";
//Changed by sankara on 12/08/13 aded tran_type column for WM3ESUN007
//sql = "SELECT CONFIRMED, PURC_ORDER, SCAC_CODE, SITE_CODE, SUPP_CODE,ASN_NO FROM ASN_HDR WHERE TRAN_ID = ?";
sql = " SELECT CONFIRMED, PURC_ORDER, SCAC_CODE, SITE_CODE, SUPP_CODE, ASN_NO, TRAN_TYPE FROM ASN_HDR WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdAsnHdr);
rs = pstmt.executeQuery();
......@@ -784,6 +787,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
suppCode = checkNull( rs.getString("SUPP_CODE") );
//Changed by sumit on 17/05.13
asnNo = checkNull( rs.getString("ASN_NO") );
//Changed by sankara on 12/08/13 for updation in pucahse order for WM3ESUN007
tranType = checkNull( rs.getString("TRAN_TYPE") );
System.out.println("TRANTYPE==="+tranType);
}
if( pstmt != null )
{
......@@ -795,7 +801,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
rs.close();
rs = null;
}
/*
sql = "SELECT TRAN_CODE FROM TRANSPORTER WHERE SCAC_CODE = ?";
pstmt = conn.prepareStatement(sql);
......@@ -963,7 +969,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
}
rs.close();rs = null;
pstmt.close();pstmt = null;
// modify by cpatil on 30-AUG-12 end
StringBuffer xmlString= new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
xmlString.append("<DocumentRoot><description>Datawindow Root</description><group0><description>Group0 escription</description>");
xmlString.append("<Header0>");
......@@ -1319,7 +1325,7 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
if ( retString.indexOf("Success") > -1 && retString.indexOf("<TranID>") > 0 )
{
String tranIdPurcOrder = retString.substring( retString.indexOf("<TranID>")+8, retString.indexOf("</TranID>"));
String tranIdPurcOrder = retString.substring( retString.indexOf("<TranID>")+8, retString.indexOf("</TranID>"));
System.out.println("tranId is :"+tranIdPurcOrder);
......@@ -1333,15 +1339,28 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
pstmtUpdate.close(); pstmtUpdate = null;
System.out.println("updated records in ASN_HDR : "+updCnt);
sql = "UPDATE PORDER SET CONFIRMED = 'Y', EMP_CODE__APRV = ?, CONF_DATE = ?, POST_TYPE = 'S' WHERE PURC_ORDER = ? ";
pstmtUpdate = conn.prepareStatement(sql);
pstmtUpdate.setString(1, loginEmpCode);
pstmtUpdate.setTimestamp(2, Timestamp.valueOf( confDateStr ) );
pstmtUpdate.setString(3, tranIdPurcOrder);
updCnt = pstmtUpdate.executeUpdate();
pstmtUpdate.close(); pstmtUpdate = null;
System.out.println("updated records in PORDER : "+updCnt);
// Changed by sankara on 12-08-13 for updation pord_type against generated purchase order WM3ESUN007 satrt..
/* sql = "UPDATE PORDER SET CONFIRMED = 'Y', EMP_CODE__APRV = ?, CONF_DATE = ?, POST_TYPE = 'S' WHERE PURC_ORDER = ? ";
pstmtUpdate = conn.prepareStatement(sql);
pstmtUpdate.setString(1, loginEmpCode);
pstmtUpdate.setTimestamp(2, Timestamp.valueOf( confDateStr ) );
pstmtUpdate.setString(3, tranIdPurcOrder);
updCnt = pstmtUpdate.executeUpdate();
pstmtUpdate.close(); pstmtUpdate = null;
System.out.println("updated records in PORDER : "+updCnt); */
sql = " UPDATE PORDER SET CONFIRMED = 'Y', EMP_CODE__APRV = ?, CONF_DATE = ?, POST_TYPE = 'S', PORD_TYPE = ? WHERE PURC_ORDER = ? ";
pstmtUpdate = conn.prepareStatement(sql);
pstmtUpdate.setString(1, loginEmpCode);
pstmtUpdate.setTimestamp(2, Timestamp.valueOf( confDateStr ) );
pstmtUpdate.setString(3, tranType);
pstmtUpdate.setString(4, tranIdPurcOrder);
updCnt = pstmtUpdate.executeUpdate();
pstmtUpdate.close(); pstmtUpdate = null;
System.out.println("updated records in PORDER : "+updCnt);
// Changed by sankara on 12-08-13 for updation pord_type against generated purchase order WM3ESUN007 end..
errString = "";//Gulzar - 25/11/11
// 16/10/11 manoharan connection passed as parameter
......@@ -1487,7 +1506,8 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
String lrNo = "";
String currCode = "";
String itemSer = "";
//changed by sankara on 12/08/13 added tran_type for WM3ESUN007
String orderType = "";
java.sql.Date asnDateDb = null;
java.sql.Timestamp expDateDb = null;
java.sql.Timestamp mfgDate = null;
......@@ -1568,7 +1588,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
errString = itmdbAccess.getErrorString("","NULLPORDER",userId);
return errString;
}
sql = "SELECT STATUS, CONFIRMED, SITE_CODE__BILL, SUPP_CODE, ITEM_SER, FRT_AMT FROM PORDER WHERE PURC_ORDER = ? ";
// Changed by sankara on 12/08/13 added pord_type for updartion of purchase receipt WM3ESUN007
// sql = "SELECT STATUS, CONFIRMED, SITE_CODE__BILL, SUPP_CODE, ITEM_SER, FRT_AMT FROM PORDER WHERE PURC_ORDER = ? ";
sql = " SELECT STATUS, CONFIRMED, SITE_CODE__BILL, SUPP_CODE, ITEM_SER, FRT_AMT, PORD_TYPE FROM PORDER WHERE PURC_ORDER = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, purcOrder );
rs = pstmt.executeQuery();
......@@ -1581,6 +1603,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
itemSer = checkNull( rs.getString("ITEM_SER") );
frtAmt = rs.getDouble("FRT_AMT") ;
status = checkNull( rs.getString("STATUS") );
// Changed by sankara on 12/08/13 for updartion of purchase receipt WM3ESUN007
orderType = checkNull( rs.getString("PORD_TYPE") );
System.out.println("ORDERTYPE==="+orderType);
}
if( pstmt != null )
{
......@@ -1651,6 +1676,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
xmlString.append("<tran_id><![CDATA[").append("").append("]]></tran_id>");
xmlString.append("<tran_date><![CDATA[").append(sysDateStr).append("]]></tran_date>");
xmlString.append("<eff_date><![CDATA[").append(sysDateStr).append("]]></eff_date>");
// Changed by sankara on 12/08/13 for set tran type in purchase receipt Start WM3ESUN007..
xmlString.append("<tran_type><![CDATA[").append(orderType).append("]]></tran_type>");
// Changed by sankara on 12/08/13 for set tran type in purchase receipt End WM3ESUN007..
xmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>");
xmlString.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>");
xmlString.append("<supp_code__ship><![CDATA[").append(suppCode).append("]]></supp_code__ship>");
......
webitm-wms/ibase/webitm/ejb/wms/AsnIC.java
View file @ 9eb6f9cd
......@@ -813,6 +813,10 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
String purcOrderLineNo = "";
String purcOrder = "";
//Changed by Rohan on 09-07-13 for define variables.end
//Changed by sankara on 12-08-13 WM3ESUN007 for define variable start..
String tranType = "";
String fullName = "";
//Changed by sankara on 12-08-13 WM3ESUN007 for define variable end..
double itmQty=0;
Connection conn = null;
......@@ -820,6 +824,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
StringBuffer valueXmlString = new StringBuffer();
int currentFormNo = 0;
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
......@@ -926,15 +931,16 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
}
}
// Changed by sumit on date 26/09/11 for supplier code description item changed START.
else if( currentColumn.trim().equalsIgnoreCase( "supp_code" ) )
else if( currentColumn.trim().equalsIgnoreCase( "supp_code" ) )
{
columnValue = genericUtility.getColumnValue("supp_code",dom);
sql = " SELECT FULL_NAME FROM SUPPLIER WHERE SUPP_CODE = ?";
sql = " SELECT FULL_NAME, SUPP_TRAN_TYPE FROM SUPPLIER WHERE SUPP_CODE = ? ";
System.out.println("columnValue ["+columnValue+" ]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
//Changed by sankara on 12-08-13 for setting tran_type in asn_hdr WM3ESUN007 Start..
/* if( rs.next() )
{
valueXmlString.append( "<full_name><![CDATA[" ).append( checkNull( rs.getString("FULL_NAME")) ).append( "]]></full_name>\r\n" );
System.out.println("------------------------APPENDING DESCRIPTION-------------------");
......@@ -944,6 +950,38 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
valueXmlString.append( "<full_name><![CDATA[" ).append( "" ).append( "]]></full_name>\r\n" );
System.out.println("------------------------EMPTY DESCRIPTION-------------------");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null; */
if( rs.next() )
{
fullName = rs.getString("FULL_NAME");
tranType = rs.getString("SUPP_TRAN_TYPE");
}
if( fullName != null )
{
valueXmlString.append( "<full_name><![CDATA[" ).append( checkNull(fullName) ).append( "]]></full_name>\r\n" );
}
else
{
valueXmlString.append( "<full_name><![CDATA[" ).append( "" ).append( "]]></full_name>\r\n" );
}
if( tranType != null )
{
valueXmlString.append( "<tran_type><![CDATA[" ).append( checkNull( tranType )).append( "]]></tran_type>\r\n" );
}
else
{
tranType = findValueFromDisparm("999999","PORCP_TRAN_TYPE",conn);
System.out.println("TRANTYPE====="+tranType);
valueXmlString.append( "<tran_type><![CDATA[" ).append( tranType ).append( "]]></tran_type>\r\n" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changed by sankara on 12-08-13 for setting tran_type in asn_hdr WM3ESUN007 End..
}
// Changed by sumit on date 26/09/11 for suppliers code description item changed END.
else if( currentColumn.trim().equalsIgnoreCase( "emp_code__aprv" ) )
......@@ -956,7 +994,9 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
rs = pstmt.executeQuery();
if( rs.next() )
{
String fullName = checkNull(rs.getString("EMP_FNAME"))+checkNull(rs.getString("EMP_MNAME"))+checkNull(rs.getString("EMP_LNAME"));
//Changed by sankara on 12/08/13 all ready declared in method...
//String fullName = checkNull(rs.getString("EMP_FNAME"))+checkNull(rs.getString("EMP_MNAME"))+checkNull(rs.getString("EMP_LNAME"));
fullName = checkNull(rs.getString("EMP_FNAME"))+checkNull(rs.getString("EMP_MNAME"))+checkNull(rs.getString("EMP_LNAME"));
valueXmlString.append( "<emp_fname><![CDATA[" ).append( checkNull( fullName )).append( "]]></emp_fname>\r\n" );
System.out.println("------------------------APPENDING DESCRIPTION-------------------");
}
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ 9eb6f9cd
......@@ -1217,6 +1217,8 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
// changed by sankara on 08/08/13 for define varible
String tranCodeHdr = "";
//Chnaged by Rohan on 30-07-13 for define varable.end
//Changed by Rohan on 12-08-13 for gross weight ogf shipment header populate in shipment content
String grossWeight = "";
int stdPickUp = 0;
int pos = 0;
......@@ -2197,20 +2199,31 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
//Changed by Rohan on 30-7-13 for generation carton no and pallet no in itm default.start
case 3:
{
parentNodeList = dom.getElementsByTagName("Detail3");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
valueXmlString.append("<Detail3>");
childNodeListLength = childNodeList.getLength();
grossWeight = checkNull(genericUtility.getColumnValue("gross_weight",dom2));
System.out.println("Gross weight All dom?@@22@@"+grossWeight);
grossWeight = checkNull(genericUtility.getColumnValue("gross_weight",dom));
System.out.println("Gross weight All dom@@00@@?"+grossWeight);
grossWeight = checkNull(genericUtility.getColumnValue("gross_weight",dom1));
System.out.println("Gross weight All dom@@11@@"+grossWeight);
do
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
ctr ++;
}while(ctr < childNodeListLength && ! childNodeName.equals(currentColumn));
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
//Changed by Rohan on 12-08-13 for gross weight ogf shipment header populate in shipment content
grossWeight = checkNull(genericUtility.getColumnValue("gross_weight",dom1));
System.out.println("Gross weight All dom@@11@@----->"+grossWeight);
cartonNo = generateCartonNo("w_carton_no_gen",xtraParams,conn);
palletNo = generatePalletNo("w_palletprc",xtraParams,conn);
......@@ -2218,6 +2231,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
System.out.println("cartonNo:"+cartonNo+":palletNo:"+palletNo+"]");
valueXmlString.append( "<carton_no><![CDATA[" ).append( checkNull(cartonNo) ).append( "]]></carton_no>\r\n" );
valueXmlString.append( "<pallet_no><![CDATA[" ).append( checkNull(palletNo )).append( "]]></pallet_no>\r\n" );
valueXmlString.append( "<gross_weight><![CDATA[" ).append(grossWeight).append( "]]></gross_weight>\r\n" );
}
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentPos.java
View file @ 9eb6f9cd
......@@ -129,7 +129,25 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
else
{
System.out.println("Updated Rows count is zero");
}
}
//Changed by Rohan to update gross weight in shipment content from shipmet headere.start
if((!"".equalsIgnoreCase(editFlag) || editFlag != null) )
{
sql = " UPDATE SHIPMENT_CONTENT SET GROSS_WEIGHT = (SELECT GROSS_WEIGHT FROM SHIPMENT WHERE SHIPMENT_ID = ? ) WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,shipmentId);
pstmt.setString(2,shipmentId);
int cnt = pstmt.executeUpdate();
if(cnt > 0)
{
System.out.println("Gross weight update suceesfuly");
}
pstmt.close();
pstmt = null;
}
//Changed by Rohan to update gross weight in shipment content from shipment header.end
}
catch(Exception e)
{
......
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ 9eb6f9cd
......@@ -983,10 +983,10 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
System.out.println("PTCN LIST"+ptcnVoidPackagesMap.toString()+"}");
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages.start
if(!(ptcnVoidPackagesMap.containsKey(ptcn)))
if(!(ptcnVoidPackagesMap.containsKey(ptcn)) && isTrackingNoExist(ptcn,conn))
{
if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK") )
{
/* if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK") )
{*/
ptcnVoidPackagesMap.put(ptcn,refSer);
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages.end
......@@ -997,7 +997,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
String adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
ADSIShippingLocator locator = new ADSIShippingLocator();
//ADSIShippingSoap soap = locator.getADSIShippingSoap(new URL("http://172.20.0.137/ADSIShippingWS/ADSIShipping.asmx"));
long timeBefore = System.currentTimeMillis();
long timeBefore = System.currentTimeMillis();
locator = new ADSIShippingLocator();
if(soap == null)
{
......@@ -1009,17 +1009,21 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if(soap.testADSIServer())
{
if(refSer.equalsIgnoreCase("M-PICK"))
/*if(refSer.equalsIgnoreCase("M-PICK"))
{
sql = "SELECT MSN_NO,CARRIER_SYMBOL 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'";
sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND REF_SER IN ('M-PACK','A-PICK') AND CARTON_TYPE IN('M','A') AND TRACKING_NO IS NOT NULL";
}
else
{
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.setString(1, ptcn);
rs = pstmt.executeQuery();
//sql = "SELECT MSN_NO,CARRIER_SYMBOL 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 IN ('P-PICK','A-PICK') AND CARTON_TYPE IN('P','A') AND TRACKING_NO IS NOT NULL";
}*/
sql = "SELECT MSN_NO,CARRIER_SYMBOL FROM CARTON_MASTER WHERE PTCN = ? AND MSN_NO > 0 AND TRACKING_NO IS NOT NULL;";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn);
rs = pstmt.executeQuery();
while(rs.next())
{
msnNo = rs.getLong("MSN_NO");
......@@ -1071,7 +1075,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
return retString;
}
}
//}
if(!isOrderIsInProcess(saleOrder, ptcn, conn))
{
......@@ -2723,5 +2727,83 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
}
return isManAlloc;
}
private boolean isTrackingNoExist(String ptcn,Connection conn) throws ITMException
{
String sql = "",updateSql = "";
String sqlShipStanCode = "";
ResultSet rs = null;
PreparedStatement pstmt = null,pstmtUpd = null;
boolean isAparcelWave = false;
int count = 0;
try
{
sql = " SELECT COUNT(*) AS COUNT FROM CARTON_MASTER WHERE PTCN = ? AND TRACKING_NO IS NOT NULL";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn);
rs = pstmt.executeQuery();
if (rs.next())
{
//isAparcelWave = true;
count = rs.getInt("COUNT");
}
if(count > 0)
{
isAparcelWave = true;
System.out.println("Update count isAparcelWave["+isAparcelWave+"]");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
System.out.println("Exception in == >"+e);
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e1)
{
throw new ITMException(e1);
}
}
return isAparcelWave;
}
}
webitm-wms/module-resource/metadata/asn11.xml
View file @ 9eb6f9cd
......@@ -32,7 +32,7 @@
<grid.lines>0</grid.lines>
</BaseDefinition>
<Header>
<height>21</height>
<height>20</height>
<color>536870912</color>
</Header>
<Summary>
......@@ -85,7 +85,7 @@
<dbname>asn_hdr.lr_no</dbname>
</table_column>
<table_column>
<type precision="0">decimal</type>
<type precision="3">decimal</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>gross_weight</name>
......@@ -186,8 +186,15 @@
<name>full_name</name>
<dbname>supplier.full_name</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;asn_hdr&quot; ) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;site&quot; ) TABLE(NAME=&quot;supplier&quot; ) COLUMN(NAME=&quot;asn_hdr.tran_id&quot;) COLUMN(NAME=&quot;asn_hdr.tran_date&quot;) COLUMN(NAME=&quot;asn_hdr.asn_no&quot;) COLUMN(NAME=&quot;asn_hdr.asn_date&quot;) COLUMN(NAME=&quot;asn_hdr.lr_no&quot;) COLUMN(NAME=&quot;asn_hdr.gross_weight&quot;) COLUMN(NAME=&quot;asn_hdr.bol_no&quot;) COLUMN(NAME=&quot;asn_hdr.invoice_no&quot;) COLUMN(NAME=&quot;asn_hdr.purc_order&quot;) COLUMN(NAME=&quot;asn_hdr.confirmed&quot;) COLUMN(NAME=&quot;asn_hdr.conf_date&quot;) COLUMN(NAME=&quot;asn_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;asn_hdr.chg_date&quot;) COLUMN(NAME=&quot;asn_hdr.chg_user&quot;) COLUMN(NAME=&quot;asn_hdr.chg_term&quot;) COLUMN(NAME=&quot;asn_hdr.site_code&quot;) COLUMN(NAME=&quot;site.descr&quot;) COLUMN(NAME=&quot;asn_hdr.supp_code&quot;) COLUMN(NAME=&quot;supplier.full_name&quot;) JOIN (LEFT=&quot;asn_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;asn_hdr.emp_code__aprv&quot; ) JOIN (LEFT=&quot;asn_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;asn_hdr.site_code&quot; ) JOIN (LEFT=&quot;asn_hdr.supp_code&quot; OP =&quot;=&quot;RIGHT=&quot;supplier.supp_code&quot; OUTER1 =&quot;asn_hdr.supp_code&quot; )WHERE( EXP1 =&quot;asn_hdr.tran_date&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:date_from&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;asn_hdr.tran_date&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:date_to&quot; ) ) ARG(NAME = &quot;date_from&quot; TYPE = datetime) ARG(NAME = &quot;date_to&quot; TYPE = datetime) </retrieve>
<update>asn_hdr</update>
<table_column>
<type size="3">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>tran_type</name>
<dbname>asn_hdr.tran_type</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;asn_hdr&quot; ) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;site&quot; ) TABLE(NAME=&quot;supplier&quot; ) COLUMN(NAME=&quot;asn_hdr.tran_id&quot;) COLUMN(NAME=&quot;asn_hdr.tran_date&quot;) COLUMN(NAME=&quot;asn_hdr.asn_no&quot;) COLUMN(NAME=&quot;asn_hdr.asn_date&quot;) COLUMN(NAME=&quot;asn_hdr.lr_no&quot;) COLUMN(NAME=&quot;asn_hdr.gross_weight&quot;) COLUMN(NAME=&quot;asn_hdr.bol_no&quot;) COLUMN(NAME=&quot;asn_hdr.invoice_no&quot;) COLUMN(NAME=&quot;asn_hdr.purc_order&quot;) COLUMN(NAME=&quot;asn_hdr.confirmed&quot;) COLUMN(NAME=&quot;asn_hdr.conf_date&quot;) COLUMN(NAME=&quot;asn_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;employee.emp_fname&quot;) COLUMN(NAME=&quot;asn_hdr.chg_date&quot;) COLUMN(NAME=&quot;asn_hdr.chg_user&quot;) COLUMN(NAME=&quot;asn_hdr.chg_term&quot;) COLUMN(NAME=&quot;asn_hdr.site_code&quot;) COLUMN(NAME=&quot;site.descr&quot;) COLUMN(NAME=&quot;asn_hdr.supp_code&quot;) COLUMN(NAME=&quot;supplier.full_name&quot;) COLUMN(NAME=&quot;asn_hdr.tran_type&quot;) JOIN (LEFT=&quot;asn_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;asn_hdr.emp_code__aprv&quot; ) JOIN (LEFT=&quot;asn_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;asn_hdr.site_code&quot; ) JOIN (LEFT=&quot;asn_hdr.supp_code&quot; OP =&quot;=&quot;RIGHT=&quot;supplier.supp_code&quot; OUTER1 =&quot;asn_hdr.supp_code&quot; )WHERE( EXP1 =&quot;asn_hdr.tran_date&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:date_from&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;asn_hdr.tran_date&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:date_to&quot; ) ) ARG(NAME = &quot;date_from&quot; TYPE = datetime) ARG(NAME = &quot;date_to&quot; TYPE = datetime) </retrieve>
<update>ASN_HDR</update>
<updatewhere>1</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<argument>
......@@ -289,7 +296,7 @@
<text>Employee Name</text>
<border>0</border>
<color>33554432</color>
<x>1587</x>
<x>1736</x>
<y>2</y>
<height>16</height>
<width>128</width>
......@@ -373,7 +380,7 @@
<text>Approved By</text>
<border>0</border>
<color>33554432</color>
<x>1482</x>
<x>1631</x>
<y>2</y>
<height>16</height>
<width>103</width>
......@@ -401,7 +408,7 @@
<text>Supplier full name</text>
<border>0</border>
<color>33554432</color>
<x>1375</x>
<x>1524</x>
<y>2</y>
<height>16</height>
<width>105</width>
......@@ -457,7 +464,7 @@
<text>Chg Date</text>
<border>0</border>
<color>33554432</color>
<x>1717</x>
<x>1866</x>
<y>2</y>
<height>16</height>
<width>94</width>
......@@ -485,7 +492,7 @@
<text>Chg User</text>
<border>0</border>
<color>33554432</color>
<x>1813</x>
<x>1962</x>
<y>2</y>
<height>16</height>
<width>76</width>
......@@ -513,7 +520,7 @@
<text>Chg Term</text>
<border>0</border>
<color>33554432</color>
<x>1891</x>
<x>2040</x>
<y>2</y>
<height>16</height>
<width>96</width>
......@@ -759,6 +766,34 @@
<color>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Tran Type</text>
<border>0</border>
<color>33554432</color>
<x>1375</x>
<y>2</y>
<height>16</height>
<width>147</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>tran_type_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>553648127</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
......@@ -1272,7 +1307,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1375</x>
<x>1524</x>
<y>2</y>
<height>16</height>
<width>105</width>
......@@ -1351,7 +1386,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1482</x>
<x>1631</x>
<y>2</y>
<height>16</height>
<width>103</width>
......@@ -1390,7 +1425,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1717</x>
<x>1866</x>
<y>2</y>
<height>16</height>
<width>94</width>
......@@ -1429,7 +1464,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1813</x>
<x>1962</x>
<y>2</y>
<height>16</height>
<width>76</width>
......@@ -1468,7 +1503,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1891</x>
<x>2040</x>
<y>2</y>
<height>16</height>
<width>96</width>
......@@ -1507,7 +1542,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1587</x>
<x>1736</x>
<y>2</y>
<height>16</height>
<width>128</width>
......@@ -1538,6 +1573,42 @@
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>21</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1375</x>
<y>2</y>
<height>16</height>
<width>147</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>tran_type</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<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>16777215</color>
</background>
</ColumnObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......
webitm-wms/module-resource/sql/update.sql
View file @ 9eb6f9cd
......@@ -42833,8 +42833,34 @@ VALUES (
'Base',
'Base',
NULL);
commit;
commit;
//----
INSERT INTO DISPARM (
prd_code ,
var_name ,
var_type ,
var_value ,
descr ,
var_subs ,
chg_date ,
chg_user ,
chg_term )
VALUES (
'999999',
'PORCP_TRAN_TYPE',
'S',
' ',
'Tran Type',
0,
fn_sysdate(),
'BASE ',
'BASE ');
ALTER TABLE ASN_HDR ADD TRAN_TYPE VARCHAR2(3);
ALTER TABLE SHIPMENT ADD TELE1 VARCHAR2(15);
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