bom copy site_code consideration and null checking in stock button

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

webitm-mfg/ibase/webitm/ejb/mfg/adv/BOMAct.java

@@ -223,8 +223,9 @@ public String actionHandler(String actionType, String xmlString,String xmlString
 			if(cnt ==0 )
 			{
 				sql = " select  bom_code,descr,item_code , "
-						+" batch_qty,unit from bom  order by bom_code  "	;
+						+" batch_qty,unit from bom where site_code = ? order by bom_code  "	;
 				pstmt = conn.prepareStatement(sql);	
+				pstmt.setString(1,siteCodeLogin);
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{					

webitm-mfg/ibase/webitm/ejb/mfg/adv/WOrderIssueAct.java

@@ -318,6 +318,11 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			pstmt.close();
 			rs.close();
+			lotNoIssue = lotNoIssue==null?" ":lotNoIssue;
+			considerLotNoIssue = considerLotNoIssue==null?" ":considerLotNoIssue;
+			locUsageType = locUsageType==null?" ":locUsageType;
+			
+			
 			if ("Y".equals(considerLotNoIssue) && lotNoIssue != null && !"null".equals(lotNoIssue) && lotNoIssue.trim().length() > 0)
 			{
 				String lotNoList[];
@@ -393,6 +398,13 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			rs.close();
 			pstmt = null;
 			sql = "";
+				useInvStatus = useInvStatus==null?" ":useInvStatus;
+				dimension = dimension==null?" ":dimension;
+				trackShelfLife = trackShelfLife==null?" ":trackShelfLife;
+				autoQcReqd = autoQcReqd==null?" ":autoQcReqd;
+				//trimWidth = trimWidth==null?" ":trimWidth;
+				qcReqd = qcReqd==null?" ":qcReqd;
+
 				System.out.println("dimension :: " + dimension + " trimWidth :: " + trimWidth);
 			System.out.println("qcRecd :: " + qcReqd + " autoQcReqd :: " + autoQcReqd);
 			System.out.println("trackShelfLife :: " + trackShelfLife + " useInvStatus :: " + useInvStatus);
@@ -1474,6 +1486,9 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				pstmt1.close();
 				rs1.close();
 			}
+				useInvStatus = useInvStatus==null?" ":useInvStatus;
+				dimension = dimension==null?" ":dimension;
+			
 			pstmt.close();
 			rs.close();
 
@@ -1610,6 +1625,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 
 				System.out.println("locCode ::: " + locCode + "trackShelfLife ::: " + trackShelfLife );
 				System.out.println("useInvStatus ::: " + useInvStatus + "dimension ::: " + dimension );
+				useInvStatus = useInvStatus==null?" ":useInvStatus;
+				dimension = dimension==null?" ":dimension;
 
 				if ((locCode == null || locCode.trim().length() == 0) || (lotNo == null || lotNo.trim().length() == 0))
 				{