Skip to content

B
business-java
Commit cf1cd998 authored by vlagad's avatar vlagad
Browse files
Options

Changes done to add site_desc, gtin_case no in QR code. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196502 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d32a4528
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 35 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnPoNumber.java
View file @ cf1cd998
...@@ -4,6 +4,8 @@ import java.sql.Connection; ...@@ -4,6 +4,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import org.json.JSONObject; import org.json.JSONObject;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
...@@ -31,12 +33,13 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -31,12 +33,13 @@ public class AsnPoNumber extends ValidatorEJB
ResultSet rs = null; ResultSet rs = null;
String transDB = userInfoBean.getTransDB(); String transDB = userInfoBean.getTransDB();
//Added by Vikas on 31-1-2019 For QR code related changes[start]
String sqlStr = "SELECT TRAN_ID,SUPP_CODE FROM ASN_HDR WHERE ASN_NO = ?"; String sqlStr = "SELECT TRAN_ID,SUPP_CODE,SITE_CODE FROM ASN_HDR WHERE ASN_NO = ?";
String sqlQuery = "SELECT * FROM ASN_DET WHERE TRAN_ID = ?"; String sqlQuery = "SELECT * FROM ASN_DET WHERE TRAN_ID = ?";
String tranId = "",suppCode = "",suppName = ""; String tranId = "",suppCode = "",suppName = "",siteCode="",siteName="";
String itemCode = "",quantity ="",lotNo = "",lpnNo = "",noArt = "",packSize =""; String itemCode = "",quantity ="",lotNo = "",lpnNo = "",noArt = "",packSize ="";
String itemDescr = ""; String itemDescr = "",gtinCase="";
String itemInfo[];
JSONObject jsonObject = null; JSONObject jsonObject = null;
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
...@@ -52,8 +55,9 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -52,8 +55,9 @@ public class AsnPoNumber extends ValidatorEJB
{ {
tranId = rs.getString("TRAN_ID"); tranId = rs.getString("TRAN_ID");
suppCode = rs.getString("SUPP_CODE"); suppCode = rs.getString("SUPP_CODE");
siteCode = rs.getString("SITE_CODE");
suppName = getSuppName(conn,pstmt,rs,suppCode); suppName = getSuppName(conn,pstmt,rs,suppCode);
siteName = getSiteName(conn,pstmt,rs,siteCode);
} }
if(rs != null) if(rs != null)
{ {
...@@ -82,9 +86,12 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -82,9 +86,12 @@ public class AsnPoNumber extends ValidatorEJB
lotNo = rs.getString("LOT_NO"); lotNo = rs.getString("LOT_NO");
lpnNo = rs.getString("LPN_NO"); lpnNo = rs.getString("LPN_NO");
noArt = rs.getString("NO_ART"); noArt = rs.getString("NO_ART");
itemDescr = getItemDescr(conn,pstmt,rs,itemCode); String getItemInfo = getItemDescr(conn,pstmt,rs,itemCode);
System.out.println("##### ItemCode : ["+itemCode+"] Quantity ["+quantity+"] PackSize ["+packSize+"] LotNo ["+lotNo); itemInfo= getItemInfo.split("~");
System.out.println("##### LpnNo ["+lpnNo+"] NoArt ["+noArt+"] ItemDescr ["+itemDescr); itemDescr=itemInfo[0];
gtinCase=itemInfo[1];
System.out.println("##### ItemCode : ["+itemCode+"] Quantity ["+quantity+"] PackSize ["+packSize+"] LotNo ["+lotNo+"]");
System.out.println("##### LpnNo ["+lpnNo+"] NoArt ["+noArt+"] ItemDescr ["+itemDescr+"] gtinCase ["+gtinCase+"]");
if(noArt == null) if(noArt == null)
{ {
noArt = "1"; noArt = "1";
...@@ -101,20 +108,25 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -101,20 +108,25 @@ public class AsnPoNumber extends ValidatorEJB
{ {
jsonObject = new JSONObject(); jsonObject = new JSONObject();
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
jsonObject.put("site_name",E12GenericUtility.checkNull(siteName));
jsonObject.put("gtin_case",E12GenericUtility.checkNull(gtinCase));
jsonObject.put("supp_name",genericUtility.checkNull(suppName)); jsonObject.put("supp_name",genericUtility.checkNull(suppName));
jsonObject.put("item_code",genericUtility.checkNull(itemCode));
if( !gtinCase.equals(null))
jsonObject.put("item_code",E12GenericUtility.checkNull(gtinCase));
else
jsonObject.put("item_code",E12GenericUtility.checkNull(itemCode));
jsonObject.put("item_descr",genericUtility.checkNull(itemDescr)); jsonObject.put("item_descr",genericUtility.checkNull(itemDescr));
jsonObject.put("asn_no",genericUtility.checkNull(asnNo)); jsonObject.put("asn_no",genericUtility.checkNull(asnNo));
jsonObject.put("lot_sl",genericUtility.checkNull(asnNo)+"_"+ (++count)); jsonObject.put("lot_sl",genericUtility.checkNull(asnNo)+"/"+ (++count));
jsonObject.put("lpn_no",genericUtility.checkNull(asnNo)+"/"+ (count));
jsonObject.put("quantity",genericUtility.checkNull(""+noOfLotSl)); jsonObject.put("quantity",genericUtility.checkNull(""+noOfLotSl));
jsonObject.put("part_qty",genericUtility.checkNull(""+0)); jsonObject.put("part_qty",genericUtility.checkNull(""+0));
jsonObject.put("no_art",genericUtility.checkNull(noArt)); jsonObject.put("no_art",genericUtility.checkNull("1"));
jsonObject.put("lot_no",genericUtility.checkNull(lotNo)); jsonObject.put("lot_no",genericUtility.checkNull(lotNo));
} }
} }
} }
...@@ -177,8 +189,8 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -177,8 +189,8 @@ public class AsnPoNumber extends ValidatorEJB
private String getItemDescr(Connection conn, PreparedStatement pstmt, ResultSet rs, String itemCode) private String getItemDescr(Connection conn, PreparedStatement pstmt, ResultSet rs, String itemCode)
{ {
String descr = ""; String descr = "",gtinCase="";
String sqlQuery = "SELECT DESCR FROM ITEM WHERE ITEM_CODE = ?"; String sqlQuery = "SELECT GTIN_CASE, DESCR FROM ITEM WHERE ITEM_CODE = ?";
try try
{ {
pstmt = conn.prepareStatement(sqlQuery); pstmt = conn.prepareStatement(sqlQuery);
...@@ -187,6 +199,7 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -187,6 +199,7 @@ public class AsnPoNumber extends ValidatorEJB
while(rs.next()) while(rs.next())
{ {
descr = rs.getString("DESCR"); descr = rs.getString("DESCR");
gtinCase=rs.getString("GTIN_CASE");
} }
if(rs != null) if(rs != null)
{ {
...@@ -205,7 +218,7 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -205,7 +218,7 @@ public class AsnPoNumber extends ValidatorEJB
e.printStackTrace(); e.printStackTrace();
} }
System.out.println("##### ITEM DESCR "+descr); System.out.println("##### ITEM DESCR "+descr);
return descr; return descr +"~"+gtinCase;
} }
//Added by Vikas L on 10-1-19 For Regerating QR code [start] //Added by Vikas L on 10-1-19 For Regerating QR code [start]
...@@ -219,11 +232,12 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -219,11 +232,12 @@ public class AsnPoNumber extends ValidatorEJB
String transDB = userInfoBean.getTransDB(); String transDB = userInfoBean.getTransDB();
String sqlStr = "SELECT TRAN_ID,SUPP_CODE FROM ASN_HDR WHERE ASN_NO = ?"; String sqlStr = "SELECT TRAN_ID,SUPP_CODE,SITE_CODE FROM ASN_HDR WHERE ASN_NO = ?";
String sqlQuery = "SELECT * FROM ASN_DET WHERE TRAN_ID = ? and ITEM_CODE = ?"; String sqlQuery = "SELECT * FROM ASN_DET WHERE TRAN_ID = ? and ITEM_CODE = ?";
String tranId = "",suppCode = "",suppName = "",noOfPallet=""; String tranId = "",suppCode = "",suppName = "",noOfPallet="",siteCode="",siteName="",gtinCase="";
String itemCode = "",quantity ="",lotNo = "",lpnNo = "",noArt = "",packSize =""; String itemCode = "",quantity ="",lotNo = "",lpnNo = "",noArt = "",packSize ="";
String itemDescr = ""; String itemDescr = "";
String itemInfo[];
int reqQrCode=Integer.parseInt(noOfQr); int reqQrCode=Integer.parseInt(noOfQr);
System.out.println(">>>>>> reqQrCode :"+reqQrCode); System.out.println(">>>>>> reqQrCode :"+reqQrCode);
...@@ -241,7 +255,9 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -241,7 +255,9 @@ public class AsnPoNumber extends ValidatorEJB
{ {
tranId = rs.getString("TRAN_ID"); tranId = rs.getString("TRAN_ID");
suppCode = rs.getString("SUPP_CODE"); suppCode = rs.getString("SUPP_CODE");
siteCode=rs.getString("SITE_CODE");
suppName = getSuppName(conn,pstmt,rs,suppCode); suppName = getSuppName(conn,pstmt,rs,suppCode);
siteName = getSiteName(conn,pstmt,rs,siteCode);
} }
if(rs != null) if(rs != null)
{ {
...@@ -263,7 +279,6 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -263,7 +279,6 @@ public class AsnPoNumber extends ValidatorEJB
pstmt.setString(2, itemCode1); pstmt.setString(2, itemCode1);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while( rs.next()) while( rs.next())
{ {
itemCode = rs.getString("ITEM_CODE"); itemCode = rs.getString("ITEM_CODE");
...@@ -273,9 +288,12 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -273,9 +288,12 @@ public class AsnPoNumber extends ValidatorEJB
lpnNo = rs.getString("LPN_NO"); lpnNo = rs.getString("LPN_NO");
noArt = rs.getString("NO_ART"); noArt = rs.getString("NO_ART");
noOfPallet=rs.getString("NO_PALLET"); noOfPallet=rs.getString("NO_PALLET");
itemDescr = getItemDescr(conn,pstmt,rs,itemCode); String getItemInfo = getItemDescr(conn,pstmt,rs,itemCode);
System.out.println("##### ItemCode : ["+itemCode+"] Quantity ["+quantity+"] PackSize ["+packSize+"] LotNo ["+lotNo); itemInfo= getItemInfo.split("~");
System.out.println("##### LpnNo ["+lpnNo+"] NoArt ["+noArt+"] ItemDescr ["+itemDescr); itemDescr=itemInfo[0];
gtinCase=itemInfo[1];
System.out.println(">>>>>> ItemCode : ["+itemCode+"] Quantity ["+quantity+"] PackSize ["+packSize+"] LotNo ["+lotNo);
System.out.println(">>>>>> LpnNo ["+lpnNo+"] NoArt ["+noArt+"] ItemDescr ["+itemDescr);
if(noArt == null) if(noArt == null)
{ {
noArt = "1"; noArt = "1";
...@@ -285,23 +303,28 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -285,23 +303,28 @@ public class AsnPoNumber extends ValidatorEJB
{ {
noOfLotSl = Integer.parseInt(quantity)/Integer.parseInt(noArt); noOfLotSl = Integer.parseInt(quantity)/Integer.parseInt(noArt);
} }
System.out.println("###### noOfLotSl "+noOfLotSl);
int count = Integer.parseInt(noOfPallet); int count = Integer.parseInt(noOfPallet);
System.out.println(">>>>>>Count "+count);
for(int i = 0 ; i< reqQrCode;i++) for(int i = 0 ; i< reqQrCode;i++)
{ {
jsonObject = new JSONObject(); jsonObject = new JSONObject();
jsonObject.put("supp_name",genericUtility.checkNull(suppName)); jsonObject.put("site_name",E12GenericUtility.checkNull(siteName));
jsonObject.put("item_code",genericUtility.checkNull(itemCode)); jsonObject.put("gtin_case",E12GenericUtility.checkNull(gtinCase));
jsonObject.put("item_descr",genericUtility.checkNull(itemDescr)); jsonObject.put("supp_name",E12GenericUtility.checkNull(suppName));
jsonObject.put("asn_no",genericUtility.checkNull(asnNo));
jsonObject.put("lot_sl",genericUtility.checkNull(asnNo)+"_"+ (++count)); if( !gtinCase.equals(null))
jsonObject.put("quantity",genericUtility.checkNull(""+noOfLotSl)); jsonObject.put("item_code",E12GenericUtility.checkNull(gtinCase));
jsonObject.put("part_qty",genericUtility.checkNull(""+0)); else
jsonObject.put("no_art",genericUtility.checkNull(noArt)); jsonObject.put("item_code",E12GenericUtility.checkNull(itemCode));
jsonObject.put("lot_no",genericUtility.checkNull(lotNo));
jsonObject.put("item_descr",E12GenericUtility.checkNull(itemDescr));
jsonObject.put("asn_no",E12GenericUtility.checkNull(asnNo));
jsonObject.put("lot_sl",E12GenericUtility.checkNull(asnNo)+"/"+ (++count));
jsonObject.put("lpn_no",E12GenericUtility.checkNull(asnNo)+"/"+ (count));
jsonObject.put("quantity",E12GenericUtility.checkNull(""+noOfLotSl));
jsonObject.put("part_qty",E12GenericUtility.checkNull(""+0));
jsonObject.put("no_art",E12GenericUtility.checkNull(noArt));
jsonObject.put("lot_no",E12GenericUtility.checkNull(lotNo));
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
} }
} }
} }
...@@ -330,4 +353,39 @@ public class AsnPoNumber extends ValidatorEJB ...@@ -330,4 +353,39 @@ public class AsnPoNumber extends ValidatorEJB
} }
//Added by Vikas L on 10-1-19 For Regerating QR code [start] //Added by Vikas L on 10-1-19 For Regerating QR code [start]
private String getSiteName(Connection conn, PreparedStatement pstmt, ResultSet rs, String siteCode) {
System.out.println("##### SITE_CODE "+siteCode);
String siteName = "";
String sqlQuery = "SELECT DESCR FROM SITE WHERE SITE_CODE = ?";
try
{
pstmt = conn.prepareStatement(sqlQuery);
pstmt.setString(1, siteCode.trim());
rs = pstmt.executeQuery();
while(rs.next())
{
siteName = rs.getString("DESCR");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch (SQLException e)
{
e.printStackTrace();
}
System.out.println("##### SITE_NAME "+siteName);
return siteName;
}
//Added by Vikas L on 31-1-19 For QR code related changes [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