Skip to content

B
business-java
Commit a41e669d authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 04/09/14 updated deallocartconf and wavegenerationprc... 

changed by sankara on 04/09/14 updated deallocartconf and wavegenerationprc and docktranpos and shipmentprc and docktranconf and wave_task metadta


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96158 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 54b55b66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2126 additions and 1330 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranConf.java 0 → 100755
View file @ a41e669d
This diff is collapsed.
webitm-wms/ibase/webitm/ejb/wms/DockTranConfLocal.java 0 → 100755
View file @ a41e669d
/**
Title : PickPostSaveLocalEJB
Date : 04/11/11
Author: Chitranjan Pandey
*/
package ibase.webitm.ejb.wms;
import ibase.webitm.ejb.*;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import java.sql.Connection;
import org.w3c.dom.*;
@javax.ejb.Local
public interface DockTranConfLocal
{
//public String postSave()throws RemoteException,ITMException;
public String confirm( String domString,String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
}
\ No newline at end of file
webitm-wms/ibase/webitm/ejb/wms/DockTranConfRemote.java 0 → 100755
View file @ a41e669d
/**
Title : PickPostSaveRemoteEJB
Date : 03/08/12
Author: Chitranjan Pandey
*/
package ibase.webitm.ejb.wms;
import ibase.webitm.ejb.*;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import java.sql.Connection;
import org.w3c.dom.*;
@javax.ejb.Remote
public interface DockTranConfRemote
{
//public String postSave()throws RemoteException,ITMException;
public String confirm( String domString,String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException;
}
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ a41e669d
...@@ -12,6 +12,7 @@ import java.rmi.RemoteException; ...@@ -12,6 +12,7 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
...@@ -482,7 +483,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -482,7 +483,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
System.out.println("detailDom:"+detailDom); System.out.println("detailDom:"+detailDom);
System.out.println("windowName:"+windowName); System.out.println("windowName:"+windowName);
System.out.println("xtraParams:"+xtraParams); System.out.println("xtraParams:"+xtraParams);
//changed by sankara on 30/08/14 for insert close out date in carton_master
Timestamp currDate = new Timestamp(System.currentTimeMillis());
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++) for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
...@@ -865,17 +868,24 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -865,17 +868,24 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
{ {
//changed by sankara on 04/03/14 considered active also for close out //changed by sankara on 04/03/14 considered active also for close out
//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P') AND SF_IDENTITY IS NULL " ; //updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P') AND SF_IDENTITY IS NULL " ;
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ; //changed by sankara on 30/08/14 update close out date
//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
} }
if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") ) if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") )
{ {
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " + //changed by sankara on 30/08/14 update close out date
" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " + //updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ; updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
} }
pstmt = conn.prepareStatement(updateSql); pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,sfIdentity); pstmt.setString(1,sfIdentity);
pstmt.setString(2,shipmentIDs); //changed by sankara on 30/08/14 update close out date
//pstmt.setString(2,shipmentIDs);
pstmt.setTimestamp(2,currDate);
pstmt.setString(3,shipmentIDs);
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
if(count > 0) if(count > 0)
{ {
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ a41e669d
...@@ -3211,74 +3211,115 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3211,74 +3211,115 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("childNodeName---->>> "+ childNodeName); System.out.println("childNodeName---->>> "+ childNodeName);
if (childNodeName.equals("stock_quantity")) if (childNodeName.equals("stock_quantity"))
{ {
stockQuantity = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
stockQuantity = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("sale_order")) if (childNodeName.equals("sale_order"))
{ {
saleOrder = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
saleOrder = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("line_no")) if (childNodeName.equals("line_no"))
{ {
lineNo = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
lineNo = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("item_code")) if (childNodeName.equals("item_code"))
{ {
itemCode = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
itemCode = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("qty_alloc")) if (childNodeName.equals("qty_alloc"))
{ {
if ( childNode != null && childNode.getFirstChild() != null )
allocQty = Double.parseDouble(childNode.getFirstChild().getNodeValue()); {
System.out.println("qty_alloc======>"+allocQty); allocQty = Double.parseDouble(childNode.getFirstChild().getNodeValue());
System.out.println("qty_alloc======>"+allocQty);
}
} }
if (childNodeName.equals("exp_lev")) if (childNodeName.equals("exp_lev"))
{ {
expLev = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
expLev = childNode.getFirstChild().getNodeValue();
}
} }
//changed by sankara on 03-08-2012 adding pending quantity[start] //changed by sankara on 03-08-2012 adding pending quantity[start]
if (childNodeName.equals("pending_quantity")) if (childNodeName.equals("pending_quantity"))
{ {
pendingQuantity = Double.parseDouble(childNode.getFirstChild().getNodeValue()); if ( childNode != null && childNode.getFirstChild() != null )
{
pendingQuantity = Double.parseDouble(childNode.getFirstChild().getNodeValue());
}
} }
if (childNodeName.equals("cust_code")) if (childNodeName.equals("cust_code"))
{ {
custCode = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
custCode = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("single_lot")) if (childNodeName.equals("single_lot"))
{ {
singleLot = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
singleLot = childNode.getFirstChild().getNodeValue();
}
} }
//changed by sankara on 03-08-2012 adding pending quantity[end] //changed by sankara on 03-08-2012 adding pending quantity[end]
if (childNodeName.equals("active_pick_allow")) if (childNodeName.equals("active_pick_allow"))
{ {
isActivePickChecked = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
isActivePickChecked = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("stock_to_dock_allow")) if (childNodeName.equals("stock_to_dock_allow"))
{ {
isStockToDockChecked = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
{
isStockToDockChecked = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("master_pack_allow")) if (childNodeName.equals("master_pack_allow"))
{ {
isMasterPickChecked = childNode.getFirstChild().getNodeValue(); if ( childNode != null && childNode.getFirstChild() != null )
System.out.println("isMasterPickChecked["+childNode.getFirstChild().getNodeValue()+"]"); {
isMasterPickChecked = childNode.getFirstChild().getNodeValue();
System.out.println("isMasterPickChecked["+childNode.getFirstChild().getNodeValue()+"]");
}
} }
//Changed By Pragyan 31/12/12 To get Parcel Pack Flag.start //Changed By Pragyan 31/12/12 To get Parcel Pack Flag.start
if (childNodeName.equals("parcelpack_allow")) if (childNodeName.equals("parcelpack_allow"))
{ {
System.out.println("isParcelPickChecked["+childNode.getFirstChild().getNodeValue()+"]"); if ( childNode != null && childNode.getFirstChild() != null )
isParcelPickChecked = childNode.getFirstChild().getNodeValue(); {
System.out.println("isParcelPickChecked["+childNode.getFirstChild().getNodeValue()+"]");
isParcelPickChecked = childNode.getFirstChild().getNodeValue();
}
} }
if (childNodeName.equals("ship_type")) if (childNodeName.equals("ship_type"))
{ {
System.out.println("shipTypeLine["+childNode.getFirstChild().getNodeValue()+"]"); if ( childNode != null && childNode.getFirstChild() != null )
shipTypeLine = childNode.getFirstChild().getNodeValue(); {
} System.out.println("shipTypeLine["+childNode.getFirstChild().getNodeValue()+"]");
shipTypeLine = childNode.getFirstChild().getNodeValue();
}
}
//Changed By Pragyan 31/12/12 To get Parcel Pack Flag.end //Changed By Pragyan 31/12/12 To get Parcel Pack Flag.end
//Changed by sumit on 14/12/12 adding validation incase of manualy allocating saleorder and modifiying qty_allow start. //Changed by sumit on 14/12/12 adding validation incase of manualy allocating saleorder and modifiying qty_allow start.
if (childNodeName.equals("manual_allocqty")) if (childNodeName.equals("manual_allocqty"))
......
webitm-wms/module-resource/metadata/wave_task22.xml
View file @ a41e669d
...@@ -94,20 +94,20 @@ ...@@ -94,20 +94,20 @@
<name>sale_order</name> <name>sale_order</name>
<dbname>wave_task_det.sale_order</dbname> <dbname>wave_task_det.sale_order</dbname>
</table_column> </table_column>
<table_column>
<type size="8">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>wave_status</name>
<dbname>wave_status</dbname>
</table_column>
<table_column> <table_column>
<type size="4000">char</type> <type size="4000">char</type>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>descr</name> <name>descr</name>
<dbname>descr</dbname> <dbname>descr</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task_det&quot; ) COLUMN(NAME=&quot;wave_task_det.wave_id&quot;) COLUMN(NAME=&quot;wave_task_det.line_no&quot;) COLUMN(NAME=&quot;wave_task_det.ref_ser&quot;) COLUMN(NAME=&quot;wave_task_det.ref_id&quot;) COLUMN(NAME=&quot;wave_task_det.status&quot;) COLUMN(NAME=&quot;wave_task_det.ptcn&quot;) COLUMN(NAME=&quot;wave_task_det.sale_order&quot;) COMPUTE(NAME=&quot;case when wave_status = &apos;C&apos; then &apos;Created&apos; when wave_status = &apos;V&apos; then &apos;Verified&apos; when wave_status = &apos;W&apos; then &apos;Held&apos; else &apos; &apos; end wave_status&quot;) COMPUTE(NAME=&quot;FN_WAVE_DESCRIPTION(WAVE_TASK_DET.REF_SER,REF_ID,PTCN) AS DESCR&quot;)WHERE( EXP1 =&quot;wave_task_det.wave_id&quot; OP =&quot;=&quot; EXP2 =&quot;:wave_id&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;wave_task_det.line_no&quot; OP =&quot;=&quot; EXP2 =&quot;:line_no&quot; ) ) ARG(NAME = &quot;wave_id&quot; TYPE = string) ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve> <table_column>
<type size="11">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>wave_status</name>
<dbname>wave_status</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task_det&quot; ) COLUMN(NAME=&quot;wave_task_det.wave_id&quot;) COLUMN(NAME=&quot;wave_task_det.line_no&quot;) COLUMN(NAME=&quot;wave_task_det.ref_ser&quot;) COLUMN(NAME=&quot;wave_task_det.ref_id&quot;) COLUMN(NAME=&quot;wave_task_det.status&quot;) COLUMN(NAME=&quot;wave_task_det.ptcn&quot;) COLUMN(NAME=&quot;wave_task_det.sale_order&quot;) COMPUTE(NAME=&quot;FN_WAVE_DESCRIPTION(WAVE_TASK_DET.REF_SER,REF_ID,PTCN) AS DESCR&quot;) COMPUTE(NAME=&quot;case when wave_status = &apos;C&apos; then &apos;Created&apos; when wave_status = &apos;V&apos; then &apos;Verified&apos; when wave_status = &apos;W&apos; then &apos;Held&apos; when wave_status = &apos;D&apos; then &apos;Deallocated&apos; else &apos; &apos; end wave_status&quot;)WHERE( EXP1 =&quot;wave_task_det.wave_id&quot; OP =&quot;=&quot; EXP2 =&quot;:wave_id&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;wave_task_det.line_no&quot; OP =&quot;=&quot; EXP2 =&quot;:line_no&quot; ) ) ARG(NAME = &quot;wave_id&quot; TYPE = string) ARG(NAME = &quot;line_no&quot; TYPE = number) </retrieve>
<update>WAVE_TASK_DET</update> <update>WAVE_TASK_DET</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>9</id> <id>8</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>8</id> <id>9</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
......
webitm-wms/module-resource/sql/update.sql
View file @ a41e669d
...@@ -49339,7 +49339,36 @@ values ...@@ -49339,7 +49339,36 @@ values
update MESSAGES SET MSG_NO='VTNOTPARCT' WHERE MSG_NO='VTNOTPOAT'; update MESSAGES SET MSG_NO='VTNOTPARCT' WHERE MSG_NO='VTNOTPOAT';
COMMIT; COMMIT;
--changed by sankara on 04/09/14 updated function sql
create or replace
function fn_wave_status(SI_WAVE_ID IN CHAR)
return CHAR IS STATUS CHAR;
CNT NUMBER;
CNT1 NUMBER;
CNT2 NUMBER;
BEGIN
BEGIN
SELECT count(*) INTO CNT FROM WAVE_TASK_DET WHERE WAVE_ID = SI_WAVE_ID;
SELECT count(*) INTO CNT1 FROM WAVE_TASK_DET WHERE WAVE_ID = SI_WAVE_ID AND STATUS = 'Y';
SELECT COUNT(*) INTO CNT2 FROM WAVE_TASK_DET WHERE WAVE_ID = SI_WAVE_ID AND REF_SER <> 'S-DSP' AND WAVE_STATUS IN ('C','W','V') ;
IF (CNT = cnt1 ) THEN
STATUS := 'Y';
ELSE
STATUS := 'N';
IF (CNT2 = '0' ) THEN
STATUS := 'Y';
ELSE
STATUS := 'N';
END IF;
END IF;
EXCEPTION
WHEN NO_DATA_FOUND THEN
STATUS :='N';
END;
RETURN STATUS;
END;
-- changed by sankara on 29/07/14 for update deallocate status in wave task det and master pack hold sqls end
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