提交订单转移前后端程序以及部分翻译

guoyujie

2025-03-26 e394fbcc9abbf9246e5f611585c8dcac1db6beb8

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -704,15 +704,27 @@
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
    <update id="updateMaterialInventoryInventoryPlanQuantityOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
    <update id="updateMaterialInventoryInventoryPlanQuantityInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

@@ -984,6 +996,9 @@
            <if test="materialLog.remarks != null and materialLog.remarks != ''">
                and ml.remarks regexp #{materialLog.remarksr}
            </if>
            <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
                and ml.project_no regexp #{materialLog.projectNo}
            </if>
        </where>
        order by ml.id desc
        limit #{offset},#{pageSize};
@@ -1087,13 +1102,13 @@
        </where>
    </select>

    <select id="updateMaterialOutboundOptimizeUses">
    <update id="updateMaterialOutboundOptimizeUses">
        update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
    </select>
    </update>

    <select id="updateOptimizeUsesMes">
    <update id="updateOptimizeUsesMes">
        update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
    </select>
    </update>

    <insert id="insertMaterialOutboundDetailOptimizeUses"  useGeneratedKeys="true" >
        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
@@ -1112,5 +1127,9 @@
               )
    </insert>

    <select id="selectProjectNo">
        select project_no from pp.optimize_use where id=#{useId};
    </select>


</mapper>