Skip to content

B
business-java
Commit 3a4275a5 authored by ssarkar's avatar ssarkar
Browse files
Options

Update by sumit on 01/04/13 bug solved 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92919 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d746d7f7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 38 deletions
webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java
View file @ 3a4275a5
......@@ -1180,8 +1180,12 @@ public class ConsolidatToDoc {
if(!isError && ("".equalsIgnoreCase(errString)|| errString == null) && errString.trim().length() == 0)
{
System.out.println("Delete records:::::::");
sql = " DELETE FROM SORDALLOC WHERE QTY_ALLOC = 0 ";
//Changed by sumit on 01/apr/13 adding sale_order condition
//sql = " DELETE FROM SORDALLOC WHERE QTY_ALLOC = 0 ";
sql = " DELETE FROM SORDALLOC WHERE QTY_ALLOC <= 0 AND SALE_ORDER IN (SELECT DISTINCT SALE_ORDER FROM WAVE_TASK_DET WHERE PTCN = ?)";
pstmt = conn.prepareStatement(sql);
//Changed by sumit 01/04/13 setting parameter
pstmt.setString(1, ptcn);
int updCnt = pstmt.executeUpdate();
if( updCnt > 0 )
{
......
webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java
View file @ 3a4275a5
......@@ -2726,9 +2726,14 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
private int updateWaveTaskDet(String refId, String task, Connection conn , String pickType, String empCode) throws ITMException
{
String sql = "";
String pickOrder = "";//Added by sumit on 01/APR/13
String confirmed = "";
int pickLine = 0;//Added by sumit on 01/APR/13
double quantity = 0.0;
PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;//Added by sumit on 01/APR/13
ResultSet rs = null;
ResultSet rs1 = null;//Added by sumit on 01/APR/13
int update = 0;
java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() );
......@@ -2787,6 +2792,62 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
}
}
//changed by sumit on 01/apr/13 to update status of wave_task_det if one line scanned and another line deallocated start.
if("C".equalsIgnoreCase(pickType))
{
sql = "SELECT PICK_ORDER, LINE_NO FROM PICK_ORD_DET WHERE PICK_ORDER = ? " +
" AND (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) > 0 ";
pstmt = conn.prepareStatement(sql);
sql = " SELECT CONFIRMED FROM PICK_ISS_DET PID, PICK_ISS_HDR PIH, PICK_ORD_DET POD WHERE PID.PICK_ORDER = ? " +
" AND PID.LINE_NO__ORD = ? AND PID.PICK_ORDER = POD.PICK_ORDER " +
" AND PID.LINE_NO__ORD = POD.LINE_NO AND PID.PICK_ORDER = PIH.PICK_ORDER ";
pstmt1 = conn.prepareStatement(sql);
pstmt.setString(1, refId);
rs = pstmt.executeQuery();
while(rs.next())
{
pickOrder = rs.getString("PICK_ORDER");
pickLine = rs.getInt("LINE_NO");
System.out.println(" pick_order = ["+pickOrder+"] pickLine ["+pickLine+"]");
pstmt1.setString(1,pickOrder);
pstmt1.setInt(2, pickLine);
rs1 = pstmt1.executeQuery();
if( rs1.next())
{
confirmed = rs1.getString("CONFIRMED");
if( "N".equalsIgnoreCase(confirmed))
{
break;
}
}
rs1.close(); rs1 = null;
pstmt1.clearParameters();
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if(pstmt1 != null)
{
pstmt1.close(); pstmt1 = null;
}
if( "Y".equalsIgnoreCase(confirmed))
{
sql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ? AND STATUS = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
update = pstmt.executeUpdate();
pstmt.close(); pstmt = null;
if(update > 0 )
{
System.out.println(refId+ " WAVE_TASK_DET is updated susessfully ");
}
}
}
//changed by sumit on 01/apr/13 to update status of wave_task_det if one line scanned and another line deallocated end.
}
else if( "REPL".equalsIgnoreCase(task))
......@@ -2829,6 +2890,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
{
pstmt.close(); pstmt = null;
}
if(pstmt1 != null)
{
pstmt1.close(); pstmt1 = null;
}
}
catch(Exception ex)
{
......
webitm-wms/module-resource/metadata/pick_iss_tr11.xml
View file @ 3a4275a5
......@@ -52,7 +52,6 @@
<type size="10">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>tran_id</name>
<dbname>pick_iss_hdr.tran_id</dbname>
</table_column>
......@@ -152,10 +151,15 @@
<name>emp_name</name>
<dbname>emp_name</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;pick_iss_hdr&quot; ) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pick_iss_hdr.tran_id&quot;) COLUMN(NAME=&quot;pick_iss_hdr.tran_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pick_order&quot;) COLUMN(NAME=&quot;pick_iss_hdr.site_code&quot;) COLUMN(NAME=&quot;pick_iss_hdr.confirmed&quot;) COLUMN(NAME=&quot;pick_iss_hdr.conf_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_user&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_term&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pick_type&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pallet_no&quot;) COLUMN(NAME=&quot;pick_iss_hdr.trf_status&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname || &apos; &apos; || employee.emp_mname || &apos; &apos; || employee.emp_lname) as emp_name&quot;) JOIN (LEFT=&quot;pick_iss_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pick_iss_hdr.site_code&quot; ) JOIN (LEFT=&quot;pick_iss_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pick_iss_hdr.emp_code__aprv&quot; )) </retrieve>
<update>PICK_ISS_HDR</update>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;pick_iss_hdr&quot; ) TABLE(NAME=&quot;employee&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;pick_iss_hdr.tran_id&quot;) COLUMN(NAME=&quot;pick_iss_hdr.tran_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pick_order&quot;) COLUMN(NAME=&quot;pick_iss_hdr.site_code&quot;) COLUMN(NAME=&quot;pick_iss_hdr.confirmed&quot;) COLUMN(NAME=&quot;pick_iss_hdr.conf_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_user&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_date&quot;) COLUMN(NAME=&quot;pick_iss_hdr.chg_term&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pick_type&quot;) COLUMN(NAME=&quot;pick_iss_hdr.pallet_no&quot;) COLUMN(NAME=&quot;pick_iss_hdr.trf_status&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname || &apos; &apos; || employee.emp_mname || &apos; &apos; || employee.emp_lname) as emp_name&quot;) JOIN (LEFT=&quot;pick_iss_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; OUTER1 =&quot;pick_iss_hdr.site_code&quot; ) JOIN (LEFT=&quot;pick_iss_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; OUTER1 =&quot;pick_iss_hdr.emp_code__aprv&quot; )WHERE( EXP1 =&quot;~&quot;PICK_ISS_HDR~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:from_date&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;~&quot;PICK_ISS_HDR~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:to_date&quot; ) ) ARG(NAME = &quot;from_date&quot; TYPE = datetime) ARG(NAME = &quot;to_date&quot; TYPE = datetime) </retrieve>
<argument>
<name>from_date</name>
<type>datetime</type>
</argument>
<argument>
<name>to_date</name>
<type>datetime</type>
</argument>
</TableDefinition>
<TextObject>
<band>Header</band>
......@@ -582,7 +586,7 @@
<id>1</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>2</x>
<y>2</y>
......@@ -620,7 +624,7 @@
<id>2</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>100</x>
<y>2</y>
......@@ -658,7 +662,7 @@
<id>3</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>211</x>
<y>2</y>
......@@ -696,7 +700,7 @@
<id>11</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>284</x>
<y>2</y>
......@@ -734,7 +738,7 @@
<id>12</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>357</x>
<y>2</y>
......@@ -772,7 +776,7 @@
<id>4</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>515</x>
<y>2</y>
......@@ -810,7 +814,7 @@
<id>14</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>590</x>
<y>2</y>
......@@ -848,7 +852,7 @@
<id>5</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>698</x>
<y>2</y>
......@@ -886,7 +890,7 @@
<id>6</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>764</x>
<y>2</y>
......@@ -924,7 +928,7 @@
<id>7</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>877</x>
<y>2</y>
......@@ -962,7 +966,7 @@
<id>15</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>1003</x>
<y>2</y>
......@@ -998,7 +1002,7 @@
<id>13</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>1143</x>
<y>2</y>
......@@ -1036,7 +1040,7 @@
<id>8</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>1243</x>
<y>2</y>
......@@ -1074,7 +1078,7 @@
<id>9</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>1316</x>
<y>2</y>
......@@ -1112,7 +1116,7 @@
<id>10</id>
<alignment>2</alignment>
<tabsequence>32766</tabsequence>
<border>0</border>
<border>5</border>
<color>33554432</color>
<x>1433</x>
<y>2</y>
......
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