Commit 13c2b2c8 authored by wansari's avatar wansari

W15GSUN002 updated for item type insert


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99900 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4e15f78e
......@@ -515,8 +515,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
else
{
//sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,UNIT__STD,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ?";
sql = "SELECT D.ITEM_CODE,I.DESCR,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,D.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
//+" FROM STOCK S,SORDALLOC D WHERE" //Changed by wasim on 20-08-2015 to add inv_stat validation
sql = "SELECT S.ITEM_CODE,I.DESCR,D.LINE_NO,S.QUANTITY,D.UNIT,S.LOT_NO,S.LOT_SL,S.SITE_CODE,S.LOC_CODE,S.NO_ART,S.QTY_PER_ART,"
+" I.ITEM_TYPE"//+" FROM STOCK S,SORDALLOC D WHERE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" FROM STOCK S,SORDALLOC D,LOCATION L,ITEM I WHERE"
+" S.ITEM_CODE = D.ITEM_CODE"
+" AND S.LOT_NO = D.LOT_NO"
......@@ -554,6 +554,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
notArt = rs.getDouble("NO_ART");
qtyPerArt = rs.getDouble("QTY_PER_ART");
itemType = checkNullAndTrim(rs.getString("ITEM_TYPE"));
/*hm = getPalletizedAttributes(itemCode,siteCode,conn);
familyGrp = (String) hm.get("LOC_ZONE__PREF");
qcType = (String) hm.get("PROC_MTH");
......@@ -596,7 +597,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
interfaceHmap.put("ITEM_CODE", itemCode);
interfaceHmap.put("DESCR", itemDescr);
interfaceHmap.put("UNIT", unit);
interfaceHmap.put("ITEM_TYPE", "");
interfaceHmap.put("ITEM_TYPE", itemType);
interfaceHmap.put("FAMILY_GRP", "");
interfaceHmap.put("IN_OUT", "O");
interfaceHmap.put("REF_SER", "S-ORD");
......@@ -607,8 +608,6 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
interfaceHmap.put("QUANTITY", String.valueOf(notArt));
interfaceHmap.put("QTY_PER_ART", String.valueOf(qtyPerArt));
interfaceHmap.put("TOTAL_QTY", String.valueOf(quantity));
System.out.println("exp_date="+expDate);
System.out.println("Mfg_date="+mfgDate);
interfaceHmap.put("EXP_DATE", "");
interfaceHmap.put("MFG_DATE", "");
interfaceHmap.put("PALLET_NO", palletNo);
......
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