Skip to content

B
business-java
Commit 0dc008eb authored by ppatro's avatar ppatro
Browse files
Options

CCF reciving changes for SUN USA 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96908 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7409e06d
Show whitespace changes
Inline Side-by-side
Showing with 398 additions and 2 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpIC.java
View file @ 0dc008eb
...@@ -1330,6 +1330,108 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal ...@@ -1330,6 +1330,108 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
//Changed by sumit on 18/12/12 commented this as per Ashish Mehta no need of this check end //Changed by sumit on 18/12/12 commented this as per Ashish Mehta no need of this check end
} }
//Changed by Pragyan 03/12/14 CCF to check for quantity,part qty valid data input.start
else if("quantity".equalsIgnoreCase( childNodeName ))
{
double inputQuantity = Double.parseDouble(genericUtility.getColumnValue("quantity", allDom, "3" ) == null ?"0":genericUtility.getColumnValue("quantity", allDom, "3" ));
double shipperSize = 0.0;
double reminder = 0.0;
System.out.println("Quantity Received inputQuantity="+inputQuantity+"]");
if(inputQuantity > 0)
{
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));
siteCode = checkNull(genericUtility.getColumnValue("site_code", allDom, "3" ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" ));
sql="select shipper_size, gross_weight, net_weight, length, width ,height from item_lot_packsize WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
pstmt =conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
System.out.println("lotNo="+lotNo+"]itemCode["+itemCode+"]");
if(lotNo != null && lotNo.trim().length() > 0)
{
System.out.println("lotNo is not null ");
pstmt.setString(2,lotNo);
pstmt.setString(3,lotNo);
}
else
{
System.out.println("lotNo is null ");
pstmt.setString(2,"00");
pstmt.setString(3,"ZZ");
}
rs=pstmt.executeQuery();
if(rs.next())
{
shipperSize=rs.getDouble(1);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("shipperSize="+shipperSize+"]");
if(shipperSize > 0)
{
reminder = inputQuantity % shipperSize;
System.out.println("reminder="+reminder+"]");
if(reminder > 0)
{
errList.add( "VTINVQTYIN" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
else if("part_qty".equalsIgnoreCase( childNodeName ))
{
double partQtyIn = Double.parseDouble(genericUtility.getColumnValue("part_qty", allDom, "3" ) == null ?"0":genericUtility.getColumnValue("part_qty", allDom, "3" ));
double shipperSize = 0.0;
System.out.println("Part Quantity Received ="+partQtyIn+"]");
if(partQtyIn > 0)
{
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));
siteCode = checkNull(genericUtility.getColumnValue("site_code", allDom, "3" ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" ));
sql="select shipper_size, gross_weight, net_weight, length, width ,height from item_lot_packsize WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
pstmt =conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
System.out.println("lotNo="+lotNo+"]itemCode["+itemCode+"]");
if(lotNo != null && lotNo.trim().length() > 0)
{
System.out.println("lotNo is not null ");
pstmt.setString(2,lotNo);
pstmt.setString(3,lotNo);
}
else
{
System.out.println("lotNo is null ");
pstmt.setString(2,"00");
pstmt.setString(3,"ZZ");
}
rs=pstmt.executeQuery();
if(rs.next())
{
shipperSize=rs.getDouble(1);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
System.out.println("shipperSize="+shipperSize+"]");
if(partQtyIn > shipperSize)
{
errList.add( "VTINVPRTIN" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
//Changed by Pragyan 03/12/14 CCF to check for quantity,part qty valid data input.end
/*Added By Ashish Sonawane on 02/AUG/12 for checking lot no from the lot master and validating with alt_lot_no [END] */ /*Added By Ashish Sonawane on 02/AUG/12 for checking lot no from the lot master and validating with alt_lot_no [END] */
/* Commented by shamim as discused with manohran sir Validation is on post save /* Commented by shamim as discused with manohran sir Validation is on post save
else if( "quantity".equalsIgnoreCase( childNodeName ) )//Case added by Dipak on 6/01/2012 else if( "quantity".equalsIgnoreCase( childNodeName ) )//Case added by Dipak on 6/01/2012
......
webitm-wms/ibase/webitm/ejb/wms/PoRcpPos.java
View file @ 0dc008eb
...@@ -339,6 +339,17 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem ...@@ -339,6 +339,17 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
//Changed by Rohan on 28-02-13 for bug fixing of calculation of weights.end //Changed by Rohan on 28-02-13 for bug fixing of calculation of weights.end
} }
//Changed by Pragyan 03/12/14 CCF to check for quantity,part qty valid data input.start
else
{
if(noArt == 0 && quantity > 0 && shipperSize > 0)
{
noArt = (new Double (Math.floor((quantity/shipperSize)))).intValue();;
rcpgrossWeight= grossWeight* noArt;
rcpnetWeight = netWeight * noArt;
}
}
//Changed by Pragyan 03/12/14 CCF to check for quantity,part qty valid data input.end
//Changed by Rohan on 26/02/13 for bug fixing of calculation of weights .start //Changed by Rohan on 26/02/13 for bug fixing of calculation of weights .start
/* /*
rcpgrossWeight+=grossWeight*partQty; rcpgrossWeight+=grossWeight*partQty;
......
webitm-wms/module-resource/sql/update.sql
View file @ 0dc008eb
...@@ -50076,8 +50076,291 @@ VALUES ('VTINVPOLIN', 'Invalid PO Line NO!', 'PO Line NO is not valid.', 'E', ...@@ -50076,8 +50076,291 @@ VALUES ('VTINVPOLIN', 'Invalid PO Line NO!', 'PO Line NO is not valid.', 'E',
---alter size increse of pack size sun usa requirement ---alter size increse of pack size sun usa requirement
alter table asn_det modify pack_size number(14,3); alter table asn_det modify pack_size number(14,3);
----- 03/12/14 for quantity reciving
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'NO_ART',
'W_STOCK_TRANSFER_WIZ',
'Validation For LOT SL',
'VTINVLEN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (case when length( ? ) = 10 THEN 1 ELSE 0 END) ELSE 1 END from dual',
'1',
'Q',
TO_DATE('25-07-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':0.site_code,:2.lot_sl__to',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'LOT_SL',
'W_PORCP_WIZ',
'Validation For LOT SL',
'VTINVLPN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (CASE WHEN (( ? LIKE (''NJ%'')) OR ( ? LIKE (''CN%'')) OR (? LIKE (''DM%'')) OR ( ? LIKE (''EX%''))) THEN 1 ELSE 0 END) ELSE 1 END FROM DUAL',
'1',
'Q',
TO_DATE('27-06-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':1.site_code,:2.lot_sl,:2.lot_sl,:2.lot_sl,:2.lot_sl',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'NO_ART',
'W_PORCP_WIZ',
'Validation For LOT SL',
'VTINVLEN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (case when length( ? ) = 10 THEN 1 ELSE 0 END) ELSE 1 END from dual',
'1',
'Q',
TO_DATE('15-07-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':1.site_code,:2.lot_sl',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'LOT_SL__NEW',
'W_ACTIVE_REPL_ISS',
'Validation For LOT SL',
'VTINVLPN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (CASE WHEN (( ? LIKE (''NJ%'')) OR ( ? LIKE (''CN%'')) OR (? LIKE (''DM%'')) OR ( ? LIKE (''EX%''))) THEN 1 ELSE 0 END) ELSE 1 END FROM DUAL',
'1',
'Q',
TO_DATE('15-07-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':1.site_code,:2.lot_sl__new,:2.lot_sl__new,:2.lot_sl__new,:2.lot_sl__new',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'NO_ART',
'W_ACTIVE_REPL_ISS',
'Validation For LOT SL',
'VTINVLEN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (case when length( ? ) = 10 THEN 1 ELSE 0 END) ELSE 1 END from dual',
'1',
'Q',
TO_DATE('15-07-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':1.site_code,:2.lot_sl',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
INSERT INTO GENMST (
fld_name ,
mod_name ,
descr,
error_cd,
blank_opt,
fld_type,
fld_min,
fld_max,
val_type,
chg_date,
chg_user,
chg_term,
val_table,
sql_input,
fld_width,
udf_usage_1,
udf_usage_2,
udf_usage_3,
val_stage,
obj_name ) VALUES (
'LOT_SL__TO',
'W_STOCK_TRANSFER_WIZ',
'Validation For LOT SL',
'VTINVLPN ',
'N',
'C',
'SELECT CASE WHEN ? in (''TA821'',''TA387'') THEN (CASE WHEN (( ? LIKE (''NJ%'')) OR ( ? LIKE (''CN%'')) OR (? LIKE (''DM%'')) OR ( ? LIKE (''EX%''))) THEN 1 ELSE 0 END) ELSE 1 END FROM DUAL',
'1',
'Q',
TO_DATE('15-07-2014 00:00:00','DD-MM-YYYY HH24:MI:SS'),
'prg ',
'PRG ',
NULL,
':0.site_code,:2.lot_sl__to,:2.lot_sl__to,:2.lot_sl__to,:2.lot_sl__to',
10,
NULL,
NULL,
NULL,
NULL,
NULL);
Insert into OBJ_FORMS
(WIN_NAME,TITLE,OBJ_BROW_NAME,OBJ_EDIT_NAME,CROSS_UPDATE_EXPR,EXPR_FLD_INFO,TARGET_FLD_INFO,EXPR_COMMENT,FORM_NO,SCR_FLAG,AUTO_ACCEPT_SCAN,SCAN_FLAG,SCAN_METADATA,PROPERTY_INFO,SCAN_DELIMITER,COLUMN_ON_SAVE,AFTER_SAVE,EXT_SETUP,EXT_METADATA,EXT_COM,AUTO_ACCEPT_WEIGHDATA,FORM_TYPE,DISP_METADATA,PARENT_KEY_COL,QTY_COL,RATE_COL,ASSISTED_MODE,STORAGE_KEY_METADATA,SELECTION_MODE,DEFAULT_VIEW,AUTO_ADDON_ENTRY)
values
(
'w_porcp_wiz',
'PRA-Inventory Detail',
'PRAGYAN',
NULL,
NULL,
NULL,
NULL,
NULL,
'3',
'T',
NULL,
NULL,
'<SCAN_INFO><MAPPING_SCAN ORDER="1"><SCAN_LABEL>Item Code:</SCAN_LABEL><FIELDS SEPARATOR="S" DELIMITER=""><FIELD ORDER="0" LOOKUP_TABLE="ITEM" LOOKUP_COL="GTIN_CASE" LOOKUP_RETCOL="ITEM_CODE" start="3" end="15" >item_code</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="2"><SCAN_LABEL>Lot Number:</SCAN_LABEL><FIELDS SEPARATOR="S" DELIMITER=""><FIELD ORDER="0" left="IF(3,9,13,10)" right="1" >lot_no</FIELD></FIELDS></MAPPING_SCAN><INPUT_SCAN ORDER="1"><SCAN_LABEL>LPN Number:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl</FIELD></FIELDS></INPUT_SCAN><INPUT_SCAN ORDER="2"><SCAN_LABEL>Quantity:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD ORDER="0" mandatory = "N">quantity</FIELD></FIELDS></INPUT_SCAN><INPUT_SCAN ORDER="3"><SCAN_LABEL>Partial Quantity:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>part_qty</FIELD></FIELDS></INPUT_SCAN><SCAN_CONDITION field="quantity">loc_code == "GRL" || loc_code == "HGRL" || loc_code == "RECVT01" || loc_code == "CGRL" || loc_code == "FGRL" </SCAN_CONDITION><SCAN_CONDITION field="part_qty">quantity == "null" || quantity == "0" || quantity == ""</SCAN_CONDITION></SCAN_INFO>',
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
'checkedImage@img<item_code> , <lot_no> , <unit> = <lot_sl> , <loc_code>',
NULL,
NULL,
NULL,
'E',
NULL,
NULL,
'U',
NULL);
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