changed by sumit on 21/03/13 for bug of deallocation

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

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

@@ -1262,6 +1262,19 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				}			
 				pstmt.close();pstmt = null;
 				
+				sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setDouble(1, DeallocQty );				
+				pstmt.setString(2, parentReplOrder);
+				pstmt.setInt(3, parentReplOrdLine);
+				//pstmt2.setInt(3, pickLineNo);
+				update = pstmt.executeUpdate();
+				if( update > 0 )
+				{
+					System.out.println(parentReplOrder+" repl_order OF REPL_ORD_DET updated successfully ");
+				}			
+				pstmt.close();pstmt = null;
+				
 				sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setDouble(1, DeallocQty );				
@@ -1271,7 +1284,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				update = pstmt.executeUpdate();
 				if( update > 0 )
 				{
-					System.out.println(currentReplOrder+" repl_order updated successfully ");
+					System.out.println(parentReplOrder+" repl_order REPL_ORD_DET updated successfully ");
 				}			
 				pstmt.close();pstmt = null;
 				
@@ -2135,6 +2148,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						}
 					}	*/	
 				}
+				else
+				{
+					updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
+				}
 				
 			}	
 			else
@@ -2153,7 +2170,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				/*stockDetail.put("loc_code", locCode);
 				stockDetail.put("ref_id", refId);
 				stockDetail.put("ref_line_no", pickLineNo);*/
-				updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine,"",0);
+				updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
 			}
 			System.out.println(" final locCode ["+locCode+"]");
 			
@@ -2191,13 +2208,13 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				}
 				pstmt.close(); pstmt = null;
 				
-				sql = "UPDATE CARTON_MASTER SET STATUS = 'Y' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
+				sql = "UPDATE CARTON_MASTER SET STATUS = 'R' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, refId);	
 				pstmt.setInt(2, pickLineNo);
 				if ( pstmt.executeUpdate() > 0 )
 				{
-					System.out.println(" WAVE_TASK_DET updated succesfully ");
+					System.out.println(" CARTON_MASTER updated succesfully ");
 				}
 				pstmt.close(); pstmt = null;
 				

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

@@ -296,7 +296,6 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					" SORDER.ITEM_SER, WTD.PTCN, POH.PICK_TYPE FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD, " +
 					" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
 					" WHERE CM.PICK_ORDER = POD.PICK_ORDER  AND POH.PICK_ORDER = POD.PICK_ORDER " +					
-					//" AND CM.LINE_NO__PICK = POD.LINE_NO
 					" AND WTD.PTCN = CM.PTCN AND WTD.REF_ID = CM.PICK_ORDER  " +
 					" AND POH.PICK_TYPE = 'A' " +
 					" AND SORDER.SITE_CODE__SHIP = ? " +
@@ -338,7 +337,8 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
 					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
 					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
-					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S'"; 
+					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S' " +
+					" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
 					
 			pstmt = conn.prepareStatement(getDataSql);		
 			pstmt.setString(1, siteCode);		
@@ -830,8 +830,8 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					double packSizeActive = 0.0;
 					sql = "SELECT QUANTITY FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";					
 					pstmt1 = conn.prepareStatement(sql);
-					pstmt1.setString(1, pickOrder);
-					pstmt1.setString(2, lineNoPick);
+					pstmt1.setString(1, cartonPickOrder);
+					pstmt1.setString(2, cartonPickLine);
 					rs = pstmt1.executeQuery();
 					if( rs.next())
 					{
@@ -1758,9 +1758,68 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						}
 					}*/
 				}
+				else
+				{
+					sql = "SELECT LOC_CODE FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,refId);
+					pstmt.setInt(2, pickLineNo);
+					rs = pstmt.executeQuery();
+					if( rs.next())
+					{
+						locCode = rs.getString("LOC_CODE");
+					}
+					rs.close(); rs = null;
+					pstmt.close(); pstmt = null;
+					stockDetail.put("loc_code", locCode);
+					stockDetail.put("ref_id", refId);
+					stockDetail.put("ref_line_no", pickLineNo);
+				}
 					
 			}	
 			else
+			{
+				boolean isAllTaskConfirmed = isAllTaskConf(refId, conn);
+				System.out.println( " isAllTaskConfirmed ["+isAllTaskConfirmed+"]");
+				//if( ("C".equalsIgnoreCase(pickType) && "C".equalsIgnoreCase(status) ) || ("C".equalsIgnoreCase(status) && "Y".equalsIgnoreCase(trfStatus) && ( "A".equalsIgnoreCase(pickType) || "M".equalsIgnoreCase(pickType))))
+				if( isAllTaskConfirmed )
+				{
+					sql = " SELECT DT.DESP_ID, DT.LINE_NO, DT.LOC_CODE FROM DESPATCH D, DESPATCHDET DT , REPL_ORD_DET ROD , WAVE_TASK_DET WTD " +
+							" WHERE ROD.REPL_ORDER = ? AND ROD.LINE_NO = ? AND ROD.REPL_ORDER = WTD.REF_ID " +
+							" AND ROD.SALE_ORDER = WTD.SALE_ORDER AND WTD.WAVE_ID = D.WAVE_ID  AND D.DESP_ID = DT.DESP_ID ";
+					
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,refId);
+					pstmt.setInt(2, pickLineNo);
+					rs = pstmt.executeQuery();
+					if( rs.next())
+					{
+						stockDetail.put("loc_code", rs.getString("LOC_CODE"));
+						stockDetail.put("ref_id", rs.getString("DESP_ID"));
+						stockDetail.put("ref_line_no", rs.getString("LINE_NO"));
+					}
+					rs.close(); rs = null;
+					pstmt.close(); pstmt = null;
+				}
+				else
+				{
+					boolean isIssAvail = false;
+					sql = "SELECT LOC_CODE__TO FROM REPL_ISS_DET WHERE REPL_ORDER = ? AND LINE_NO__ORD = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,refId);
+					pstmt.setInt(2, pickLineNo);
+					rs = pstmt.executeQuery();
+					if( rs.next())
+					{
+						isIssAvail = true;
+						stockDetail.put("loc_code", rs.getString("LOC_CODE__TO"));
+						stockDetail.put("ref_id", refId);
+						stockDetail.put("ref_line_no", pickLineNo);
+					}
+					rs.close(); rs = null;
+					pstmt.close(); pstmt = null;
+					
+					if( !isIssAvail )
 					{
 						sql = "SELECT LOC_CODE FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
 						pstmt = conn.prepareStatement(sql);
@@ -1769,14 +1828,18 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						rs = pstmt.executeQuery();
 						if( rs.next())
 						{
-					locCode = rs.getString("");
+							locCode = rs.getString("LOC_CODE");
 						}
 						rs.close(); rs = null;
 						pstmt.close(); pstmt = null;
+						
 						stockDetail.put("loc_code", locCode);
 						stockDetail.put("ref_id", refId);
 						stockDetail.put("ref_line_no", pickLineNo);
 					}
+				}
+				
+			}
 			System.out.println(" stockDetail ["+stockDetail+"]");
 		}
 		catch(Exception e)

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

@@ -2982,6 +2982,13 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						quantity = rsOrd.getDouble("QUANTITY");  // commented by cpatil
 						unit = rsOrd.getString("UNIT");
 						noArt = rsOrd.getDouble("NO_ART");  // commented by cpatil
+						//Changed by sumit on 27/09/12 getting SHIPPER_SIZE and calculating no_art start
+						lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
+						itmVolumeMap.clear();
+						itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
+						shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");
+						noArt = quantity / shipperSize;
+						//Changed by sumit on 27/09/12 getting SHIPPER_SIZE and calculating no_art end
 						locCodeTo = rsOrd.getString("LOC_CODE__TO");
 						actCartonNo = checkNull(rsOrd.getString("CARTON_NO"));
 						actPackCode = checkNull(rsOrd.getString("PACK_CODE"));

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

@@ -31922,6 +31922,36 @@ INSERT INTO MESSAGES (
 	'sale_order__fr',
 	'Y');
  
+	-- Changed by sumit on 21/03/13 for stock to dock messages
+	INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'INVDEALLQ4',
+        'Invalid quantity',
+        'Quantity can not be altered for full CASES',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE',
+        'BASE',
+        NULL,
+        NULL);
+        
 commit;