Transfer full quantity time lot no and location update logic change

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

webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java

@@ -3123,6 +3123,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
     		{
     				netWeight = Double.parseDouble(updateRowMap.get("net_weight").toString());
     		}
+    		System.out.println("lotNo>>>>>>>"+lotNo);
     		if (quantity > 0)
 			{
 				sqlQC = "select count(1) from qc_order "
@@ -3163,7 +3164,6 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-
 					if (cnt > 0)
 					{
 						if( locationCodeFrom != null && locationCodeFrom.trim().length()>0 )
@@ -3180,6 +3180,38 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 							updCnt = pstmtUpd.executeUpdate();
 							pstmtUpd.close();
 							pstmtUpd = null;
+							
+							sql = " select count (*) as cnt,quantity from qc_order_lots " +
+									"where item_code = ? and lot_no = ?  and loc_code__issue = ? and lot_sl=? group by quantity";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, itemCode);
+							pstmt.setString(2, lotNo);
+							pstmt.setString(3, locationCodeFrom);
+							pstmt.setString(4, lotSl);
+							rs = pstmt.executeQuery();
+							if (rs.next())
+							{
+								//cnt22 = rs.getInt("cnt");
+								qcOrdQty = Double.parseDouble(rs.getString("quantity") == null ? "0" : rs.getString("quantity"));
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+							if(qcOrdQty == 0)
+							{
+								sql = " delete from qc_order_lots where item_code = ? and lot_no = ? " +
+										"and loc_code__issue = ? and lot_sl=? ";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, itemCode);
+								pstmt.setString(2, lotNo);
+								pstmt.setString(3, locationCodeFrom);
+								pstmt.setString(4, lotSl);
+								pstmt.executeUpdate();
+								pstmt.close();
+								pstmt = null;
+								
+							}
 						}
 						else
 						{
@@ -3218,22 +3250,25 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 						System.out.println("@@@@ qcOrdQty To:" + qcOrdQty+"quantity To:"+quantity);
 						if(qcOrdQty==0)
 						{
-							sql = "update qc_order_lots set quantity = ? ,loc_code__issue= ? ,no_art = ? " +
+							sql = "update qc_order_lots set quantity = ? ,loc_code__issue= ? ,no_art = ?, lot_no = ?, lot_sl=? " +
 								  " where item_code = ? and lot_no = ? and loc_code__issue = ?  and lot_sl=? ";
 							pstmtUpd = conn.prepareStatement(sql);
 							pstmtUpd.setDouble(1, quantity);
 							pstmtUpd.setString(2, locationCode);
 							pstmtUpd.setDouble(3, noArt);
-							pstmtUpd.setString(4, itemCode);
-							pstmtUpd.setString(5, lotNo);
-							pstmtUpd.setString(6, locationCodeFrom);
-							pstmtUpd.setString(7, lotSl);
+							pstmtUpd.setString(4, lotNo);
+							pstmtUpd.setString(5, lotSl);
+							pstmtUpd.setString(6, itemCode);
+							pstmtUpd.setString(7, lotNo);
+							pstmtUpd.setString(8, locationCodeFrom);
+							pstmtUpd.setString(9, lotSl);
 							updCnt = pstmtUpd.executeUpdate();
 							pstmtUpd.close();
 							pstmtUpd = null;
 						}
 						else
 						{
+							System.out.println("INSERT BLOCK");
 							sqlQC = "select qorder_no,unit,qty_sample from qc_order " + " where  site_code = ? "
 									+ " and item_code = ? " + " and lot_no  = ? "
 									+ " and status <> 'C' ";