update by sumit on 28/02/13 for issue tracker point 99 (STOCK DEALLOCATION) .

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

webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java

@@ -150,14 +150,14 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				rs2 = pstmt2.executeQuery();
 				confirmed = "";
 				if( rs2.next())
-				{
-					isIssueDone = true;					
+				{									
 					pickType = rs2.getString("PICK_TYPE");
 					confirmed = rs2.getString("CONFIRMED");
-					System.out.println(" pickType ["+pickType+"]");
-					if( "M".equalsIgnoreCase(pickType))
+					System.out.println(" pickType ["+pickType+"] confirmed["+confirmed+"]");
+					if( "Y".equalsIgnoreCase(confirmed))
 					{
 						locCode = rs2.getString("LOC_CODE__TO");
+						isIssueDone = true;
 					}
 					else
 					{
@@ -246,9 +246,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					{
 						updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 					}
-				}				
+				}
+				else
+				{
+					updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
+				}			
 				
-				updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 				errString = sorderDeAllocate(saleOrder, saleOrderLine, itemCode, DeallocQty, expLev, custCode, lotSl, lotNo, locCode, xtraParams, waveId, pickOrder);
 				
 				if (errString != null && errString.trim().length() > 0)

webitm-wms/module-resource/sql/update.sql

@@ -29849,6 +29849,32 @@ alter table distroutedet add  ship_type char(1);
  
  -- sumit 27/02/13 for stock deallocation
  
+  create table dealloc_art
+(
+tran_id         varchar2(10),
+site_code       char(5),
+PTCN            char(10),
+wave_id         varchar2(12),
+confirmed       char(1),
+conf_date       date,
+chg_date        date,
+chg_user        char(10),
+chg_term        char(15)
+);
+ALTER TABLE dealloc_art ADD ( CONSTRAINT PK_A_DEALLOC PRIMARY KEY ( TRAN_ID ));
+
+create table dealloc_art_det
+(
+tran_id           varchar2(10),
+line_no           NUMBER(3,0),
+carton_no         varchar2(20), 
+pick_order        char(10), 
+line_no__pick     NUMBER(3,0),
+item_code         char(10),
+quantity          NUMBER(14,3),
+pick_type         char(1)
+);
+ALTER TABLE dealloc_art_det ADD ( CONSTRAINT PK_A_DEALLOCDET PRIMARY KEY ( TRAN_ID, LINE_NO ));
  
 create or replace
 FUNCTION FN_CHECK_DEALLOC_ARTDET(SI_PTCN IN CHAR, SI_CARTON_NO IN CHAR )