Skip to content

B
business-java
Commit c59b19fc authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 22/10/13 updated ShipmentPrs for club ptcn created by... 

changed by sankara on 22/10/13 updated ShipmentPrs for club ptcn created by another shipment and shipment21 srd metadata


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93807 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 560d251a
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 15 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrs.java
View file @ c59b19fc
...@@ -74,7 +74,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -74,7 +74,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
HashMap newPtcnAndNewConsingnee = new HashMap(); HashMap newPtcnAndNewConsingnee = new HashMap();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
Set keyset = new HashSet();
try try
{ {
conn.setAutoCommit(false); conn.setAutoCommit(false);
...@@ -159,7 +160,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -159,7 +160,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn); newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);
System.out.println(" ptcnAndConsingnee "+ptcnAndConsingnee); System.out.println(" ptcnAndConsingnee "+ptcnAndConsingnee);
System.out.println(" newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee); System.out.println(" newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);
//chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
keyset = newPtcnAndNewConsingnee.keySet();
System.out.println("keysetsize--->"+keyset.size());
Iterator iterator = ptcnAndConsingnee.keySet().iterator(); Iterator iterator = ptcnAndConsingnee.keySet().iterator();
while(iterator.hasNext()) while(iterator.hasNext())
{ {
...@@ -173,7 +176,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -173,7 +176,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
//changed by sankara on 15/10/13 for clubing multiple ptcn start. //changed by sankara on 15/10/13 for clubing multiple ptcn start.
/*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn); /*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString; */ return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0) //chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
//if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0 && keyset.size() != 0 )
{ {
System.out.println("all ptcns in one wave"); System.out.println("all ptcns in one wave");
errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn); errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
...@@ -211,7 +216,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -211,7 +216,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
//changed by sankara on 15/10/13 for clubing multiple ptcn start. //changed by sankara on 15/10/13 for clubing multiple ptcn start.
/*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn); /*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString; */ return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0) //chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
//if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0 && keyset.size() != 0 )
{ {
System.out.println("all ptcns in diff wave"); System.out.println("all ptcns in diff wave");
errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn); errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
...@@ -236,7 +243,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -236,7 +243,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
/* errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn); /* errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn);
System.out.println(" errString -->["+errString+"]"); System.out.println(" errString -->["+errString+"]");
return errString; */ return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0) //chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
//if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0 && keyset.size() != 0 )
{ {
System.out.println("inside checking"); System.out.println("inside checking");
errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn); errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn);
...@@ -626,7 +635,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -626,7 +635,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
" TRANSPORTER T WHERE C.CUST_CODE = D.CUST_CODE__DLV " + " TRANSPORTER T WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
" AND T.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " + " AND T.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " +
" WTD.PTCN NOT IN ('"+inputString+"') AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " + " WTD.PTCN NOT IN ('"+inputString+"') AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " +
" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )"; //changed by sankara on 21/10/13 for getting unconfirmed ptcn
//" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') ) AND D.CONFIRMED = 'N' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -641,7 +652,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm ...@@ -641,7 +652,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
+" AND CASE WHEN T.SERVICE_CODE IS NULL THEN '0' ELSE T.SERVICE_CODE END IN " +" AND CASE WHEN T.SERVICE_CODE IS NULL THEN '0' ELSE T.SERVICE_CODE END IN "
+" (SELECT CASE WHEN T.SERVICE_CODE IS NULL THEN '0' ELSE T.SERVICE_CODE END FROM TRANSPORTER T, DESPATCH D," +" (SELECT CASE WHEN T.SERVICE_CODE IS NULL THEN '0' ELSE T.SERVICE_CODE END FROM TRANSPORTER T, DESPATCH D,"
+" WAVE_TASK_DET WTD WHERE T.TRAN_CODE = D.TRAN_CODE AND D.WAVE_ID = WTD.WAVE_ID AND" +" WAVE_TASK_DET WTD WHERE T.TRAN_CODE = D.TRAN_CODE AND D.WAVE_ID = WTD.WAVE_ID AND"
+" D.DESP_ID = WTD.REF_ID AND WTD.PTCN IN ('"+inputString+"'))"; //changed by sankara on 21/10/13 for getting unconfirmed ptcn
//+" D.DESP_ID = WTD.REF_ID AND WTD.PTCN IN ('"+inputString+"'))";
+" D.DESP_ID = WTD.REF_ID AND WTD.PTCN IN ('"+inputString+"')) AND D.CONFIRMED = 'N' ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
......
webitm-wms/module-resource/metadata/shipment21.xml
View file @ c59b19fc
...@@ -3548,8 +3548,8 @@ ...@@ -3548,8 +3548,8 @@
<text>Net Weight:</text> <text>Net Weight:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>389</x> <x>388</x>
<y>537</y> <y>536</y>
<height>16</height> <height>16</height>
<width>68</width> <width>68</width>
<html> <html>
...@@ -3576,7 +3576,7 @@ ...@@ -3576,7 +3576,7 @@
<text>Tare Weight:</text> <text>Tare Weight:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>211</x> <x>210</x>
<y>537</y> <y>537</y>
<height>16</height> <height>16</height>
<width>76</width> <width>76</width>
...@@ -4618,10 +4618,10 @@ ...@@ -4618,10 +4618,10 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Pallet No :</text> <text>No of Pallet :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>211</x> <x>210</x>
<y>563</y> <y>563</y>
<height>16</height> <height>16</height>
<width>76</width> <width>76</width>
......
webitm-wms/module-resource/srd/d_shipment_edit.srd
View file @ c59b19fc
...@@ -170,8 +170,8 @@ text(band=detail alignment="1" text="Package Description:" border="0" color="0" ...@@ -170,8 +170,8 @@ text(band=detail alignment="1" text="Package Description:" border="0" color="0"
text(band=detail alignment="1" text="Gross Weight:" border="0" color="0" x="26" y="537" height="16" width="81" html.valueishtml="0" name=gross_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" ) text(band=detail alignment="1" text="Gross Weight:" border="0" color="0" x="26" y="537" height="16" width="81" html.valueishtml="0" name=gross_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
column(band=detail id=48 alignment="1" tabsequence=310 border="5" color="0" x="290" y="537" height="16" width="91" format="0.000" html.valueishtml="0" name=tare_weight visible="1" edit.limit=14 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=48 alignment="1" tabsequence=310 border="5" color="0" x="290" y="537" height="16" width="91" format="0.000" html.valueishtml="0" name=tare_weight visible="1" edit.limit=14 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=54 alignment="1" tabsequence=32766 border="5" color="255" x="460" y="536" height="16" width="82" format="[general]" html.valueishtml="0" name=net_amt visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) column(band=detail id=54 alignment="1" tabsequence=32766 border="5" color="255" x="460" y="536" height="16" width="82" format="[general]" html.valueishtml="0" name=net_amt visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="0" text="Net Weight:" border="0" color="0" x="389" y="537" height="16" width="68" html.valueishtml="0" name=net_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" ) text(band=detail alignment="0" text="Net Weight:" border="0" color="0" x="388" y="536" height="16" width="68" html.valueishtml="0" name=net_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="79741120" )
text(band=detail alignment="1" text="Tare Weight:" border="0" color="0" x="211" y="537" height="16" width="76" html.valueishtml="0" name=tare_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) text(band=detail alignment="1" text="Tare Weight:" border="0" color="0" x="210" y="537" height="16" width="76" html.valueishtml="0" name=tare_weight_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
column(band=detail id=47 alignment="1" tabsequence=300 border="5" color="0" x="111" y="537" height="16" width="95" format="0.000" html.valueishtml="0" name=gross_weight visible="1" edit.limit=14 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=47 alignment="1" tabsequence=300 border="5" color="0" x="111" y="537" height="16" width="95" format="0.000" html.valueishtml="0" name=gross_weight visible="1" edit.limit=14 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=45 alignment="0" tabsequence=440 border="0" color="0" x="489" y="736" height="1" width="1" format="[general]" html.valueishtml="0" name=gencode_descr visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=45 alignment="0" tabsequence=440 border="0" color="0" x="489" y="736" height="1" width="1" format="[general]" html.valueishtml="0" name=gencode_descr visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=49 alignment="0" tabsequence=370 border="5" color="0" x="108" y="614" height="16" width="434" format="[general]" html.valueishtml="0" name=remarks visible="1" edit.limit=200 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=49 alignment="0" tabsequence=370 border="5" color="0" x="108" y="614" height="16" width="434" format="[general]" html.valueishtml="0" name=remarks visible="1" edit.limit=200 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
...@@ -203,7 +203,7 @@ text(band=detail alignment="1" text="No of Article:" border="0" color="0" x="28" ...@@ -203,7 +203,7 @@ text(band=detail alignment="1" text="No of Article:" border="0" color="0" x="28"
column(band=detail id=63 alignment="1" tabsequence=330 border="5" color="0" x="290" y="563" height="16" width="91" format="[general]" html.valueishtml="0" name=no_pallet visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=63 alignment="1" tabsequence=330 border="5" color="0" x="290" y="563" height="16" width="91" format="[general]" html.valueishtml="0" name=no_pallet visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=72 alignment="1" tabsequence=340 border="5" color="0" x="463" y="563" height="16" width="79" format="########0.00" html.valueishtml="0" name=unit_value visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=72 alignment="1" tabsequence=340 border="5" color="0" x="463" y="563" height="16" width="79" format="########0.00" html.valueishtml="0" name=unit_value visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=detail alignment="1" text="Unit Value :" border="0" color="0" x="389" y="563" height="16" width="68" html.valueishtml="0" name=unit_value_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) text(band=detail alignment="1" text="Unit Value :" border="0" color="0" x="389" y="563" height="16" width="68" html.valueishtml="0" name=unit_value_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
text(band=detail alignment="1" text="Pallet No :" border="0" color="0" x="211" y="563" height="16" width="76" html.valueishtml="0" name=no_pallet_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" ) text(band=detail alignment="1" text="No of Pallet :" border="0" color="0" x="210" y="563" height="16" width="76" html.valueishtml="0" name=no_pallet_t visible="1" font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
column(band=detail id=62 alignment="1" tabsequence=320 border="5" color="0" x="109" y="563" height="16" width="95" format="0.000" html.valueishtml="0" name=no_art visible="1" edit.limit=6 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=62 alignment="1" tabsequence=320 border="5" color="0" x="109" y="563" height="16" width="95" format="0.000" html.valueishtml="0" name=no_art visible="1" edit.limit=6 edit.case=any edit.format="#########0.000" edit.focusrectangle=no edit.autoselect=no edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=71 alignment="0" tabsequence=290 border="5" color="0" x="146" y="514" height="16" width="398" format="[general]" html.valueishtml="0" name=pkg_descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=71 alignment="0" tabsequence=290 border="5" color="0" x="146" y="514" height="16" width="398" format="[general]" html.valueishtml="0" name=pkg_descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=73 alignment="0" tabsequence=280 border="5" color="0" x="146" y="489" height="16" width="398" format="[general]" html.valueishtml="0" name=item_descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" ) column(band=detail id=73 alignment="0" tabsequence=280 border="5" color="0" x="146" y="489" height="16" width="398" format="[general]" html.valueishtml="0" name=item_descr visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
......
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