Commit 021a44a2 authored by cpatil's avatar cpatil

added condition for sale_order


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99532 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a65261ce
...@@ -666,8 +666,50 @@ public class MrpWizPrsSaveBean ...@@ -666,8 +666,50 @@ public class MrpWizPrsSaveBean
rs1=null; rs1=null;
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
System.out.println("@@@@@ 669 refWorkOrder from MPS["+tempSO+"] to WO["+refWorkOrder+"]");
System.out.println("@@@@@ 1 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+"]");
}
} }
} }
else else
......
...@@ -3059,70 +3059,70 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -3059,70 +3059,70 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
try try
{ // 1 { // 1
sql = "SELECT CASE WHEN (CASE WHEN A.SUPP_SOUR IS NULL THEN B.SUPP_SOUR ELSE A.SUPP_SOUR END) IS NULL THEN '' ELSE " + "(CASE WHEN A.SUPP_SOUR IS NULL THEN B.SUPP_SOUR ELSE A.SUPP_SOUR END) END ," sql = "SELECT CASE WHEN (CASE WHEN A.SUPP_SOUR IS NULL THEN B.SUPP_SOUR ELSE A.SUPP_SOUR END) IS NULL THEN '' ELSE " + "(CASE WHEN A.SUPP_SOUR IS NULL THEN B.SUPP_SOUR ELSE A.SUPP_SOUR END) END ,"
// 2 // 2
+ "CASE WHEN (CASE WHEN A.BOM_CODE IS NULL THEN B.BOM_CODE ELSE A.BOM_CODE END) IS NULL THEN '' ELSE " + "(CASE WHEN A.BOM_CODE IS NULL THEN B.BOM_CODE ELSE A.BOM_CODE END) END, " + "CASE WHEN (CASE WHEN A.BOM_CODE IS NULL THEN B.BOM_CODE ELSE A.BOM_CODE END) IS NULL THEN '' ELSE " + "(CASE WHEN A.BOM_CODE IS NULL THEN B.BOM_CODE ELSE A.BOM_CODE END) END, "
// 3 // 3
+ "CASE WHEN (CASE WHEN A.MIN_QTY IS NULL THEN B.MIN_QTY ELSE A.MIN_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_QTY IS NULL THEN B.MIN_QTY ELSE A.MIN_QTY END) END, " + "CASE WHEN (CASE WHEN A.MIN_QTY IS NULL THEN B.MIN_QTY ELSE A.MIN_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_QTY IS NULL THEN B.MIN_QTY ELSE A.MIN_QTY END) END, "
// 4 // 4
+ "CASE WHEN (CASE WHEN A.MIN_STK_DAY IS NULL THEN B.MIN_STK_DAY ELSE A.MIN_STK_DAY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_STK_DAY IS NULL THEN B.MIN_STK_DAY ELSE A.MIN_STK_DAY END) END," + "CASE WHEN (CASE WHEN A.MIN_STK_DAY IS NULL THEN B.MIN_STK_DAY ELSE A.MIN_STK_DAY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_STK_DAY IS NULL THEN B.MIN_STK_DAY ELSE A.MIN_STK_DAY END) END,"
// 5 // 5
+ "CASE WHEN A.REO_QTY IS NULL THEN 0 ELSE A.REO_QTY END, " + "CASE WHEN A.REO_QTY IS NULL THEN 0 ELSE A.REO_QTY END, "
// 6 // 6
+ "CASE WHEN A.PUR_LEAD_TIME IS NULL THEN 0 ELSE A.PUR_LEAD_TIME END, " + "CASE WHEN A.PUR_LEAD_TIME IS NULL THEN 0 ELSE A.PUR_LEAD_TIME END, "
// 7 // 7
+ "CASE WHEN A.QC_LEAD_TIME IS NULL THEN 0 ELSE A.QC_LEAD_TIME END, " + "CASE WHEN A.QC_LEAD_TIME IS NULL THEN 0 ELSE A.QC_LEAD_TIME END, "
// 8 // 8
+ "CASE WHEN A.MFG_LEAD_TIME IS NULL THEN 0 ELSE A.MFG_LEAD_TIME END, " + "CASE WHEN A.MFG_LEAD_TIME IS NULL THEN 0 ELSE A.MFG_LEAD_TIME END, "
// 9 // 9
+ "CASE WHEN A.INTEGRAL_QTY IS NULL THEN 0 ELSE A.INTEGRAL_QTY END, " + "CASE WHEN A.INTEGRAL_QTY IS NULL THEN 0 ELSE A.INTEGRAL_QTY END, "
// 10 // 10
+ "CASE WHEN B.ITEM_STRU IS NULL THEN '' ELSE B.ITEM_STRU END, " + "CASE WHEN B.ITEM_STRU IS NULL THEN '' ELSE B.ITEM_STRU END, "
// 11 // 11
+ "CASE WHEN A.SITE_CODE__SUPP IS NULL THEN '' ELSE A.SITE_CODE__SUPP END, " + "CASE WHEN A.SITE_CODE__SUPP IS NULL THEN '' ELSE A.SITE_CODE__SUPP END, "
// 12 // 12
+ "CASE WHEN A.SITE_CODE__PLAN IS NULL THEN A.SITE_CODE ELSE A.SITE_CODE__PLAN END," + "CASE WHEN A.SITE_CODE__PLAN IS NULL THEN A.SITE_CODE ELSE A.SITE_CODE__PLAN END,"
// 13 // 13
+ "CASE WHEN (CASE WHEN A.BATCH_QTY_TYPE IS NULL THEN B.BATCH_QTY_TYPE ELSE A.BATCH_QTY_TYPE END) IS NULL THEN 'F' ELSE " + "(CASE WHEN A.BATCH_QTY_TYPE IS NULL THEN B.BATCH_QTY_TYPE ELSE A.BATCH_QTY_TYPE END) END, " + "CASE WHEN (CASE WHEN A.BATCH_QTY_TYPE IS NULL THEN B.BATCH_QTY_TYPE ELSE A.BATCH_QTY_TYPE END) IS NULL THEN 'F' ELSE " + "(CASE WHEN A.BATCH_QTY_TYPE IS NULL THEN B.BATCH_QTY_TYPE ELSE A.BATCH_QTY_TYPE END) END, "
// 14 // 14
+ "CASE WHEN (CASE WHEN A.MIN_ORDER_QTY IS NULL THEN B.MIN_ORDER_QTY ELSE A.MIN_ORDER_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_ORDER_QTY IS NULL THEN B.MIN_ORDER_QTY ELSE A.MIN_ORDER_QTY END) END, " + "CASE WHEN (CASE WHEN A.MIN_ORDER_QTY IS NULL THEN B.MIN_ORDER_QTY ELSE A.MIN_ORDER_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MIN_ORDER_QTY IS NULL THEN B.MIN_ORDER_QTY ELSE A.MIN_ORDER_QTY END) END, "
// 15 // 15
+ "CASE WHEN (CASE WHEN A.MAX_STK_DAY IS NULL THEN B.MAX_STK_DAY ELSE A.MAX_STK_DAY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MAX_STK_DAY IS NULL THEN B.MAX_STK_DAY ELSE A.MAX_STK_DAY END) END, " + "CASE WHEN (CASE WHEN A.MAX_STK_DAY IS NULL THEN B.MAX_STK_DAY ELSE A.MAX_STK_DAY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MAX_STK_DAY IS NULL THEN B.MAX_STK_DAY ELSE A.MAX_STK_DAY END) END, "
// 16 // 16
+ "A.MASTER_SCH , " + "A.MASTER_SCH , "
// 17 // 17
+ "CASE WHEN (CASE WHEN A.MAX_QTY IS NULL THEN B.MAX_QTY ELSE A.MAX_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MAX_QTY IS NULL THEN B.MAX_QTY ELSE A.MAX_QTY END) END ," + "CASE WHEN (CASE WHEN A.MAX_QTY IS NULL THEN B.MAX_QTY ELSE A.MAX_QTY END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.MAX_QTY IS NULL THEN B.MAX_QTY ELSE A.MAX_QTY END) END ,"
// 18 // 18
+ "(CASE WHEN A.ORDER_OPT IS NULL THEN B.ORDER_OPT ELSE A.ORDER_OPT END) END ," + "(CASE WHEN A.ORDER_OPT IS NULL THEN B.ORDER_OPT ELSE A.ORDER_OPT END) END ,"
// 19 // 19
+ "(CASE WHEN A.YIELD_PERC IS NULL THEN B.YIELD_PERC ELSE A.YIELD_PERC END) END, " + "(CASE WHEN A.YIELD_PERC IS NULL THEN B.YIELD_PERC ELSE A.YIELD_PERC END) END, "
// 20 // 20
+ "(CASE WHEN A.MIN_PLAN_PERC IS NULL THEN 0 ELSE A.MIN_PLAN_PERC END) END, " + "(CASE WHEN A.MIN_PLAN_PERC IS NULL THEN 0 ELSE A.MIN_PLAN_PERC END) END, "
// 21 // 21
+ "B.UNIT, " + "B.UNIT, "
// 22 // 22
+ "B.DESCR, " + "B.DESCR, "
// 23 // 23
+ "B.APR_CODE, " + "B.APR_CODE, "
// 24 // 24
+ "B.PACK_CODE, " + "B.PACK_CODE, "
// 25 // 25
+ "CASE WHEN A.EMP_CODE__PUR IS NULL THEN CASE WHEN b.EMP_CODE__PUR IS NULL THEN C.EMP_CODE__PUR ELSE B.EMP_CODE__PUR END ELSE A.EMP_CODE__PUR END , " + "CASE WHEN A.EMP_CODE__PUR IS NULL THEN CASE WHEN b.EMP_CODE__PUR IS NULL THEN C.EMP_CODE__PUR ELSE B.EMP_CODE__PUR END ELSE A.EMP_CODE__PUR END , "
// 26 // 26
+ "(CASE WHEN A.SUPP_CODE__PREF IS NULL THEN B.SUPP_CODE__PREF ELSE A.SUPP_CODE__PREF END ), " + "(CASE WHEN A.SUPP_CODE__PREF IS NULL THEN B.SUPP_CODE__PREF ELSE A.SUPP_CODE__PREF END ), "
// 27 // 27
+ "B.PURC_RATE, " + "B.PURC_RATE, "
// 28 // 28
+ "C.ACCT_CODE__PH, " + "C.ACCT_CODE__PH, "
// 29 // 29
+ "C.CCTR_CODE__PH, " + "C.CCTR_CODE__PH, "
// 30 // 30
+ " B.ITEM_SER, " + " B.ITEM_SER, "
// 31, 32 // 31, 32
+ " CASE WHEN A.MFG_TYPE IS NULL THEN 'MRP' ELSE A.MFG_TYPE END, A.ROUTE_CODE, " + " CASE WHEN A.MFG_TYPE IS NULL THEN 'MRP' ELSE A.MFG_TYPE END, A.ROUTE_CODE, "
// 33, 34 // 33, 34
+ " case when a.mfg_lead_basis is null then 'F' else a.mfg_lead_basis end, case when a.batch_size_lead is null then 0 else a.batch_size_lead end,A.EMP_CODE__PLN," + " case when a.mfg_lead_basis is null then 'F' else a.mfg_lead_basis end, case when a.batch_size_lead is null then 0 else a.batch_size_lead end,A.EMP_CODE__PLN,"
+ "CASE WHEN (CASE WHEN A.REO_LEV IS NULL THEN B.REO_LEV ELSE A.REO_LEV END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.REO_LEV IS NULL THEN B.REO_LEV ELSE A.REO_LEV END) END as REO_LEV " + "CASE WHEN (CASE WHEN A.REO_LEV IS NULL THEN B.REO_LEV ELSE A.REO_LEV END) IS NULL THEN 0 ELSE " + "(CASE WHEN A.REO_LEV IS NULL THEN B.REO_LEV ELSE A.REO_LEV END) END as REO_LEV "
+ " FROM SITEITEM A, ITEM B, ITEMSER C " + " WHERE A.ITEM_CODE = B.ITEM_CODE " + " AND B.ITEM_SER = C.ITEM_SER " + " AND A.SITE_CODE = ? " + " AND A.ITEM_CODE = ? "; + " FROM SITEITEM A, ITEM B, ITEMSER C " + " WHERE A.ITEM_CODE = B.ITEM_CODE " + " AND B.ITEM_SER = C.ITEM_SER " + " AND A.SITE_CODE = ? " + " AND A.ITEM_CODE = ? ";
// +" AND A.SITE_CODE = '" + siteCode + "' " // +" AND A.SITE_CODE = '" + siteCode + "' "
// +" AND A.ITEM_CODE = '" + itemCode + "' "; // +" AND A.ITEM_CODE = '" + itemCode + "' ";
...@@ -3276,68 +3276,68 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -3276,68 +3276,68 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rs.close(); rs.close();
pstmt.close(); pstmt.close();
sql = "SELECT CASE WHEN B.SUPP_SOUR IS NULL THEN '' ELSE B.SUPP_SOUR END ," sql = "SELECT CASE WHEN B.SUPP_SOUR IS NULL THEN '' ELSE B.SUPP_SOUR END ,"
// 2 // 2
+ "CASE WHEN B.BOM_CODE IS NULL THEN '' ELSE B.BOM_CODE END, " + "CASE WHEN B.BOM_CODE IS NULL THEN '' ELSE B.BOM_CODE END, "
// 3 // 3
+ "CASE WHEN B.MIN_QTY IS NULL THEN 0 ELSE B.MIN_QTY END, " + "CASE WHEN B.MIN_QTY IS NULL THEN 0 ELSE B.MIN_QTY END, "
// 4 // 4
+ "CASE WHEN B.MIN_STK_DAY IS NULL THEN 0 ELSE B.MIN_STK_DAY END," + "CASE WHEN B.MIN_STK_DAY IS NULL THEN 0 ELSE B.MIN_STK_DAY END,"
// 5 // 5
+ "CASE WHEN B.REO_QTY IS NULL THEN 0 ELSE B.REO_QTY END, " + "CASE WHEN B.REO_QTY IS NULL THEN 0 ELSE B.REO_QTY END, "
// 6 // 6
+ "CASE WHEN B.PUR_LEAD_TIME IS NULL THEN 0 ELSE B.PUR_LEAD_TIME END, " + "CASE WHEN B.PUR_LEAD_TIME IS NULL THEN 0 ELSE B.PUR_LEAD_TIME END, "
// 7 // 7
+ "CASE WHEN B.QC_LEAD_TIME IS NULL THEN 0 ELSE B.QC_LEAD_TIME END, " + "CASE WHEN B.QC_LEAD_TIME IS NULL THEN 0 ELSE B.QC_LEAD_TIME END, "
// 8 // 8
+ "CASE WHEN B.MFG_LEAD IS NULL THEN 0 ELSE B.MFG_LEAD END, " + "CASE WHEN B.MFG_LEAD IS NULL THEN 0 ELSE B.MFG_LEAD END, "
// 9 // 9
+ "CASE WHEN B.INTEGRAL_QTY IS NULL THEN 0 ELSE B.INTEGRAL_QTY END, " + "CASE WHEN B.INTEGRAL_QTY IS NULL THEN 0 ELSE B.INTEGRAL_QTY END, "
// 10 // 10
+ "CASE WHEN B.ITEM_STRU IS NULL THEN '' ELSE B.ITEM_STRU END, " + "CASE WHEN B.ITEM_STRU IS NULL THEN '' ELSE B.ITEM_STRU END, "
// 11 // 11
+ "'' AS SITE_CODE__SUPP, " + "'' AS SITE_CODE__SUPP, "
// 12 // 12
+ "'" + siteCode + "' AS SITE_CODE__PLAN," + "'" + siteCode + "' AS SITE_CODE__PLAN,"
// 13 // 13
+ "CASE WHEN B.BATCH_QTY_TYPE IS NULL THEN 'F' ELSE B.BATCH_QTY_TYPE END, " + "CASE WHEN B.BATCH_QTY_TYPE IS NULL THEN 'F' ELSE B.BATCH_QTY_TYPE END, "
// 14 // 14
+ "CASE WHEN B.MIN_ORDER_QTY IS NULL THEN 0 ELSE B.MIN_ORDER_QTY END, " + "CASE WHEN B.MIN_ORDER_QTY IS NULL THEN 0 ELSE B.MIN_ORDER_QTY END, "
// 15 // 15
+ "CASE WHEN B.MAX_STK_DAY IS NULL THEN 0 ELSE B.MAX_STK_DAY END, " + "CASE WHEN B.MAX_STK_DAY IS NULL THEN 0 ELSE B.MAX_STK_DAY END, "
// 16 // 16
+ "'Y' AS MASTER_SCH , " + "'Y' AS MASTER_SCH , "
// 17 // 17
+ "CASE WHEN B.MAX_QTY IS NULL THEN 0 ELSE B.MAX_QTY END ," + "CASE WHEN B.MAX_QTY IS NULL THEN 0 ELSE B.MAX_QTY END ,"
// 18 // 18
+ "CASE WHEN B.ORDER_OPT IS NULL THEN 'C' ELSE B.ORDER_OPT END ," + "CASE WHEN B.ORDER_OPT IS NULL THEN 'C' ELSE B.ORDER_OPT END ,"
// 19 // 19
+ "CASE WHEN B.YIELD_PERC IS NULL THEN 100 ELSE B.YIELD_PERC END, " + "CASE WHEN B.YIELD_PERC IS NULL THEN 100 ELSE B.YIELD_PERC END, "
// 20 // 20
+ " 0 AS MIN_PLAN_PERC, " + " 0 AS MIN_PLAN_PERC, "
// 21 // 21
+ "B.UNIT, " + "B.UNIT, "
// 22 // 22
+ "B.DESCR, " + "B.DESCR, "
// 23 // 23
+ "B.APR_CODE, " + "B.APR_CODE, "
// 24 // 24
+ "B.PACK_CODE, " + "B.PACK_CODE, "
// 25 // 25
+ "CASE WHEN B.EMP_CODE__PUR IS NULL THEN C.EMP_CODE__PUR ELSE B.EMP_CODE__PUR END , " + "CASE WHEN B.EMP_CODE__PUR IS NULL THEN C.EMP_CODE__PUR ELSE B.EMP_CODE__PUR END , "
// 26 // 26
+ "B.SUPP_CODE__PREF, " + "B.SUPP_CODE__PREF, "
// 27 // 27
+ "B.PURC_RATE, " + "B.PURC_RATE, "
// 28 // 28
+ "C.ACCT_CODE__PH, " + "C.ACCT_CODE__PH, "
// 29 // 29
+ "C.CCTR_CODE__PH, " + "C.CCTR_CODE__PH, "
// 30 // 30
+ " B.ITEM_SER, " + " B.ITEM_SER, "
// 31 // 31
+ " CASE WHEN B.MFG_TYPE IS NULL THEN 'MRP' ELSE B.MFG_TYPE END,B.EMP_CODE__PLN, " + " CASE WHEN B.MFG_TYPE IS NULL THEN 'MRP' ELSE B.MFG_TYPE END,B.EMP_CODE__PLN, "
+ "CASE WHEN B.REO_LEV IS NULL THEN 0 ELSE B.REO_LEV END as REO_LEV " + "CASE WHEN B.REO_LEV IS NULL THEN 0 ELSE B.REO_LEV END as REO_LEV "
+ " FROM ITEM B, ITEMSER C " + " WHERE B.ITEM_SER = C.ITEM_SER" + " AND B.ITEM_CODE = '" + itemCode + "' "; + " FROM ITEM B, ITEMSER C " + " WHERE B.ITEM_SER = C.ITEM_SER" + " AND B.ITEM_CODE = '" + itemCode + "' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,siteCode); // pstmt.setString(1,siteCode);
...@@ -7437,13 +7437,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7437,13 +7437,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// comment code for not deleting workorder // comment code for not deleting workorder
if( isDetailReq ) //added for supreme on 02/11/15 for delete both workorder if( isDetailReq ) //added for supreme on 02/11/15 for delete both workorder
{ {
pstmt = conn.prepareStatement(sqlWorkOrder); pstmt = conn.prepareStatement(sqlWorkOrder);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
rowsDeleted = pstmt.executeUpdate(); rowsDeleted = pstmt.executeUpdate();
System.out.println("Rows Deleted in WorkOrder :" + rowsDeleted); System.out.println("Rows Deleted in WorkOrder :" + rowsDeleted);
conn.commit(); conn.commit();
pstmt.close(); pstmt.close();
} }
else else
{ {
...@@ -8783,6 +8783,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8783,6 +8783,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
boolean insertFlag = true; // added by cpatil for new req boolean insertFlag = true; // added by cpatil for new req
ArrayList<String> tranIdList = new ArrayList<String>(); ArrayList<String> tranIdList = new ArrayList<String>();
PreparedStatement pstmt4 = null;
try try
{ {
System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------"); System.out.println("@@@@@@@@@cpatil:InsertPlanDemand called----winName["+winName+"] list["+list+"]--------");
...@@ -8986,13 +8989,42 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8986,13 +8989,42 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pstmtWorkOrder.setString(24, unit); pstmtWorkOrder.setString(24, unit);
pstmtWorkOrder.setDouble(25, quantity); pstmtWorkOrder.setDouble(25, quantity);
pstmtWorkOrder.setDouble(26, 1); pstmtWorkOrder.setDouble(26, 1);
if (saleOrder != null && saleOrder.trim().length() > 0)
if( isDetailReq ) // added by cpatil for supreme on 23/12/15
{ {
pstmtWorkOrder.setString(27, saleOrder); int cnt4=0;
} else 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
{ {
pstmtWorkOrder.setNull(27, java.sql.Types.CHAR); if (saleOrder != null && saleOrder.trim().length() > 0)
{
pstmtWorkOrder.setString(27, saleOrder);
}
else
{
pstmtWorkOrder.setNull(27, java.sql.Types.CHAR);
}
} }
if (lineNo != null && lineNo.trim().length() > 0) if (lineNo != null && lineNo.trim().length() > 0)
{ {
pstmtWorkOrder.setString(28, lineNo); pstmtWorkOrder.setString(28, lineNo);
...@@ -11026,7 +11058,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -11026,7 +11058,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
count1++; count1++;
System.out.println("@@@@@10124::count1["+count1+"]"); System.out.println("@@@@@10124::count1["+count1+"]");
}*/ }*/
valueXmlString.append("<Detail4 domID='" + count1 + "' >\r\n"); valueXmlString.append("<Detail4 domID='" + count1 + "' >\r\n");
String altItemPerc = detadpElement.getAltitemPerc(); String altItemPerc = detadpElement.getAltitemPerc();
...@@ -11536,7 +11568,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -11536,7 +11568,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy"); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
final String[] titles = final String[] titles =
{ "Site Code", "Item Code", "Item Description", "Supply Source", "Demand", "Supply", "Stock Qty", "Other Supply", "Pending PO", "Pending DO", "Pending Indent", "Pending DR", "Due Date", "Plan Supply", "Running Demand", "Running Supply", "Running Plan Supply", "Independent Demand", "Bom Code", "Order Opt", "Batch Qty Type", "Unit", "Min Order Qty", "Integral Qty", "Max Qty", "Min Qty", "Reorder Qty", "Yield Perc", "Min Plan %", "Batch Qty", "Purc Rate", "Pur Lead Time", "QC Lead Time", "MFG Lead Time" }; { "Site Code", "Item Code", "Item Description", "Supply Source", "Demand", "Supply", "Stock Qty", "Other Supply", "Pending PO", "Pending DO", "Pending Indent", "Pending DR", "Due Date", "Plan Supply", "Running Demand", "Running Supply", "Running Plan Supply", "Independent Demand", "Bom Code", "Order Opt", "Batch Qty Type", "Unit", "Min Order Qty", "Integral Qty", "Max Qty", "Min Qty", "Reorder Qty", "Yield Perc", "Min Plan %", "Batch Qty", "Purc Rate", "Pur Lead Time", "QC Lead Time", "MFG Lead Time" };
// 30 // 30
try try
{ {
......
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