New method for mfg_date and exp_date calculation added

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

webitm-mfg/ibase/webitm/ejb/mfg/MfgCommon.java

@@ -230,6 +230,7 @@ public class MfgCommon {
 				tranType = rs.getString("ORDER_TYPE");
 				lotNoIssue = rs.getString("LOT_NO__ISSUE");
 				relDate = rs.getTimestamp("REL_DATE");
+				
 				itemCode = rs.getString("ITEM_CODE");
 				lotNo = rs.getString("LOT_NO");
 				tranDate = rs.getTimestamp("ORD_DATE");
@@ -240,6 +241,7 @@ public class MfgCommon {
 			rs = null;
 			pstmt.close();
 			pstmt = null;
+			tranType = tranType.trim();
 			if (relDate == null)
 			{
 				relDate = new java.sql.Timestamp(System.currentTimeMillis()) ;
@@ -305,7 +307,7 @@ public class MfgCommon {
 			}
 			sql= "SELECT COUNT(1) FROM STOCK "
 				+ " WHERE ITEM_CODE = ? "
-				+ " AND SITE_CODE - ? "
+				+ " AND SITE_CODE = ? "
 				+ " AND LOT_NO = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode);
@@ -325,7 +327,7 @@ public class MfgCommon {
 			{
 				sql= "SELECT MIN(MFG_DATE) AS MFG_DATE, MIN(EXP_DATE) AS EXP_DATE FROM STOCK "
 				+ " WHERE ITEM_CODE = ? "
-				+ " AND SITE_CODE - ? "
+				+ " AND SITE_CODE = ? "
 				+ " AND LOT_NO = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, itemCode);
@@ -506,7 +508,13 @@ public class MfgCommon {
 					}
 				}
 			}
-
+			System.out.println("Manufacturing before  tranType [" + tranType + "] mfgDate [" + mfgDate +"] relDate [" + relDate + "] mfgDateOn [" + mfgDateOn + "] complDate [" + complDate +"] lotNoIssue [" + lotNoIssue + "]");
+			
+			if ("S".equals(logicParm) && "S".equals(mfgDateOn) && mfgDate == null)
+			{
+				mfgDate = relDate;
+			}
+			System.out.println("Manufacturing after  tranType [" + tranType + "] mfgDate [" + mfgDate +"] relDate [" + relDate + "] mfgDateOn [" + mfgDateOn + "] complDate [" + complDate +"] lotNoIssue [" + lotNoIssue + "]");			
 			logicParm = getEnvMfg("999999", "EXP_DATE_LOGIC", conn);
 
 			if (logicParm == null || "NULLFOUND".equals(logicParm))