replace itemcode to gtinCase if it is present in table

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

webitm-wms/ibase/webitm/ejb/wms/AsnPoNumber.java

@@ -109,9 +109,13 @@ public class AsnPoNumber extends ValidatorEJB
 						jsonObject = new 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("item_code",E12GenericUtility.checkNull(itemCode));
+						//Added by vikas Lagad on 1-2-2019[start] replace item_code to gtinCase if gtin_case is not null
+						if( E12GenericUtility.checkNull(gtinCase).length() > 0)
+							jsonObject.put("item_code",E12GenericUtility.checkNull(gtinCase));
+						else
+							jsonObject.put("item_code",E12GenericUtility.checkNull(itemCode));
+						//Added by vikas Lagad on 1-2-2019[End] replace item_code to gtinCase if gtin_case is not null
 						jsonObject.put("item_descr",genericUtility.checkNull(itemDescr));
 						jsonObject.put("asn_no",genericUtility.checkNull(asnNo));
 						jsonObject.put("lot_sl",genericUtility.checkNull(asnNo)+"/"+ (++count));
@@ -303,9 +307,13 @@ public class AsnPoNumber extends ValidatorEJB
 					{
 						jsonObject = new JSONObject();
 						jsonObject.put("site_name",E12GenericUtility.checkNull(siteName));
-						jsonObject.put("gtin_case",E12GenericUtility.checkNull(gtinCase));
 						jsonObject.put("supp_name",E12GenericUtility.checkNull(suppName));
-						jsonObject.put("item_code",E12GenericUtility.checkNull(itemCode));	
+						//Added by vikas Lagad on 1-2-2019[start] replace item_code to gtinCase if gtin_case is not null
+						if( E12GenericUtility.checkNull(gtinCase).length() > 0)
+							jsonObject.put("item_code",E12GenericUtility.checkNull(gtinCase));
+						else
+							jsonObject.put("item_code",E12GenericUtility.checkNull(itemCode));
+						//Added by vikas Lagad on 1-2-2019[End] replace item_code to gtinCase if gtin_case is not null
 						jsonObject.put("item_descr",E12GenericUtility.checkNull(itemDescr));
 						jsonObject.put("asn_no",E12GenericUtility.checkNull(asnNo));
 						jsonObject.put("lot_sl",E12GenericUtility.checkNull(asnNo)+"/"+ (++count));

webitm-wms/ibase/webitm/ejb/wms/NearExpiryPrc.java

@@ -693,7 +693,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
 			java.sql.Timestamp expDateCalc = null;
 			java.sql.Timestamp expDateStock = null;
 
-			insertSql = "INSERT INTO STOCK_TRANSFER(TRAN_ID, TRAN_DATE, SITE_CODE, REF_SER__FOR, CONFIRMED, CHG_DATE, CHG_TERM, CHG_USER, SITE_CODE__FR, SITE_CODE__TO, REAS_CODE) VALUES(?,?,?,?,?,?,?,?,?,?,?)";
+			insertSql = "INSERT INTO STOCK_TRANSFER(TRAN_ID, TRAN_DATE, SITE_CODE, REF_SER__FOR, CONFIRMED, CHG_DATE, CHG_TERM, CHG_USER, REAS_CODE) VALUES(?,?,?,?,?,?,?,?,?)";//Changes By Vikas L on 1-2-2019
 			pstmtHdr = conn.prepareStatement(insertSql);
 
 			insertSql = "INSERT INTO STOCK_TRANSFER_DET(TRAN_ID, LINE_NO, ITEM_CODE, QUANTITY, LOC_CODE__FR, LOC_CODE__TO, LOT_NO__FR, LOT_NO__TO, LOT_SL__FR, LOT_SL__TO, ACCT_CODE__CR, ACCT_CODE__DR, CCTR_CODE__DR, CCTR_CODE__CR, NO_ART) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -716,9 +716,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
 			pstmtHdr.setTimestamp( 6, currDate );
 			pstmtHdr.setString( 7, chgTerm );
 			pstmtHdr.setString( 8, userId );
-			pstmtHdr.setString( 9, siteCode );
-			pstmtHdr.setString( 10, siteCode );
-			pstmtHdr.setString( 11, defReasCode );
+			pstmtHdr.setString( 9, defReasCode );
 			updCnt = pstmtHdr.executeUpdate();
 			pstmtHdr.close();
 			pstmtHdr = null;