SITE STAN PAYTBL DD.SQL IS MERGED,Bugresolved in Shiftprocess when shift is...

SITE STAN PAYTBL DD.SQL IS MERGED,Bugresolved in Shiftprocess when shift is processed on confirmation of employee events


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93091 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/ibase/webitm/ejb/adm/ShiftProcess.java

@@ -434,11 +434,21 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
 					holTblno = empInfo.holTblno;
 					java.sql.Date frSqlDate1 = null;
 					frSqlDate1 = empInfo.fromDt;
+					// Modified by Prashant on [16/05/2013][Request Id :][To resolve the issue of processing shift pattern on employee events confirmation issue raised by Pinakin. Pattern change is only allowed from employee events only][Start]
+					/*
 					if( frSqlDate1 != null )
 					{
 						frSqlDate = frSqlDate1;
 					}
-
+					*/
+					if(patternCodeFilt == null || patternCodeFilt.trim().length() == 0)
+					{
+						if( frSqlDate1 != null )
+						{
+							frSqlDate = frSqlDate1;
+						}
+					}
+					// Modified by Prashant on [16/05/2013][Request Id :][To resolve the issue of processing shift pattern employee events process raised by Pinakin][End]
 					//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Not to generate shift beyond relieve date of employee][Start]
 					String updateSql = "";
 					PreparedStatement pstmtTemp = null;

webitm-adm/module-resource/SQL/SITE_STAN_PAYTBL_DD.SQL

+INSERT INTO pbcattbl( pbt_tnam, pbt_ownr, pbd_fhgt, pbd_fwgt, pbd_fitl, pbd_funl, pbd_fchr, pbd_fptc, pbd_ffce, pbh_fhgt, pbh_fwgt, pbh_fitl, pbh_funl, pbh_fchr, pbh_fptc, pbh_ffce, pbl_fhgt, pbl_fwgt, pbl_fitl, pbl_funl, pbl_fchr, pbl_fptc, pbl_ffce, pbt_cmnt) VALUES ('SITE_STAN_PAYTBL', 'STD', -10, 400, 'N', 'N', 0, 34, 'Arial', -10, 400, 'N', 'N', 0, 34, 'Arial', -10, 400, 'N', 'N', 0, 34, 'Arial', 'Master: site_stan_paytbl,Hold details of site,state and station wise pay table mapping') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'SITE_CODE', 'site_code', 23, 'site_code', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'Site code of the site for which pay table is to be mapped. Validated from site master.') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'STATE_CODE', 'state_code', 23, 'state_code', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'State code of the state for which pay table is to be mapped. Validated from state master.') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'STAN_CODE', 'stan_code', 23, 'stan_code', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'Station code of the station for which pay table is to be mapped. Validated from station master.') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'PAY_TABLE', 'pay_table', 23, 'pay_table', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'Pay table mapped for the combination of site,state and station. Validated from pay table master.') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'CHG_DATE', 'chg_date', 23, 'chg_date', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'Date when the detail has been last modified or added,internally updated by system') ;
+INSERT INTO pbcatcol( pbc_tnam, pbc_ownr, pbc_cnam, pbc_labl, pbc_lpos, pbc_hdr, pbc_hpos, pbc_jtfy, pbc_mask, pbc_case, pbc_hght, pbc_wdth, pbc_ptrn, pbc_bmap, pbc_init, pbc_edit, pbc_cmnt )VALUES ('SITE_STAN_PAYTBL', 'STD', 'CHG_USER', 'chg_user', 23, 'chg_user', 25, 25, '', 0, 0, 0, '', 'N', '', '', 'User who has last modified the detail or added, internally updated by system') ;;
+COMMIT WORK ;