missing sqls and replenishment pos ,confirm and sql

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

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

@@ -57,7 +57,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
         HashMap<String, Number> map = null;
 		// 15/10/12 manoharan get the old despatch line detail
 		String despLineOld = "0", sordNo = "", lineNoSord = "", expLev = "", itemCodeOrd = "", locCode = "", detStatus = "", unitStd = "";
-		String unit = "", packInstr = "", siteCode = "", siteCodeMfg = "", lineType = "", packCode = "", custItemRef = "";
+		String unit = "", packInstr = "", siteCode = "", siteCodeMfg = "", lineType = "", packCode = "", custItemRef = "",partNo = "";
 		int noArtOld = 0;
 		java.sql.Timestamp 	mfgDate = null, expDate = null, restetDate = null;
 		double qtyOrd = 0, quantityOld = 0, convQtyStduom = 0, quantityStduom = 0, quantityReal = 0, rateStduom = 0, packQty = 0, grossWeightOld = 0;
@@ -109,6 +109,15 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					pstmt.close();
 					pstmt = null;
 					
+					
+					sSQL = "UPDATE PALLET_NO SET STATUS = ? WHERE PALLET_NO = ? ";
+					pstmt = conn.prepareStatement(sSQL);
+					pstmt.setString(1, "U");
+					pstmt.setString(2, palletNoNew);
+					pstmt.executeUpdate();	
+					pstmt.close();
+					pstmt = null;
+					
 					sSQL = "SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?";
 					pstmt = conn.prepareStatement(sSQL);
 					pstmt.setString(1,pickOrder);
@@ -142,7 +151,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					"STATUS, CONV__QTY_STDUOM, UNIT__STD, UNIT, QUANTITY__STDUOM, QUANTITY_REAL, " +
 					"RATE__STDUOM, PACK_INSTR, NO_ART, SITE_CODE, PACK_QTY, GROSS_WEIGHT, TARE_WEIGHT,  " +
 					"NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " +
-					"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE  " +
+					"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE ,PART_NO  " +
 					" FROM  DESPATCHDET WHERE DESP_ID = ? AND ITEM_CODE = ? AND LOT_SL = ? AND LOT_NO = ? AND PALLET_NO = ?";
 					pstmt = conn.prepareStatement(sSQL);
 					pstmt.setString(1,despId);
@@ -185,6 +194,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 						packCode = rs.getString("PACK_CODE");
 						custItemRef = rs.getString("CUST_ITEM__REF");
 						restetDate = rs.getTimestamp("RETEST_DATE");
+						partNo = rs.getString("PART_NO");
 						caseQty = packQty;
 						caseGrossWeight = grossWeightOld / noArtOld;
 						caseNetWeight = netWeightOld / noArtOld;
@@ -266,8 +276,8 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 								"STATUS, CONV__QTY_STDUOM, UNIT__STD, UNIT, QUANTITY__STDUOM, QUANTITY_REAL, " +
 								"RATE__STDUOM, PACK_INSTR, NO_ART, SITE_CODE, PACK_QTY, GROSS_WEIGHT, TARE_WEIGHT,  " +
 								"NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " +
-								"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PALLET_NO ) " +
-								"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?) ";  
+								"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PALLET_NO,PART_NO ) " +
+								"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?) ";  
 
 						pstmt1 = conn.prepareStatement(sSQL);
 						pstmt1.setString(1, despId);
@@ -279,7 +289,8 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 						pstmt1.setString(7, itemCode);
 						pstmt1.setString(8, lotNo);
 						pstmt1.setString(9, lotSl);
-						pstmt1.setDouble(10, quantityOrd);
+						//pstmt1.setDouble(10, quantityOrd);
+						pstmt1.setDouble(10, qtyOrd);
 						pstmt1.setDouble(11, caseQty);
 						pstmt1.setString(12, checkNull(locCode));
 						pstmt1.setString(13,detStatus);
@@ -307,6 +318,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 						pstmt1.setString( 35, checkNull(custItemRef));
 						pstmt1.setTimestamp( 36 ,restetDate);
 						pstmt1.setString( 37 , checkNull(palletNoNew));
+						pstmt1.setString( 38 , checkNull(partNo));
 
 						pstmt1.executeUpdate();
 						pstmt1.close();

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

@@ -2190,6 +2190,28 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						tranID =  checkNull(genericUtility.getColumnValue("tran_id", hdrDataDom ));
 						//locCode = checkNull(genericUtility.getColumnValue("loc_code", allFormDataDom, "3" ));
 						locCode = checkNull(genericUtility.getColumnValue("loc_code", currFormDataDom));
+						String taskStatus = "N";
+						
+						
+						sql = "SELECT STATUS FROM WAVE_TASK_DET WHERE REF_ID = ?";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, replOrder );
+						rs = pstmt.executeQuery();
+						if( rs.next() )
+						{
+							taskStatus = checkNull(rs.getString("STATUS"));
+							
+						}
+						if("Y".equalsIgnoreCase(taskStatus))
+						{
+							errList.add( "ACTRPLCONF" );
+							errFields.add( childNodeName.toLowerCase() );
+							break;
+						}						
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
 						
 						
 						

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

@@ -34344,5 +34344,35 @@ VALUES (
 OK to Add Carton Click Cancel and Deselect to remove Carton' where msg_no 
 = 'VTWGTEXD  ';
 	
+----27/10/12
+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 (
+	'ACTRPLCONF',
+	'Replenishment Conformed',
+	'Replenishment Confirmed, Active Replenishment is Already Confirmed',
+	'P',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('27-10-2000 11:59:45','DD-MM-YYYY HH24:MI:SS'),
+	'Base      ',
+	'Base           ',
+	NULL,
+	NULL);
+commit;
 
 commit;