details: https://code.openbravo.com/erp/devel/pi/rev/4bcd10789da1 changeset: 26840:4bcd10789da1 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu May 21 17:06:23 2015 +0200 summary: Fixes issue 24991: Allow negative stock for BOM production
M_PRODUCTION_RUN.xml has been modified to allow negative stock in Bill of Materials Production. Now, if "Allow Negative Stock" is enabled in Client window and "Product quantity must be on stock" is disabled in Bill of Materials Production window and there is not enough stock for an input product, negative stock will be generated for that product for the locator defined in Production Plan tab. details: https://code.openbravo.com/erp/devel/pi/rev/0d48aea6e4c8 changeset: 26841:0d48aea6e4c8 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu May 21 17:09:29 2015 +0200 summary: Related to issue 24991: Fix TestCosting ProcessInstance must have the client information to avoid errors while calling to store procedures. diffstat: src-db/database/model/functions/M_PRODUCTION_RUN.xml | 74 ++++++++++++++- src-test/src/org/openbravo/test/costing/TestCosting.java | 2 + 2 files changed, 71 insertions(+), 5 deletions(-) diffs (134 lines): diff -r 2493e548545e -r 0d48aea6e4c8 src-db/database/model/functions/M_PRODUCTION_RUN.xml --- a/src-db/database/model/functions/M_PRODUCTION_RUN.xml Wed Jun 03 12:51:51 2015 +0200 +++ b/src-db/database/model/functions/M_PRODUCTION_RUN.xml Thu May 21 17:09:29 2015 +0200 @@ -56,10 +56,12 @@ v_Processed VARCHAR2(60) ; v_Client_ID VARCHAR2(32); v_Org_ID VARCHAR2(32); + v_Locator_ID VARCHAR2(32); -- v_Line NUMBER; v_Count NUMBER; p_User VARCHAR2(32); + v_allownegativestock CHAR(1); v_Product_Name m_product.name%TYPE; -- Stocked BOMs -- Proposed stock from given warehouse is priorized. @@ -88,14 +90,15 @@ v_ResultStr:='ReadingParameters'; FOR Cur_Parameter IN ( SELECT i.Record_ID, i.AD_User_ID, p.ParameterName, - p.P_String, p.P_Number, p.P_Date - FROM AD_PInstance i + p.P_String, p.P_Number, p.P_Date, ci.allownegativestock + FROM AD_ClientInfo ci JOIN AD_PInstance i ON ci.ad_client_id=i.ad_client_id LEFT JOIN AD_PInstance_Para p ON i.AD_PInstance_ID=p.AD_PInstance_ID WHERE i.AD_PInstance_ID=PInstance_ID ORDER BY p.SeqNo ) LOOP v_Record_ID := Cur_Parameter.Record_ID; p_User := Cur_Parameter.AD_User_ID; + v_allownegativestock := Cur_Parameter.allownegativestock; IF (Cur_Parameter.ParameterName = 'MustBeStocked') THEN MustBeStocked:=Cur_Parameter.P_String; DBMS_OUTPUT.PUT_LINE(' MustBeStocked=' || MustBeStocked) ; @@ -213,6 +216,8 @@ v_QtyStorage NUMBER:=0; v_QtyAcumulated NUMBER; v_QtyOrder NUMBER; + v_QtyOrderRate NUMBER; + v_ProductionLineCount NUMBER; v_pinstance_id VARCHAR2(32); CUR_BOM RECORD; BEGIN @@ -324,9 +329,68 @@ ); END IF; v_Line:=v_Line; - IF (v_QtyAcumulated < CUR_BOM.BOMQTY*CUR_BOM.ProductionQty) AND MustBeStocked='Y' THEN - v_Message := '@NotEnoughStocked@: ' || CUR_BOM.pname || ' ' || v_QtyAcumulated || ' / '|| CUR_BOM.BOMQTY*CUR_BOM.ProductionQty; - RAISE_APPLICATION_ERROR(-20000, v_Message); + IF (v_QtyAcumulated < CUR_BOM.BOMQTY*CUR_BOM.ProductionQty) THEN + IF (MustBeStocked='Y') THEN + v_Message := '@NotEnoughStocked@: ' || CUR_BOM.pname || ' ' || v_QtyAcumulated || ' / '|| CUR_BOM.BOMQTY*CUR_BOM.ProductionQty; + RAISE_APPLICATION_ERROR(-20000, v_Message); + ELSE + -- If AllowNegativeStock is enabled and MustBeStocked is disabled and there is not enough stock, + -- pending quantity will be created for the same locator as production plan product, keeping a negative stock + IF (v_allownegativestock='Y') THEN + + -- Get the locator of the production plan + SELECT M_Locator_ID + INTO v_Locator_ID + FROM M_PRODUCTIONPLAN + WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID; + + -- Check if exists a production line for this product with the same locator + SELECT count(M_ProductionLine_ID) + INTO v_ProductionLineCount + FROM M_PRODUCTIONLINE + WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID + AND M_Product_ID=CUR_BOM.M_ProductBOM_ID + AND M_Locator_ID=v_Locator_ID; + + -- If exists update it + IF (v_ProductionLineCount <> 0) THEN + + SELECT QuantityOrder / CASE WHEN (MovementQty <> 0) THEN MovementQty ELSE 1 END + INTO v_QtyOrderRate + FROM M_PRODUCTIONLINE + WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID + AND M_Product_ID=CUR_BOM.M_ProductBOM_ID + AND M_Locator_ID=v_Locator_ID; + + UPDATE M_PRODUCTIONLINE + SET MovementQty = MovementQty - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated), + QuantityOrder = v_QtyOrderRate * (MovementQty - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated)) + WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID + AND M_Product_ID=CUR_BOM.M_ProductBOM_ID + AND M_Locator_ID=v_Locator_ID; + + -- If not exists, insert a new production line + ELSE + + SELECT COALESCE(MAX(Line), 0) + 10 INTO v_Line + FROM M_PRODUCTIONLINE + WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID; + + INSERT INTO M_PRODUCTIONLINE ( + M_ProductionLine_ID, M_ProductionPlan_ID, Line, AD_Client_ID, + AD_Org_ID, IsActive, Created, CreatedBy, + Updated, UpdatedBy, M_Product_ID, C_UOM_ID, + MovementQty, M_Locator_ID + ) VALUES ( + get_uuid(), CUR_BOM.M_ProductionPlan_ID, v_Line, CUR_BOM.Client_ID, + CUR_BOM.Org_ID, 'Y', now(), p_User, + now(), p_User, CUR_BOM.M_ProductBOM_ID, CUR_BOM.C_UOM_ID, + - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated), v_Locator_ID + ); + + END IF; + END IF; + END IF; END IF; IF (CUR_BOM.ProductionQty <= 0) THEN v_Message := '@NegativeBOMProductionQty@'; diff -r 2493e548545e -r 0d48aea6e4c8 src-test/src/org/openbravo/test/costing/TestCosting.java --- a/src-test/src/org/openbravo/test/costing/TestCosting.java Wed Jun 03 12:51:51 2015 +0200 +++ b/src-test/src/org/openbravo/test/costing/TestCosting.java Thu May 21 17:09:29 2015 +0200 @@ -11189,6 +11189,7 @@ setGeneralData(processInstance); processInstance.setProcess(OBDal.getInstance().get(Process.class, processId)); processInstance.setRecordID(document.getId().toString()); + processInstance.setClient(OBDal.getInstance().get(Client.class, CLIENT_ID)); processInstance.setUserContact(OBDal.getInstance().get(User.class, USER_ID)); OBDal.getInstance().save(processInstance); OBDal.getInstance().flush(); @@ -11292,6 +11293,7 @@ processInstance.setProcess(OBDal.getInstance().get(Process.class, PROCESSPRODUCTION_PROCESS_ID)); processInstance.setRecordID(billOfMaterialsProduction.getId()); + processInstance.setClient(OBDal.getInstance().get(Client.class, CLIENT_ID)); processInstance.setUserContact(OBDal.getInstance().get(User.class, USER_ID)); OBDal.getInstance().save(processInstance); OBDal.getInstance().flush(); ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
