added condition for sale_order

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

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

@@ -666,8 +666,50 @@ public class MrpWizPrsSaveBean
 							rs1=null;
 							pstmt1.close();
 							pstmt1=null;
+							System.out.println("@@@@@ 669 refWorkOrder from MPS["+tempSO+"] to WO["+refWorkOrder+"]");
+							
+							if( refWorkOrder == null || refWorkOrder.trim().length() == 0 )
+							{
+								String mpsItemCode="";
+								sql1=" select ITEM_CODE from MPS_ORDER where tran_id = ?  "; 
+								pstmt1=conn.prepareStatement(sql1);
+								pstmt1.setString(1,tempSO);
+								//pstmt1.setString(2,tempLineNo);
+								rs1 = pstmt1.executeQuery();
+								if(rs1.next())
+								{
+										mpsItemCode =  rs1.getString("ITEM_CODE");
+								}
+								rs1.close();
+								rs1=null;
+								pstmt1.close();
+								pstmt1=null;
+								
+								firstVal = false;
+								sql1=" select work_order from workorder " +
+										" where ADDN_order  like '%"+tempSO+"%' AND ITEM_CODE= ?  "; 
+								pstmt1=conn.prepareStatement(sql1);
+								pstmt1.setString(1,mpsItemCode);
+								//pstmt1.setString(1,tempSO);
+								//pstmt1.setString(2,tempLineNo);
+								rs1 = pstmt1.executeQuery();
+								while(rs1.next())
+								{
+									if(!firstVal) // added for fg and sfg two WO updated as status A
+									{
+										refWorkOrder =  rs1.getString("work_order");
+										firstVal= true;
+									}
+									WorkOrderSet.add(checkNull(rs1.getString("work_order")));
+								}
+								rs1.close();
+								rs1=null;
+								pstmt1.close();
+								pstmt1=null;
+								System.out.println("@@@@@ 709 refWorkOrder from MPS["+tempSO+"] to WO["+refWorkOrder+"]");
+								
+							}
 							
-							System.out.println("@@@@@ 1 refWorkOrder from MPS["+tempSO+"] to WO["+refWorkOrder+"]");
 						}
 					}
 					else

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

@@ -8783,6 +8783,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 		boolean insertFlag = true;   // added by cpatil for new req
 		ArrayList<String> tranIdList = new ArrayList<String>();
 
+		PreparedStatement pstmt4 = null;
+
+
 		try
 		{
 			System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------");
@@ -8986,13 +8989,42 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 						pstmtWorkOrder.setString(24, unit);
 						pstmtWorkOrder.setDouble(25, quantity);
 						pstmtWorkOrder.setDouble(26, 1);
+
+						if( isDetailReq )  // added by cpatil for supreme on 23/12/15
+						{
+							int cnt4=0;
+							String sql4 = "SELECT count(1) FROM sorder WHERE sale_order = ? ";
+							pstmt4 = conn.prepareStatement(sql4);
+							pstmt4.setString(1, saleOrder);
+							rs = pstmt4.executeQuery();
+							if (rs.next())
+							{
+								cnt4 = rs.getInt(1);
+							}
+							rs.close();
+							pstmt4.close(); 
+							if(( cnt4 > 0) && ( saleOrder != null && saleOrder.trim().length() > 0) )
+							{
+								pstmtWorkOrder.setString(27, saleOrder);
+							} 
+							else
+							{
+								pstmtWorkOrder.setNull(27, java.sql.Types.CHAR);
+							}
+
+						}
+						else
+						{
 							if (saleOrder != null && saleOrder.trim().length() > 0)
 							{
 								pstmtWorkOrder.setString(27, saleOrder);
-						} else
+							}
+							else
 							{
 								pstmtWorkOrder.setNull(27, java.sql.Types.CHAR);
 							}
+						}
+
 						if (lineNo != null && lineNo.trim().length() > 0)
 						{
 							pstmtWorkOrder.setString(28, lineNo);