Skip to content

B
business-java
Commit 9dfb7bdb authored by arawankar's avatar arawankar
Browse files
Options

Update Item Master related changes 

1. Added validation to check whether the unit is same or not, if transaction is open in edit mode
2. Changed itemchange sql for site_code,owner_site_code and shipping site_code

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@181660 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5442ca53
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 7 deletions
webitm-dis/ibase/webitm/ejb/dis/ItemIC.java
View file @ 9dfb7bdb
...@@ -264,9 +264,11 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -264,9 +264,11 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
} }
else else
{ {
if(childNodeValue != null && childNodeValue.trim().length() > 0) //Modified by Anjali R. on[08/03/2018][To check unit is same when edit any transaction][Start]
if(childNodeValue != null && childNodeValue.trim().length() > 0 && !"A".equalsIgnoreCase(editFlag) )
//if(childNodeValue != null && childNodeValue.trim().length() > 0)
{ {
sql = "select count(1) from stock where item_code = ? and unit = ?"; /*sql = "select count(1) from stock where item_code = ? and unit = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, item_code); pstmt.setString(1, item_code);
pstmt.setString(2, childNodeValue); pstmt.setString(2, childNodeValue);
...@@ -283,8 +285,33 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -283,8 +285,33 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
errCode = "VTSTKITM "; errCode = "VTSTKITM ";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/
String orgUnit = "";
System.out.println("item_code ----["+item_code+"] childNodeValue---["+childNodeValue+"]");
sql = "select unit from item where item_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, item_code);
rs = pstmt.executeQuery();
if (rs.next())
{
orgUnit = rs.getString("unit").trim();
System.out.println("orgUnit----["+orgUnit+"]");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("orgUnit---------["+orgUnit+"]new unit--------["+childNodeValue+"]");
if(orgUnit != null && orgUnit.trim().length() > 0 && !orgUnit.equalsIgnoreCase(childNodeValue))
{
System.out.println("--------------------- Inside VTSTKITM -----------------");
errCode = "VTEXITEM";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
} }
} }
//Modified by Anjali R. on[08/03/2018][To check unit is same when edit any transaction][End]
} }
// Changed By Nasruddin [19-sep-16] END // Changed By Nasruddin [19-sep-16] END
/* Comment By Nasruddin [19-sep-16] StART /* Comment By Nasruddin [19-sep-16] StART
...@@ -1807,7 +1834,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1807,7 +1834,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
System.out.println("siteCode:: " + siteCode); System.out.println("siteCode:: " + siteCode);
sql = "select descr from from site where site_code = ?"; //Modified by Anjali R. on[08/03/2018][Seems written wrong query][Start]
//sql = "select descr from from site where site_code = ?";
sql = "select descr from site where site_code = ?";
//Modified by Anjali R. on[08/03/2018][Seems written wrong query][End]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1825,7 +1855,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1825,7 +1855,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
System.out.println("siteCodeOwn:: " + siteCodeOwn); System.out.println("siteCodeOwn:: " + siteCodeOwn);
sql = "select descr from from site where site_code = ?"; //Modified by Anjali R. on[08/03/2018][Seems written wrong query][Start]
//sql = "select descr from from site where site_code = ?";
sql = "select descr from site where site_code = ?";
//Modified by Anjali R. on[08/03/2018][Seems written wrong query][End]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeOwn); pstmt.setString(1, siteCodeOwn);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1904,7 +1937,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1904,7 +1937,10 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
System.out.println("siteCodeShip:: " + siteCodeShip); System.out.println("siteCodeShip:: " + siteCodeShip);
sql = "select descr from from site where site_code = ?"; //Modified by Anjali R. on[08/03/2018][Seems written wrong query][Start]
//sql = "select descr from from site where site_code = ?";
sql = "select descr from site where site_code = ?";
//Modified by Anjali R. on[08/03/2018][Seems written wrong query][End]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeShip); pstmt.setString(1, siteCodeShip);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
......
webitm-dis/module-resource/sql/messages.sql
View file @ 9dfb7bdb
...@@ -40,3 +40,9 @@ insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E ...@@ -40,3 +40,9 @@ insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
--pricelist generation-- --pricelist generation--
insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,chg_date,chg_user,chg_term,override_input,mail_option) values ('VTCIRCUNL','Circular number null','Circular Number cannot be blank','E',null,null,null,null,to_timestamp('26-NOV-13','DD-MON-RR HH.MI.SSXFF AM'),'M ','m ',null,null); insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,chg_date,chg_user,chg_term,override_input,mail_option) values ('VTCIRCUNL','Circular number null','Circular Number cannot be blank','E',null,null,null,null,to_timestamp('26-NOV-13','DD-MON-RR HH.MI.SSXFF AM'),'M ','m ',null,null);
insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,chg_date,chg_user,chg_term,override_input,mail_option) values ('VTCIRCOUNL','Circular number old null','Circular Number old cannot be blank','E',null,null,null,null,to_timestamp('26-NOV-13','DD-MON-RR HH.MI.SSXFF AM'),'M ','m ',null,null); insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,chg_date,chg_user,chg_term,override_input,mail_option) values ('VTCIRCOUNL','Circular number old null','Circular Number old cannot be blank','E',null,null,null,null,to_timestamp('26-NOV-13','DD-MON-RR HH.MI.SSXFF AM'),'M ','m ',null,null);
--Item Master --[Added by Anjali R. on [08/03/2018][To validate the unit]]
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION)
values ('VTEXITEM','Invalid Unit for item','Unit can not be changed','E',null,null,null,null,sysdate,'base','base',null,null);
......
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